From 725aeb20d497a4130c921a674beb69fd43433035 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 7 May 2015 14:02:59 +0200
Subject: [PATCH 001/877] Initial commit

---
 LICENSE | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..2c8fd9923
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Q42
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

From 8bac681379828e6de7a2117ff80009b0ad748493 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 7 May 2015 14:08:53 +0200
Subject: [PATCH 002/877] Create README.md

---
 README.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..a55de700b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,83 @@
+# vue-multi-loader
+
+> Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
+
+It allows you to write your components in this format:
+
+``` html
+// app.vue
+<style>
+  .red {
+    color: #f00;
+  }
+</style>
+
+<template>
+  <h1 class="red">{{msg}}</h1>
+</template>
+
+<script>
+  module.exports = {
+    data: function () {
+      return {
+        msg: 'Hello world!'
+      }
+    }
+  }
+</script>
+```
+
+You can also mix preprocessor languages in the component file:
+
+``` html
+// app.vue
+<style lang="stylus">
+.red
+  color #f00
+</style>
+
+<template lang="jade">
+h1(class="red") {{msg}}
+</template>
+
+<script lang="coffee">
+module.exports =
+  data: ->
+    msg: 'Hello world!'
+</script>
+```
+
+And you can import using the `src` attribute (note that there's no need for a `lang` attribute here, as Webpack will
+be used to determine which loader applies):
+
+``` html
+<style src="style.styl"></style>
+```
+
+## Usage
+
+Config Webpack:
+
+``` js
+// webpack.config.js
+module.exports = {
+  entry: "./main.js",
+  output: {
+    filename: "build.js"
+  },
+  module: {
+    loaders: [
+      { test: /\.vue$/, loader: "vue-multi-loader" },
+    ]
+  }
+}
+```
+
+And this is all you need to do in your main entry file:
+
+``` js
+// main.js
+var Vue = require('vue')
+var appOptions = require('./app.vue')
+var app = new Vue(appOptions).$mount('#app')
+```

From f90373017aa1930e173e2d2150924464d12adfdb Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 7 May 2015 14:30:39 +0200
Subject: [PATCH 003/877] First version

---
 .gitignore   |  1 +
 index.js     | 46 +++++++++++++++++++++++++++++++++
 package.json | 24 ++++++++++++++++++
 parser.js    | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 selector.js  | 13 ++++++++++
 5 files changed, 156 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 index.js
 create mode 100644 package.json
 create mode 100644 parser.js
 create mode 100644 selector.js

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..07e6e472c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/index.js b/index.js
new file mode 100644
index 000000000..bd7d15e51
--- /dev/null
+++ b/index.js
@@ -0,0 +1,46 @@
+module.exports = function (content) {
+  this.cacheable();
+  var cb = this.async();
+  var languages = {}
+  var output = ''
+  var vueUrl = this.resource;
+  var loaders = {}
+  var loaderPrefix = {
+    template: 'html!',
+    style: 'style!css!',
+    script: ''
+  }
+
+  function loader(part, lang) {
+    var loader = loaders[lang] || loaderPrefix[part] + lang;
+    return loader ? loader + '!' : ''
+  }
+
+  function getRequire(part, lang) {
+    return 'require(' + JSON.stringify('-!' + loader(part, lang) + require.resolve('./selector.js') + '?' + part + '/' + lang + '!' + vueUrl) + ')';
+  }
+
+  var me = this;
+  var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl;
+  this.loadModule(url, function(err, source, map, module) {
+    if (err) return cb(err);
+
+    var parts = me.exec(source, url);
+
+    for (var lang in parts.style)
+      output += getRequire('style', lang) + '\n'
+
+    for (var lang in parts.script)
+      output += 'module.exports = ' + getRequire('script', lang) + '\n'
+
+    var hasTemplate = false;
+    for (var lang in parts.template) {
+      if (hasTemplate)
+        return cb(new Error('Only one template element allowed per vue component!'))
+      output += 'module.exports.template = ' + getRequire('template', lang);
+      hasTemplate = true;
+    }
+
+    cb(null, output);
+  })
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..36a60bac3
--- /dev/null
+++ b/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "vue-multi-loader",
+  "version": "0.0.1",
+  "description": "Vue.js component loader for Webpack, using Webpack loaders for the parts",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Q42/vue-multi-loader.git"
+  },
+  "keywords": [
+    "vue",
+    "webpack",
+    "loader"
+  ],
+  "author": "Sjoerd Visscher",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/Q42/vue-multi-loader/issues"
+  },
+  "homepage": "https://github.com/Q42/vue-multi-loader",
+  "dependencies": {
+    "parse5": "^1.1.4"
+  }
+}
diff --git a/parser.js b/parser.js
new file mode 100644
index 000000000..8586e9d6a
--- /dev/null
+++ b/parser.js
@@ -0,0 +1,72 @@
+var parse5 = require('parse5')
+var parser = new parse5.Parser()
+var serializer = new parse5.TreeSerializer()
+
+module.exports = function (content) {
+  this.cacheable()
+  var cb = this.async()
+
+  // only 1 template tag is allowed, while styles and
+  // scripts are concatenated.
+  var languages = {}
+  var output = {
+    template: {},
+    style: {},
+    script: {},
+    includes: []
+  }
+
+  // parse the file into an HTML tree
+  var fragment = parser.parseFragment(content)
+
+  // Walk through the top level nodes and check for their
+  // types & languages. If there are pre-processing needed,
+  // push it into a jobs list.
+  fragment.childNodes.forEach(function (node) {
+    var type = node.nodeName;
+    if (type == '#text')
+      return
+    if (checkSrc(node, output.includes))
+      return
+
+    var lang = checkLang(node) || ''
+    output[type][lang] = (output[type][lang] || '') + serialize(node) + '\n'
+  })
+
+  cb(null, 'module.exports = ' + JSON.stringify(output))
+}
+
+function checkLang (node) {
+  if (node.attrs) {
+    var i = node.attrs.length
+    while (i--) {
+      var attr = node.attrs[i]
+      if (attr.name === 'lang') {
+        return attr.value
+      }
+    }
+  }
+}
+
+function checkSrc (node, arr) {
+  if (node.attrs) {
+    var i = node.attrs.length
+    while (i--) {
+      var attr = node.attrs[i]
+      if (attr.name === 'src') {
+        arr.push(attr.value)
+        return true
+      }
+    }
+  }
+  return false
+}
+
+// Work around changes in parse5 >= 1.2.0
+function serialize (node) {
+  var childNode = node.childNodes[0]
+  if (childNode && childNode.nodeName === '#document-fragment') {
+    return serializer.serialize(childNode)
+  }
+  return serializer.serialize(node)
+}
diff --git a/selector.js b/selector.js
new file mode 100644
index 000000000..3d0ce4bc1
--- /dev/null
+++ b/selector.js
@@ -0,0 +1,13 @@
+module.exports = function () {
+  this.cacheable()
+  var cb = this.async()
+  var path = this.query.substr(1).split('/')
+
+  var me = this
+  var url = "!!" + require.resolve("./parser.js") + "!" + this.resource
+  this.loadModule(url, function(err, source) {
+    if (err) return cb(err)
+    var parts = me.exec(source, url)
+    cb(null, parts[path[0]][path[1]])
+  })
+}

From 60eefdcbb247588876f7c5393272da861d24b301 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 7 May 2015 16:13:54 +0200
Subject: [PATCH 004/877] Support src attributes

---
 .gitignore   | 1 +
 index.js     | 3 +++
 package.json | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 07e6e472c..7a3a95d56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /node_modules
+/npm-debug.log
diff --git a/index.js b/index.js
index bd7d15e51..5db83c984 100644
--- a/index.js
+++ b/index.js
@@ -26,6 +26,9 @@ module.exports = function (content) {
     if (err) return cb(err);
 
     var parts = me.exec(source, url);
+    
+    for (var i = 0; i < parts.includes.length; i++)
+      output += 'require(' + JSON.stringify('./' + parts.includes[i]) + ')\n'
 
     for (var lang in parts.style)
       output += getRequire('style', lang) + '\n'
diff --git a/package.json b/package.json
index 36a60bac3..ab4f232f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-multi-loader",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Vue.js component loader for Webpack, using Webpack loaders for the parts",
   "main": "index.js",
   "repository": {

From 9bc441f4bf8cfdab4f8f7ca1b7cdb7a372967dbe Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Sun, 10 May 2015 20:16:11 +0200
Subject: [PATCH 005/877] v0.0.3 support html languages that generate a
 function

---
 index.js     | 35 +++++++++++++++++++++------------
 package.json |  2 +-
 parser.js    | 55 +++++++++++++++++++++++-----------------------------
 selector.js  | 16 +++++++--------
 4 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/index.js b/index.js
index 5db83c984..7b4377847 100644
--- a/index.js
+++ b/index.js
@@ -1,19 +1,29 @@
 module.exports = function (content) {
   this.cacheable();
   var cb = this.async();
-  var languages = {}
-  var output = ''
+  var languages = {};
+  var output = '';
   var vueUrl = this.resource;
-  var loaders = {}
+  var loaders = {
+    html: 'html',
+    css: 'style!css',
+    js: ''
+  };
   var loaderPrefix = {
-    template: 'html!',
+    template: '',
     style: 'style!css!',
     script: ''
-  }
+  };
+  var defaultLang = {
+    template: 'html',
+    style: 'css',
+    script: 'js'
+  };
 
   function loader(part, lang) {
-    var loader = loaders[lang] || loaderPrefix[part] + lang;
-    return loader ? loader + '!' : ''
+    lang = lang || defaultLang[part];
+    var loader = loaders[lang] !== undefined ? loaders[lang] : loaderPrefix[part] + lang;
+    return loader ? loader + '!' : '';
   }
 
   function getRequire(part, lang) {
@@ -26,21 +36,22 @@ module.exports = function (content) {
     if (err) return cb(err);
 
     var parts = me.exec(source, url);
-    
+
     for (var i = 0; i < parts.includes.length; i++)
-      output += 'require(' + JSON.stringify('./' + parts.includes[i]) + ')\n'
+      output += 'require(' + JSON.stringify('./' + parts.includes[i]) + ')\n';
 
     for (var lang in parts.style)
-      output += getRequire('style', lang) + '\n'
+      output += getRequire('style', lang) + '\n';
 
     for (var lang in parts.script)
-      output += 'module.exports = ' + getRequire('script', lang) + '\n'
+      output += 'module.exports = ' + getRequire('script', lang) + '\n';
 
     var hasTemplate = false;
     for (var lang in parts.template) {
       if (hasTemplate)
-        return cb(new Error('Only one template element allowed per vue component!'))
+        return cb(new Error('Only one template element allowed per vue component!'));
       output += 'module.exports.template = ' + getRequire('template', lang);
+      output += '\nif (module.exports.template instanceof Function) module.exports.template = module.exports.template({})';
       hasTemplate = true;
     }
 
diff --git a/package.json b/package.json
index ab4f232f9..52cfa24ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-multi-loader",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Vue.js component loader for Webpack, using Webpack loaders for the parts",
   "main": "index.js",
   "repository": {
diff --git a/parser.js b/parser.js
index 8586e9d6a..39c83313f 100644
--- a/parser.js
+++ b/parser.js
@@ -1,48 +1,41 @@
-var parse5 = require('parse5')
-var parser = new parse5.Parser()
-var serializer = new parse5.TreeSerializer()
+var parse5 = require('parse5');
+var parser = new parse5.Parser();
+var serializer = new parse5.TreeSerializer();
 
 module.exports = function (content) {
-  this.cacheable()
-  var cb = this.async()
+  this.cacheable();
+  var cb = this.async();
 
-  // only 1 template tag is allowed, while styles and
-  // scripts are concatenated.
-  var languages = {}
+  var languages = {};
   var output = {
     template: {},
     style: {},
     script: {},
     includes: []
-  }
-
-  // parse the file into an HTML tree
-  var fragment = parser.parseFragment(content)
+  };
 
-  // Walk through the top level nodes and check for their
-  // types & languages. If there are pre-processing needed,
-  // push it into a jobs list.
+  var fragment = parser.parseFragment(content);
   fragment.childNodes.forEach(function (node) {
     var type = node.nodeName;
     if (type == '#text')
-      return
+      return;
     if (checkSrc(node, output.includes))
-      return
+      return;
 
-    var lang = checkLang(node) || ''
-    output[type][lang] = (output[type][lang] || '') + serialize(node) + '\n'
-  })
+    var lang = checkLang(node) || '';
+    output[type][lang] = (output[type][lang] || '') + serialize(node) + '\n';
+  });
 
-  cb(null, 'module.exports = ' + JSON.stringify(output))
+  cb(null, 'module.exports = ' + JSON.stringify(output));
 }
 
 function checkLang (node) {
   if (node.attrs) {
-    var i = node.attrs.length
+    var i = node.attrs.length;
     while (i--) {
-      var attr = node.attrs[i]
+      var attr = node.attrs[i];
       if (attr.name === 'lang') {
-        return attr.value
+        return attr.value;
       }
     }
   }
@@ -50,12 +43,12 @@ function checkLang (node) {
 
 function checkSrc (node, arr) {
   if (node.attrs) {
-    var i = node.attrs.length
+    var i = node.attrs.length;
     while (i--) {
-      var attr = node.attrs[i]
+      var attr = node.attrs[i];
       if (attr.name === 'src') {
-        arr.push(attr.value)
-        return true
+        arr.push(attr.value);
+        return true;
       }
     }
   }
@@ -64,9 +57,9 @@ function checkSrc (node, arr) {
 
 // Work around changes in parse5 >= 1.2.0
 function serialize (node) {
-  var childNode = node.childNodes[0]
+  var childNode = node.childNodes[0];
   if (childNode && childNode.nodeName === '#document-fragment') {
-    return serializer.serialize(childNode)
+    return serializer.serialize(childNode);
   }
-  return serializer.serialize(node)
+  return serializer.serialize(node);
 }
diff --git a/selector.js b/selector.js
index 3d0ce4bc1..c4d85bed6 100644
--- a/selector.js
+++ b/selector.js
@@ -1,13 +1,13 @@
 module.exports = function () {
-  this.cacheable()
-  var cb = this.async()
-  var path = this.query.substr(1).split('/')
+  this.cacheable();
+  var cb = this.async();
+  var path = this.query.substr(1).split('/');
 
-  var me = this
-  var url = "!!" + require.resolve("./parser.js") + "!" + this.resource
+  var me = this;
+  var url = "!!" + require.resolve("./parser.js") + "!" + this.resource;
   this.loadModule(url, function(err, source) {
-    if (err) return cb(err)
-    var parts = me.exec(source, url)
-    cb(null, parts[path[0]][path[1]])
+    if (err) return cb(err);
+    var parts = me.exec(source, url);
+    cb(null, parts[path[0]][path[1]]);
   })
 }

From 511329371e764b0ef85e1d072292ab68d8aae5d6 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Wed, 13 May 2015 15:56:25 +0200
Subject: [PATCH 006/877] Apply tips by @sokra

https://github.com/webpack/webpack/issues/860#issuecomment-100227750
---
 index.js     | 8 +++++---
 package.json | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 7b4377847..be8abb981 100644
--- a/index.js
+++ b/index.js
@@ -1,9 +1,11 @@
+var loaderUtils = require("loader-utils");
+
 module.exports = function (content) {
   this.cacheable();
   var cb = this.async();
   var languages = {};
   var output = '';
-  var vueUrl = this.resource;
+  var vueUrl = loaderUtils.getRemainingRequest(this);
   var loaders = {
     html: 'html',
     css: 'style!css',
@@ -27,7 +29,7 @@ module.exports = function (content) {
   }
 
   function getRequire(part, lang) {
-    return 'require(' + JSON.stringify('-!' + loader(part, lang) + require.resolve('./selector.js') + '?' + part + '/' + lang + '!' + vueUrl) + ')';
+    return 'require(' + loaderUtils.stringifyRequest(this, '-!' + loader(part, lang) + require.resolve('./selector.js') + '?' + part + '/' + lang + '!' + vueUrl) + ')';
   }
 
   var me = this;
@@ -38,7 +40,7 @@ module.exports = function (content) {
     var parts = me.exec(source, url);
 
     for (var i = 0; i < parts.includes.length; i++)
-      output += 'require(' + JSON.stringify('./' + parts.includes[i]) + ')\n';
+      output += 'require(' + loaderUtils.stringifyRequest(this, loaderUtils.urlToRequest(parts.includes[i])) + ')\n';
 
     for (var lang in parts.style)
       output += getRequire('style', lang) + '\n';
diff --git a/package.json b/package.json
index 52cfa24ed..d4f13b578 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   },
   "homepage": "https://github.com/Q42/vue-multi-loader",
   "dependencies": {
+    "loader-utils": "^0.2.7",
     "parse5": "^1.1.4"
   }
 }

From e1987d95b6469c4c7c169fb42ce61cf11862d040 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 14 May 2015 17:06:00 +0200
Subject: [PATCH 007/877] stringifyRequest strips trailing slashes even in
 querystrings

---
 selector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selector.js b/selector.js
index c4d85bed6..ffed1b3f9 100644
--- a/selector.js
+++ b/selector.js
@@ -8,6 +8,6 @@ module.exports = function () {
   this.loadModule(url, function(err, source) {
     if (err) return cb(err);
     var parts = me.exec(source, url);
-    cb(null, parts[path[0]][path[1]]);
+    cb(null, parts[path[0]][path[1]||'']);
   })
 }

From 19ea5d10ffcb3d26824ff559738511dd2505ff8f Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 14 May 2015 17:06:29 +0200
Subject: [PATCH 008/877] Fix bug

---
 index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index be8abb981..7f09ce574 100644
--- a/index.js
+++ b/index.js
@@ -28,8 +28,9 @@ module.exports = function (content) {
     return loader ? loader + '!' : '';
   }
 
+  var me = this;
   function getRequire(part, lang) {
-    return 'require(' + loaderUtils.stringifyRequest(this, '-!' + loader(part, lang) + require.resolve('./selector.js') + '?' + part + '/' + lang + '!' + vueUrl) + ')';
+    return 'require(' + loaderUtils.stringifyRequest(me, '-!' + loader(part, lang) + require.resolve('./selector.js') + '?' + part + '/' + lang + '!' + vueUrl) + ')';
   }
 
   var me = this;

From 2dabd6620f3dbeeba2e709f449be70868c9a1faf Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 14 May 2015 17:07:18 +0200
Subject: [PATCH 009/877] Use template-html-loader by default

instead of trying to execute template functions
---
 index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 7f09ce574..67fcc3016 100644
--- a/index.js
+++ b/index.js
@@ -12,7 +12,7 @@ module.exports = function (content) {
     js: ''
   };
   var loaderPrefix = {
-    template: '',
+    template: 'html!template-html-loader?raw&engine=',
     style: 'style!css!',
     script: ''
   };
@@ -54,7 +54,6 @@ module.exports = function (content) {
       if (hasTemplate)
         return cb(new Error('Only one template element allowed per vue component!'));
       output += 'module.exports.template = ' + getRequire('template', lang);
-      output += '\nif (module.exports.template instanceof Function) module.exports.template = module.exports.template({})';
       hasTemplate = true;
     }
 

From 2f7d5df45fe481d4ca2de4ffab3211a7f4019ae9 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Thu, 14 May 2015 17:33:58 +0200
Subject: [PATCH 010/877] Loader configuration via query arguments

---
 index.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index 67fcc3016..4e4a1b38f 100644
--- a/index.js
+++ b/index.js
@@ -6,11 +6,10 @@ module.exports = function (content) {
   var languages = {};
   var output = '';
   var vueUrl = loaderUtils.getRemainingRequest(this);
-  var loaders = {
-    html: 'html',
-    css: 'style!css',
-    js: ''
-  };
+  var loaders = loaderUtils.parseQuery(this.query);
+  loaders.html = loaders.html || 'html';
+  loaders.css  = loaders.css  || 'style!css';
+  loaders.js   = loaders.js   || '';
   var loaderPrefix = {
     template: 'html!template-html-loader?raw&engine=',
     style: 'style!css!',

From e83905548f563f06ea3ecff2cbee5057f28453cb Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Fri, 15 May 2015 00:31:47 +0200
Subject: [PATCH 011/877] Helper function for loader configuration

---
 index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.js b/index.js
index 4e4a1b38f..4b013ca29 100644
--- a/index.js
+++ b/index.js
@@ -59,3 +59,7 @@ module.exports = function (content) {
     cb(null, output);
   })
 }
+
+module.exports.withLoaders = function (opts) {
+  return 'vue-multi-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
+}

From e42864d490526a9a59626eec662aae3bcb799cdd Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Fri, 15 May 2015 00:42:03 +0200
Subject: [PATCH 012/877] source map support

---
 package.json |  3 ++-
 parser.js    | 50 +++++++++++++++++++++++++++++++++++++++-----------
 selector.js  |  3 ++-
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index d4f13b578..987d7dda4 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "homepage": "https://github.com/Q42/vue-multi-loader",
   "dependencies": {
     "loader-utils": "^0.2.7",
-    "parse5": "^1.1.4"
+    "parse5": "^1.1.4",
+    "source-map": "^0.4.2"
   }
 }
diff --git a/parser.js b/parser.js
index 39c83313f..9b9990f6a 100644
--- a/parser.js
+++ b/parser.js
@@ -1,10 +1,14 @@
 var parse5 = require('parse5');
-var parser = new parse5.Parser();
+var parser = new parse5.Parser(null, { locationInfo: true });
 var serializer = new parse5.TreeSerializer();
+var SourceNode = require("source-map").SourceNode;
+var loaderUtils = require("loader-utils");
 
 module.exports = function (content) {
   this.cacheable();
   var cb = this.async();
+  var vueRequest = loaderUtils.getRemainingRequest(this);
+  var request = loaderUtils.getCurrentRequest(this);
 
   var languages = {};
   var output = {
@@ -14,6 +18,13 @@ module.exports = function (content) {
     includes: []
   };
 
+  function pos(offset) {
+    return {
+      line: content.substr(0, offset).split('\n').length,
+      col: offset - content.lastIndexOf('\n', offset - 1)
+    }
+  }
+
   var fragment = parser.parseFragment(content);
   fragment.childNodes.forEach(function (node) {
     var type = node.nodeName;
@@ -23,9 +34,35 @@ module.exports = function (content) {
       return;
 
     var lang = checkLang(node) || '';
-    output[type][lang] = (output[type][lang] || '') + serialize(node) + '\n';
+
+    // Work around changes in parse5 >= 1.2.0
+    var childNode = node.childNodes[0];
+    if (childNode && childNode.nodeName === '#document-fragment') {
+      node = childNode;
+    }
+
+    if (!node.childNodes.length)
+      return;
+
+    var start = node.childNodes[0].__location.start;
+    var end = node.childNodes[node.childNodes.length - 1].__location.end;
+    var lines = content.substring(start, end).split('\n');
+    var startPos = pos(start);
+    var sourceNodes = lines.map(function (line, i) {
+      return new SourceNode(startPos.line + i, i ? 0 : startPos.col, vueRequest, line + '\n');
+    });
+    output[type][lang] = (output[type][lang] || []).concat(sourceNodes)
   });
 
+  for (var type in output) {
+    for (var lang in output[type]) {
+      var sourceNodes = output[type][lang];
+      output[type][lang] = new SourceNode(1, 1, vueRequest, sourceNodes).toStringWithSourceMap({
+        file: request
+      })
+    }
+  }
+
   cb(null, 'module.exports = ' + JSON.stringify(output));
 }
 
@@ -54,12 +91,3 @@ function checkSrc (node, arr) {
   }
   return false
 }
-
-// Work around changes in parse5 >= 1.2.0
-function serialize (node) {
-  var childNode = node.childNodes[0];
-  if (childNode && childNode.nodeName === '#document-fragment') {
-    return serializer.serialize(childNode);
-  }
-  return serializer.serialize(node);
-}
diff --git a/selector.js b/selector.js
index ffed1b3f9..956f2ea74 100644
--- a/selector.js
+++ b/selector.js
@@ -8,6 +8,7 @@ module.exports = function () {
   this.loadModule(url, function(err, source) {
     if (err) return cb(err);
     var parts = me.exec(source, url);
-    cb(null, parts[path[0]][path[1]||'']);
+    var part = parts[path[0]][path[1]||''];
+    cb(null, part.code, part.map);
   })
 }

From f9945eeee6692d2d19fb03ac193ff47095b52416 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Fri, 15 May 2015 00:54:47 +0200
Subject: [PATCH 013/877] v0.0.4

---
 README.md    | 34 ++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a55de700b..aca832ae5 100644
--- a/README.md
+++ b/README.md
@@ -81,3 +81,37 @@ var Vue = require('vue')
 var appOptions = require('./app.vue')
 var app = new Vue(appOptions).$mount('#app')
 ```
+
+## Loader configuration
+
+By default, `vue-multi-loader` will try to use the loader with the same name as
+the `lang` attribute, but you can configure which loader should be used.
+
+For example, to extract out the generated css into a separate file,
+use this configuration:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+var vue = require("vue-multi-loader");
+
+module.exports = {
+  entry: "./main.js",
+  output: {
+    filename: "build.js"
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/, loader: vue.withLoaders({
+          css: ExtractTextPlugin.extract("css"),
+          stylus: ExtractTextPlugin.extract("css!stylus")
+        })
+      },
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("[name].css")
+  ]
+}
+```
diff --git a/package.json b/package.json
index 987d7dda4..c3f18bc47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-multi-loader",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Vue.js component loader for Webpack, using Webpack loaders for the parts",
   "main": "index.js",
   "repository": {

From 89d7d515025a8dd5d72285796f39dfafd91a86c0 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Mon, 8 Jun 2015 13:39:55 +0200
Subject: [PATCH 014/877] v0.0.5 Parse with htmlparser2

Fixes #1
---
 package.json |  2 +-
 parser.js    | 56 ++++++++++++++--------------------------------------
 2 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index c3f18bc47..92c06dc1a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-multi-loader",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Vue.js component loader for Webpack, using Webpack loaders for the parts",
   "main": "index.js",
   "repository": {
diff --git a/parser.js b/parser.js
index 9b9990f6a..b6db5493e 100644
--- a/parser.js
+++ b/parser.js
@@ -1,5 +1,5 @@
 var parse5 = require('parse5');
-var parser = new parse5.Parser(null, { locationInfo: true });
+var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2, { locationInfo: true });
 var serializer = new parse5.TreeSerializer();
 var SourceNode = require("source-map").SourceNode;
 var loaderUtils = require("loader-utils");
@@ -26,26 +26,26 @@ module.exports = function (content) {
   }
 
   var fragment = parser.parseFragment(content);
-  fragment.childNodes.forEach(function (node) {
-    var type = node.nodeName;
-    if (type == '#text')
+  fragment.children.forEach(function (node) {
+    if (node.attribs && node.attribs.src) {
+      output.includes.push(node.attribs.src)
       return;
-    if (checkSrc(node, output.includes))
+    }
+
+    if (!node.children || !node.children.length)
       return;
 
-    var lang = checkLang(node) || '';
+    var lang = (node.attribs && node.attribs.lang) || '';
+    var type = node.name;
+    if (!output[type])
+      return;
 
     // Work around changes in parse5 >= 1.2.0
-    var childNode = node.childNodes[0];
-    if (childNode && childNode.nodeName === '#document-fragment') {
-      node = childNode;
-    }
+    if (node.children[0].type === 'root')
+      node = node.children[0];
 
-    if (!node.childNodes.length)
-      return;
-
-    var start = node.childNodes[0].__location.start;
-    var end = node.childNodes[node.childNodes.length - 1].__location.end;
+    var start = node.children[0].__location.start;
+    var end = node.children[node.children.length - 1].__location.end;
     var lines = content.substring(start, end).split('\n');
     var startPos = pos(start);
     var sourceNodes = lines.map(function (line, i) {
@@ -65,29 +65,3 @@ module.exports = function (content) {
 
   cb(null, 'module.exports = ' + JSON.stringify(output));
 }
-
-function checkLang (node) {
-  if (node.attrs) {
-    var i = node.attrs.length;
-    while (i--) {
-      var attr = node.attrs[i];
-      if (attr.name === 'lang') {
-        return attr.value;
-      }
-    }
-  }
-}
-
-function checkSrc (node, arr) {
-  if (node.attrs) {
-    var i = node.attrs.length;
-    while (i--) {
-      var attr = node.attrs[i];
-      if (attr.name === 'src') {
-        arr.push(attr.value);
-        return true;
-      }
-    }
-  }
-  return false
-}

From ff72520043253e2ed15c0bcf7bd2edc18ec6f987 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 8 Jun 2015 17:48:30 -0400
Subject: [PATCH 015/877] add peer dependencies

---
 package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package.json b/package.json
index 92c06dc1a..1b0e58afd 100644
--- a/package.json
+++ b/package.json
@@ -22,5 +22,10 @@
     "loader-utils": "^0.2.7",
     "parse5": "^1.1.4",
     "source-map": "^0.4.2"
+  },
+  "peerDependencies": {
+    "css-loader": "^0.14.4",
+    "html-loader": "^0.3.0",
+    "style-loader": "^0.12.3"
   }
 }

From 32d388f9223a81f162b2193c86b27f2eda1ee96d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 12 Jun 2015 00:13:38 -0400
Subject: [PATCH 016/877] renaming

---
 README.md    |  8 ++++----
 index.js     |  2 +-
 package.json | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index aca832ae5..80a838c37 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-multi-loader
+# vue-loader
 
 > Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
 
@@ -67,7 +67,7 @@ module.exports = {
   },
   module: {
     loaders: [
-      { test: /\.vue$/, loader: "vue-multi-loader" },
+      { test: /\.vue$/, loader: "vue-loader" },
     ]
   }
 }
@@ -84,7 +84,7 @@ var app = new Vue(appOptions).$mount('#app')
 
 ## Loader configuration
 
-By default, `vue-multi-loader` will try to use the loader with the same name as
+By default, `vue-loader` will try to use the loader with the same name as
 the `lang` attribute, but you can configure which loader should be used.
 
 For example, to extract out the generated css into a separate file,
@@ -93,7 +93,7 @@ use this configuration:
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var vue = require("vue-multi-loader");
+var vue = require("vue-loader");
 
 module.exports = {
   entry: "./main.js",
diff --git a/index.js b/index.js
index 4b013ca29..96622382d 100644
--- a/index.js
+++ b/index.js
@@ -61,5 +61,5 @@ module.exports = function (content) {
 }
 
 module.exports.withLoaders = function (opts) {
-  return 'vue-multi-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
+  return 'vue-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
 }
diff --git a/package.json b/package.json
index 1b0e58afd..a57636c6f 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "vue-multi-loader",
-  "version": "0.0.5",
-  "description": "Vue.js component loader for Webpack, using Webpack loaders for the parts",
+  "name": "vue-loader",
+  "version": "1.1.7",
+  "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Q42/vue-multi-loader.git"
+    "url": "https://github.com/vuejs/vue-loader.git"
   },
   "keywords": [
     "vue",
@@ -15,9 +15,9 @@
   "author": "Sjoerd Visscher",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/Q42/vue-multi-loader/issues"
+    "url": "https://github.com/vuejs/vue-loader/issues"
   },
-  "homepage": "https://github.com/Q42/vue-multi-loader",
+  "homepage": "https://github.com/vuejs/vue-loader",
   "dependencies": {
     "loader-utils": "^0.2.7",
     "parse5": "^1.1.4",

From 8fd05e41eabf464b1b3f0e731a3027eebe1a4588 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 12 Jun 2015 19:37:21 -0400
Subject: [PATCH 017/877] add a note for template loader

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 80a838c37..736b3d699 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,12 @@ var appOptions = require('./app.vue')
 var app = new Vue(appOptions).$mount('#app')
 ```
 
+## Pre-Processors
+
+By default `vue-loader` needs `html-loader`, `css-loader` and `style-loader` as peer dependencies. In order to use pre-processors, you need to install the corresponding Webpack loader for that language.
+
+**Note** For template pre-processors, use `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
+
 ## Loader configuration
 
 By default, `vue-loader` will try to use the loader with the same name as

From fc534b24b1f6dd04dfce9a2a1ff2b0135b44c4ed Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 12 Jun 2015 19:43:57 -0400
Subject: [PATCH 018/877] bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a57636c6f..338d6bd3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "1.1.7",
+  "version": "2.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 95dd6262c06a824ebec36307fd2aa7666318574d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 14 Jun 2015 18:41:36 -0400
Subject: [PATCH 019/877] some formatting and comments

---
 index.js    | 107 ++++++++++++++++++++++++++++++++++++----------------
 parser.js   |  54 +++++++++++++-------------
 selector.js |  18 ++++-----
 3 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/index.js b/index.js
index 96622382d..6d7b492a2 100644
--- a/index.js
+++ b/index.js
@@ -1,65 +1,108 @@
-var loaderUtils = require("loader-utils");
+var loaderUtils = require("loader-utils")
 
 module.exports = function (content) {
-  this.cacheable();
-  var cb = this.async();
-  var languages = {};
-  var output = '';
-  var vueUrl = loaderUtils.getRemainingRequest(this);
-  var loaders = loaderUtils.parseQuery(this.query);
-  loaders.html = loaders.html || 'html';
-  loaders.css  = loaders.css  || 'style!css';
-  loaders.js   = loaders.js   || '';
+  this.cacheable()
+  var cb = this.async()
+  var languages = {}
+  var output = ''
+  var vueUrl = loaderUtils.getRemainingRequest(this)
+
+  // check if there are custom loaders specified with
+  // vueLoader.withLoaders(), otherwise use defaults
+  var loaders = loaderUtils.parseQuery(this.query)
+  loaders.html = loaders.html || 'html'
+  loaders.css  = loaders.css || 'style!css'
+  loaders.js   = loaders.js || ''
+
   var loaderPrefix = {
     template: 'html!template-html-loader?raw&engine=',
     style: 'style!css!',
     script: ''
-  };
+  }
+
   var defaultLang = {
     template: 'html',
     style: 'css',
     script: 'js'
-  };
+  }
 
+  /**
+   * Determine the loaders to use for an extracted part.
+   *
+   * @param {String} part - style|script|template
+   * @param {String} lang
+   * @return {String}
+   */
   function loader(part, lang) {
-    lang = lang || defaultLang[part];
-    var loader = loaders[lang] !== undefined ? loaders[lang] : loaderPrefix[part] + lang;
-    return loader ? loader + '!' : '';
+    lang = lang || defaultLang[part]
+    var loader = loaders[lang] !== undefined
+      ? loaders[lang]
+      : loaderPrefix[part] + lang
+    return loader ? loader + '!' : ''
   }
 
-  var me = this;
+  /**
+   * Generate a require call for an extracted part.
+   *
+   * @param {String} part - style|script|template
+   * @param {String} lang
+   * @return {String}
+   */
+  var self = this
   function getRequire(part, lang) {
-    return 'require(' + loaderUtils.stringifyRequest(me, '-!' + loader(part, lang) + require.resolve('./selector.js') + '?' + part + '/' + lang + '!' + vueUrl) + ')';
+    return 'require(' +
+      loaderUtils.stringifyRequest(self,
+        '-!' + loader(part, lang) +
+        require.resolve('./selector.js') + '?' + part + '/' + lang + '!' +
+        vueUrl
+      ) +
+    ')'
   }
 
-  var me = this;
-  var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl;
+  var self = this
+  var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl
   this.loadModule(url, function(err, source, map, module) {
-    if (err) return cb(err);
+    if (err) return cb(err)
 
-    var parts = me.exec(source, url);
+    // up to this part, what we have done is basically executing
+    // parser.js on the raw vue file and get the parsing result
+    // which is an object that contains info about the vue file.
+    var parts = self.exec(source, url)
 
-    for (var i = 0; i < parts.includes.length; i++)
-      output += 'require(' + loaderUtils.stringifyRequest(this, loaderUtils.urlToRequest(parts.includes[i])) + ')\n';
+    // add require for all the src imports
+    for (var i = 0; i < parts.includes.length; i++) {
+      var importReqeust = loaderUtils.urlToRequest(parts.includes[i])
+      output += 'require(' + loaderUtils.stringifyRequest(this, importReqeust) + ')\n'
+    }
 
-    for (var lang in parts.style)
-      output += getRequire('style', lang) + '\n';
+    // add require for styles
+    for (var lang in parts.style) {
+      output += getRequire('style', lang) + '\n'
+    }
 
-    for (var lang in parts.script)
-      output += 'module.exports = ' + getRequire('script', lang) + '\n';
+    // add require for script
+    for (var lang in parts.script) {
+      output += 'module.exports = ' + getRequire('script', lang) + '\n'
+    }
 
-    var hasTemplate = false;
+    // add require for template
+    var hasTemplate = false
     for (var lang in parts.template) {
       if (hasTemplate)
-        return cb(new Error('Only one template element allowed per vue component!'));
-      output += 'module.exports.template = ' + getRequire('template', lang);
-      hasTemplate = true;
+        return cb(new Error('Only one template element allowed per vue component!'))
+      output += 'module.exports.template = ' + getRequire('template', lang)
+      hasTemplate = true
     }
 
-    cb(null, output);
+    // done
+    cb(null, output)
   })
 }
 
+/**
+ * Expose a way to specify custom loaders to be used at the
+ * end for the extracted parts of a component.
+ */
 module.exports.withLoaders = function (opts) {
   return 'vue-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
 }
diff --git a/parser.js b/parser.js
index b6db5493e..d9e8f59b3 100644
--- a/parser.js
+++ b/parser.js
@@ -1,22 +1,22 @@
-var parse5 = require('parse5');
-var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2, { locationInfo: true });
-var serializer = new parse5.TreeSerializer();
-var SourceNode = require("source-map").SourceNode;
-var loaderUtils = require("loader-utils");
+var parse5 = require('parse5')
+var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2, { locationInfo: true })
+var serializer = new parse5.TreeSerializer()
+var SourceNode = require("source-map").SourceNode
+var loaderUtils = require("loader-utils")
 
 module.exports = function (content) {
-  this.cacheable();
-  var cb = this.async();
-  var vueRequest = loaderUtils.getRemainingRequest(this);
-  var request = loaderUtils.getCurrentRequest(this);
+  this.cacheable()
+  var cb = this.async()
+  var vueRequest = loaderUtils.getRemainingRequest(this)
+  var request = loaderUtils.getCurrentRequest(this)
 
-  var languages = {};
+  var languages = {}
   var output = {
     template: {},
     style: {},
     script: {},
     includes: []
-  };
+  }
 
   function pos(offset) {
     return {
@@ -25,43 +25,43 @@ module.exports = function (content) {
     }
   }
 
-  var fragment = parser.parseFragment(content);
+  var fragment = parser.parseFragment(content)
   fragment.children.forEach(function (node) {
     if (node.attribs && node.attribs.src) {
       output.includes.push(node.attribs.src)
-      return;
+      return
     }
 
     if (!node.children || !node.children.length)
-      return;
+      return
 
-    var lang = (node.attribs && node.attribs.lang) || '';
-    var type = node.name;
+    var lang = (node.attribs && node.attribs.lang) || ''
+    var type = node.name
     if (!output[type])
-      return;
+      return
 
     // Work around changes in parse5 >= 1.2.0
     if (node.children[0].type === 'root')
-      node = node.children[0];
+      node = node.children[0]
 
-    var start = node.children[0].__location.start;
-    var end = node.children[node.children.length - 1].__location.end;
-    var lines = content.substring(start, end).split('\n');
-    var startPos = pos(start);
+    var start = node.children[0].__location.start
+    var end = node.children[node.children.length - 1].__location.end
+    var lines = content.substring(start, end).split('\n')
+    var startPos = pos(start)
     var sourceNodes = lines.map(function (line, i) {
-      return new SourceNode(startPos.line + i, i ? 0 : startPos.col, vueRequest, line + '\n');
-    });
+      return new SourceNode(startPos.line + i, i ? 0 : startPos.col, vueRequest, line + '\n')
+    })
     output[type][lang] = (output[type][lang] || []).concat(sourceNodes)
-  });
+  })
 
   for (var type in output) {
     for (var lang in output[type]) {
-      var sourceNodes = output[type][lang];
+      var sourceNodes = output[type][lang]
       output[type][lang] = new SourceNode(1, 1, vueRequest, sourceNodes).toStringWithSourceMap({
         file: request
       })
     }
   }
 
-  cb(null, 'module.exports = ' + JSON.stringify(output));
+  cb(null, 'module.exports = ' + JSON.stringify(output))
 }
diff --git a/selector.js b/selector.js
index 956f2ea74..73062fd2e 100644
--- a/selector.js
+++ b/selector.js
@@ -1,14 +1,14 @@
 module.exports = function () {
-  this.cacheable();
-  var cb = this.async();
-  var path = this.query.substr(1).split('/');
+  this.cacheable()
+  var cb = this.async()
+  var path = this.query.substr(1).split('/')
 
-  var me = this;
-  var url = "!!" + require.resolve("./parser.js") + "!" + this.resource;
+  var self = this
+  var url = "!!" + require.resolve("./parser.js") + "!" + this.resource
   this.loadModule(url, function(err, source) {
-    if (err) return cb(err);
-    var parts = me.exec(source, url);
-    var part = parts[path[0]][path[1]||''];
-    cb(null, part.code, part.map);
+    if (err) return cb(err)
+    var parts = self.exec(source, url)
+    var part = parts[path[0]][path[1]||'']
+    cb(null, part.code, part.map)
   })
 }

From 02eaf0cd02caf15e76c6fcd6babeae94d392a40b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Jun 2015 15:12:09 -0400
Subject: [PATCH 020/877] fix source map

---
 index.js     |  2 +-
 package.json |  3 +--
 parser.js    | 25 +------------------------
 selector.js  |  5 +++--
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/index.js b/index.js
index 6d7b492a2..1965481bb 100644
--- a/index.js
+++ b/index.js
@@ -61,7 +61,7 @@ module.exports = function (content) {
 
   var self = this
   var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl
-  this.loadModule(url, function(err, source, map, module) {
+  this.loadModule(url, function(err, source) {
     if (err) return cb(err)
 
     // up to this part, what we have done is basically executing
diff --git a/package.json b/package.json
index 338d6bd3f..59521c024 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,7 @@
   "homepage": "https://github.com/vuejs/vue-loader",
   "dependencies": {
     "loader-utils": "^0.2.7",
-    "parse5": "^1.1.4",
-    "source-map": "^0.4.2"
+    "parse5": "^1.1.4"
   },
   "peerDependencies": {
     "css-loader": "^0.14.4",
diff --git a/parser.js b/parser.js
index d9e8f59b3..203251486 100644
--- a/parser.js
+++ b/parser.js
@@ -1,7 +1,5 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2, { locationInfo: true })
-var serializer = new parse5.TreeSerializer()
-var SourceNode = require("source-map").SourceNode
 var loaderUtils = require("loader-utils")
 
 module.exports = function (content) {
@@ -18,13 +16,6 @@ module.exports = function (content) {
     includes: []
   }
 
-  function pos(offset) {
-    return {
-      line: content.substr(0, offset).split('\n').length,
-      col: offset - content.lastIndexOf('\n', offset - 1)
-    }
-  }
-
   var fragment = parser.parseFragment(content)
   fragment.children.forEach(function (node) {
     if (node.attribs && node.attribs.src) {
@@ -46,22 +37,8 @@ module.exports = function (content) {
 
     var start = node.children[0].__location.start
     var end = node.children[node.children.length - 1].__location.end
-    var lines = content.substring(start, end).split('\n')
-    var startPos = pos(start)
-    var sourceNodes = lines.map(function (line, i) {
-      return new SourceNode(startPos.line + i, i ? 0 : startPos.col, vueRequest, line + '\n')
-    })
-    output[type][lang] = (output[type][lang] || []).concat(sourceNodes)
+    output[type][lang] = content.substring(start, end).trim()
   })
 
-  for (var type in output) {
-    for (var lang in output[type]) {
-      var sourceNodes = output[type][lang]
-      output[type][lang] = new SourceNode(1, 1, vueRequest, sourceNodes).toStringWithSourceMap({
-        file: request
-      })
-    }
-  }
-
   cb(null, 'module.exports = ' + JSON.stringify(output))
 }
diff --git a/selector.js b/selector.js
index 73062fd2e..c98db663c 100644
--- a/selector.js
+++ b/selector.js
@@ -8,7 +8,8 @@ module.exports = function () {
   this.loadModule(url, function(err, source) {
     if (err) return cb(err)
     var parts = self.exec(source, url)
-    var part = parts[path[0]][path[1]||'']
-    cb(null, part.code, part.map)
+    var type = path[0]
+    var lang = path[1] || ''
+    cb(null, parts[type][lang])
   })
 }

From 95b486f51b44c5fc233ef85fc56a764d627eb0a5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Jun 2015 18:49:37 -0400
Subject: [PATCH 021/877] tests

---
 .gitignore              |   1 +
 package.json            |  22 ++++++++
 test/fixtures/basic.js  |   1 +
 test/fixtures/basic.vue |  19 +++++++
 test/fixtures/pre.js    |   1 +
 test/fixtures/pre.vue   |  23 ++++++++
 test/test.js            | 120 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 187 insertions(+)
 create mode 100644 test/fixtures/basic.js
 create mode 100644 test/fixtures/basic.vue
 create mode 100644 test/fixtures/pre.js
 create mode 100644 test/fixtures/pre.vue
 create mode 100644 test/test.js

diff --git a/.gitignore b/.gitignore
index 7a3a95d56..e698d7971 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /node_modules
 /npm-debug.log
+test/output
diff --git a/package.json b/package.json
index 59521c024..c8157b571 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,9 @@
     "url": "https://github.com/vuejs/vue-loader/issues"
   },
   "homepage": "https://github.com/vuejs/vue-loader",
+  "scripts": {
+    "test": "mocha test/test.js --slow 2000"
+  },
   "dependencies": {
     "loader-utils": "^0.2.7",
     "parse5": "^1.1.4"
@@ -26,5 +29,24 @@
     "css-loader": "^0.14.4",
     "html-loader": "^0.3.0",
     "style-loader": "^0.12.3"
+  },
+  "devDependencies": {
+    "babel-core": "^5.5.8",
+    "babel-loader": "^5.1.4",
+    "chai": "^3.0.0",
+    "css-loader": "^0.14.4",
+    "html-loader": "^0.3.0",
+    "jade": "^1.11.0",
+    "jsdom": "^5.4.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^2.2.5",
+    "node-libs-browser": "^0.5.2",
+    "object-assign": "^3.0.0",
+    "rimraf": "^2.4.0",
+    "source-map": "^0.4.2",
+    "style-loader": "^0.12.3",
+    "stylus-loader": "^1.2.0",
+    "template-html-loader": "0.0.3",
+    "webpack": "^1.9.11"
   }
 }
diff --git a/test/fixtures/basic.js b/test/fixtures/basic.js
new file mode 100644
index 000000000..b5a46fc5f
--- /dev/null
+++ b/test/fixtures/basic.js
@@ -0,0 +1 @@
+window.testModule = require('./basic.vue')
diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
new file mode 100644
index 000000000..5cf4c68ac
--- /dev/null
+++ b/test/fixtures/basic.vue
@@ -0,0 +1,19 @@
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+module.exports = {
+  data: function () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
diff --git a/test/fixtures/pre.js b/test/fixtures/pre.js
new file mode 100644
index 000000000..2238f374f
--- /dev/null
+++ b/test/fixtures/pre.js
@@ -0,0 +1 @@
+window.testModule = require('./pre.vue')
diff --git a/test/fixtures/pre.vue b/test/fixtures/pre.vue
new file mode 100644
index 000000000..74685ec49
--- /dev/null
+++ b/test/fixtures/pre.vue
@@ -0,0 +1,23 @@
+<style lang="stylus">
+font-stack = Helvetica, sans-serif
+primary-color = #999
+body
+  font 100% font-stack
+  color primary-color
+</style>
+
+<template lang="jade">
+h1 This is the app
+comp-a
+comp-b
+</template>
+
+<script lang="babel">
+export default {
+  data () {
+    return {
+      msg: 'Hello from babel!'
+    }
+  }
+}
+</script>
diff --git a/test/test.js b/test/test.js
new file mode 100644
index 000000000..3c3ad50ab
--- /dev/null
+++ b/test/test.js
@@ -0,0 +1,120 @@
+var fs = require('fs')
+var path = require('path')
+var webpack = require('webpack')
+var jsdom = require('jsdom')
+var expect = require('chai').expect
+var assign = require('object-assign')
+var rimraf = require('rimraf')
+var SourceMapConsumer = require('source-map').SourceMapConsumer
+
+describe('vue-loader', function () {
+
+  var outputDir = path.resolve(__dirname, './output')
+  var loaderPath = path.resolve(__dirname, '../')
+  var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
+  var globalConfig = {
+    output: {
+      path: outputDir,
+      filename: 'test.build.js'
+    },
+    module: {
+      loaders: [
+        {
+          test: /\.vue$/,
+          loader: loaderPath
+        }
+      ]
+    }
+  }
+
+  beforeEach(function (done) {
+    rimraf(outputDir, done)
+  })
+
+  function getFile (file, cb) {
+    fs.readFile(path.resolve(outputDir, file), 'utf-8', function (err, data) {
+      expect(err).to.be.null
+      cb(data)
+    })
+  }
+
+  function test (options, assert) {
+    var config = assign({}, globalConfig, options)
+    webpack(config, function (err) {
+      expect(err).to.be.null
+      getFile('test.build.js', function (data) {
+        jsdom.env({
+          html: testHTML,
+          src: [data],
+          done: function (err, window) {
+            if (err) {
+              console.log(err[0].data.error.stack)
+              expect(err).to.be.null
+            }
+            assert(window)
+          }
+        })
+      })
+    })
+  }
+
+  it('basic', function (done) {
+    test({
+      entry: './test/fixtures/basic.js'
+    }, function (window) {
+      var module = window.testModule
+      expect(module.template).to.contain('<h2 class="red">{{msg}}</h2>')
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
+      done()
+    })
+  })
+
+  it('pre-processors', function (done) {
+    test({
+      entry: './test/fixtures/pre.js'
+    }, function (window) {
+      var module = window.testModule
+      expect(module.template).to.contain(
+        '<h1>This is the app</h1>' +
+        '<comp-a></comp-a>' +
+        '<comp-b></comp-b>'
+      )
+      expect(module.data().msg).to.contain('Hello from babel!')
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
+      done()
+    })
+  })
+
+  it('source-map', function (done) {
+    var config = assign({}, globalConfig, {
+      entry: './test/fixtures/basic.js',
+      devtool: 'source-map'
+    })
+    webpack(config, function (err) {
+      expect(err).to.be.null
+      getFile('test.build.js.map', function (map) {
+        var smc = new SourceMapConsumer(JSON.parse(map))
+        getFile('test.build.js', function (code) {
+          var line
+          code.split('\n').some(function (l, i) {
+            if (l.indexOf('Hello from Component A') > -1) {
+              line = i + 1
+              return true
+            }
+          })
+          var pos = smc.originalPositionFor({
+            line: line,
+            column: 0
+          })
+          expect(pos.source.indexOf('webpack:///test/fixtures/basic.vue') > -1)
+          expect(pos.line).to.equal(4)
+          done()
+        })
+      })
+    })
+  })
+
+})

From 7c8535b4967a578f37a340f988753f3fdc5f58cf Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Jun 2015 18:49:58 -0400
Subject: [PATCH 022/877] 2.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c8157b571..9460d859a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From e9feb634fc34a142d64e56859f65aa4ca211dad5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Jun 2015 19:28:07 -0400
Subject: [PATCH 023/877] ci

---
 README.md  | 2 +-
 circle.yml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 circle.yml

diff --git a/README.md b/README.md
index 736b3d699..a8230ddf5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader
+# vue-loader [![Build Status](https://img.shields.io/circleci/project/vuejs/vue-loader.svg)](https://circleci.com/gh/vuejs/vue-loader)
 
 > Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
 
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 000000000..72b639b85
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,3 @@
+machine:
+  node:
+    version: iojs-v2.3.0

From 6fb52acc02e57083e920b75dcd94bba9f1d47b9b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Jun 2015 19:37:37 -0400
Subject: [PATCH 024/877] restructure files

---
 index.js                       | 109 +--------------------------------
 lib/loader.js                  | 108 ++++++++++++++++++++++++++++++++
 parser.js => lib/parser.js     |   0
 selector.js => lib/selector.js |   0
 4 files changed, 109 insertions(+), 108 deletions(-)
 create mode 100644 lib/loader.js
 rename parser.js => lib/parser.js (100%)
 rename selector.js => lib/selector.js (100%)

diff --git a/index.js b/index.js
index 1965481bb..18abae36c 100644
--- a/index.js
+++ b/index.js
@@ -1,108 +1 @@
-var loaderUtils = require("loader-utils")
-
-module.exports = function (content) {
-  this.cacheable()
-  var cb = this.async()
-  var languages = {}
-  var output = ''
-  var vueUrl = loaderUtils.getRemainingRequest(this)
-
-  // check if there are custom loaders specified with
-  // vueLoader.withLoaders(), otherwise use defaults
-  var loaders = loaderUtils.parseQuery(this.query)
-  loaders.html = loaders.html || 'html'
-  loaders.css  = loaders.css || 'style!css'
-  loaders.js   = loaders.js || ''
-
-  var loaderPrefix = {
-    template: 'html!template-html-loader?raw&engine=',
-    style: 'style!css!',
-    script: ''
-  }
-
-  var defaultLang = {
-    template: 'html',
-    style: 'css',
-    script: 'js'
-  }
-
-  /**
-   * Determine the loaders to use for an extracted part.
-   *
-   * @param {String} part - style|script|template
-   * @param {String} lang
-   * @return {String}
-   */
-  function loader(part, lang) {
-    lang = lang || defaultLang[part]
-    var loader = loaders[lang] !== undefined
-      ? loaders[lang]
-      : loaderPrefix[part] + lang
-    return loader ? loader + '!' : ''
-  }
-
-  /**
-   * Generate a require call for an extracted part.
-   *
-   * @param {String} part - style|script|template
-   * @param {String} lang
-   * @return {String}
-   */
-  var self = this
-  function getRequire(part, lang) {
-    return 'require(' +
-      loaderUtils.stringifyRequest(self,
-        '-!' + loader(part, lang) +
-        require.resolve('./selector.js') + '?' + part + '/' + lang + '!' +
-        vueUrl
-      ) +
-    ')'
-  }
-
-  var self = this
-  var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl
-  this.loadModule(url, function(err, source) {
-    if (err) return cb(err)
-
-    // up to this part, what we have done is basically executing
-    // parser.js on the raw vue file and get the parsing result
-    // which is an object that contains info about the vue file.
-    var parts = self.exec(source, url)
-
-    // add require for all the src imports
-    for (var i = 0; i < parts.includes.length; i++) {
-      var importReqeust = loaderUtils.urlToRequest(parts.includes[i])
-      output += 'require(' + loaderUtils.stringifyRequest(this, importReqeust) + ')\n'
-    }
-
-    // add require for styles
-    for (var lang in parts.style) {
-      output += getRequire('style', lang) + '\n'
-    }
-
-    // add require for script
-    for (var lang in parts.script) {
-      output += 'module.exports = ' + getRequire('script', lang) + '\n'
-    }
-
-    // add require for template
-    var hasTemplate = false
-    for (var lang in parts.template) {
-      if (hasTemplate)
-        return cb(new Error('Only one template element allowed per vue component!'))
-      output += 'module.exports.template = ' + getRequire('template', lang)
-      hasTemplate = true
-    }
-
-    // done
-    cb(null, output)
-  })
-}
-
-/**
- * Expose a way to specify custom loaders to be used at the
- * end for the extracted parts of a component.
- */
-module.exports.withLoaders = function (opts) {
-  return 'vue-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
-}
+module.exports = require('./lib/loader')
diff --git a/lib/loader.js b/lib/loader.js
new file mode 100644
index 000000000..1965481bb
--- /dev/null
+++ b/lib/loader.js
@@ -0,0 +1,108 @@
+var loaderUtils = require("loader-utils")
+
+module.exports = function (content) {
+  this.cacheable()
+  var cb = this.async()
+  var languages = {}
+  var output = ''
+  var vueUrl = loaderUtils.getRemainingRequest(this)
+
+  // check if there are custom loaders specified with
+  // vueLoader.withLoaders(), otherwise use defaults
+  var loaders = loaderUtils.parseQuery(this.query)
+  loaders.html = loaders.html || 'html'
+  loaders.css  = loaders.css || 'style!css'
+  loaders.js   = loaders.js || ''
+
+  var loaderPrefix = {
+    template: 'html!template-html-loader?raw&engine=',
+    style: 'style!css!',
+    script: ''
+  }
+
+  var defaultLang = {
+    template: 'html',
+    style: 'css',
+    script: 'js'
+  }
+
+  /**
+   * Determine the loaders to use for an extracted part.
+   *
+   * @param {String} part - style|script|template
+   * @param {String} lang
+   * @return {String}
+   */
+  function loader(part, lang) {
+    lang = lang || defaultLang[part]
+    var loader = loaders[lang] !== undefined
+      ? loaders[lang]
+      : loaderPrefix[part] + lang
+    return loader ? loader + '!' : ''
+  }
+
+  /**
+   * Generate a require call for an extracted part.
+   *
+   * @param {String} part - style|script|template
+   * @param {String} lang
+   * @return {String}
+   */
+  var self = this
+  function getRequire(part, lang) {
+    return 'require(' +
+      loaderUtils.stringifyRequest(self,
+        '-!' + loader(part, lang) +
+        require.resolve('./selector.js') + '?' + part + '/' + lang + '!' +
+        vueUrl
+      ) +
+    ')'
+  }
+
+  var self = this
+  var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl
+  this.loadModule(url, function(err, source) {
+    if (err) return cb(err)
+
+    // up to this part, what we have done is basically executing
+    // parser.js on the raw vue file and get the parsing result
+    // which is an object that contains info about the vue file.
+    var parts = self.exec(source, url)
+
+    // add require for all the src imports
+    for (var i = 0; i < parts.includes.length; i++) {
+      var importReqeust = loaderUtils.urlToRequest(parts.includes[i])
+      output += 'require(' + loaderUtils.stringifyRequest(this, importReqeust) + ')\n'
+    }
+
+    // add require for styles
+    for (var lang in parts.style) {
+      output += getRequire('style', lang) + '\n'
+    }
+
+    // add require for script
+    for (var lang in parts.script) {
+      output += 'module.exports = ' + getRequire('script', lang) + '\n'
+    }
+
+    // add require for template
+    var hasTemplate = false
+    for (var lang in parts.template) {
+      if (hasTemplate)
+        return cb(new Error('Only one template element allowed per vue component!'))
+      output += 'module.exports.template = ' + getRequire('template', lang)
+      hasTemplate = true
+    }
+
+    // done
+    cb(null, output)
+  })
+}
+
+/**
+ * Expose a way to specify custom loaders to be used at the
+ * end for the extracted parts of a component.
+ */
+module.exports.withLoaders = function (opts) {
+  return 'vue-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
+}
diff --git a/parser.js b/lib/parser.js
similarity index 100%
rename from parser.js
rename to lib/parser.js
diff --git a/selector.js b/lib/selector.js
similarity index 100%
rename from selector.js
rename to lib/selector.js

From 43ed65a250fa3989d30aa3187b0e2d9b8fd3be14 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Jun 2015 19:39:43 -0400
Subject: [PATCH 025/877] fix license [ci skip]

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9460d859a..95f085aef 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "loader"
   ],
   "author": "Sjoerd Visscher",
-  "license": "ISC",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/vuejs/vue-loader/issues"
   },

From 541a01a3b0b079f339c3dc6222332b0fbb274480 Mon Sep 17 00:00:00 2001
From: Sjoerd Visscher <sjoerd@w3future.com>
Date: Tue, 23 Jun 2015 15:01:33 +0200
Subject: [PATCH 026/877] Support empty template tags

---
 lib/parser.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 203251486..433a62717 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -32,8 +32,11 @@ module.exports = function (content) {
       return
 
     // Work around changes in parse5 >= 1.2.0
-    if (node.children[0].type === 'root')
+    if (node.children[0].type === 'root') {
       node = node.children[0]
+      if (!node.children.length)
+        return;
+    }
 
     var start = node.children[0].__location.start
     var end = node.children[node.children.length - 1].__location.end

From 6ac8b2e8c2c4b4e587f10e3ed5e390a4bdadb8a8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jul 2015 23:36:08 -0700
Subject: [PATCH 027/877] add eslint

---
 .eslintrc       | 179 ++++++++++++++++++++++++++++++++++++++++++++++++
 lib/loader.js   |  28 ++++----
 lib/parser.js   |  16 ++---
 lib/selector.js |   4 +-
 package.json    |   4 +-
 5 files changed, 205 insertions(+), 26 deletions(-)
 create mode 100644 .eslintrc

diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 000000000..068f0d4a4
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,179 @@
+{
+  "env": {
+    "browser": true,
+    "node": true
+  },
+
+  "rules": {
+    "accessor-pairs": 2,
+    "array-bracket-spacing": 0,
+    "block-scoped-var": 0,
+    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
+    "camelcase": 0,
+    "comma-dangle": [2, "never"],
+    "comma-spacing": [2, { "before": false, "after": true }],
+    "comma-style": [2, "last"],
+    "complexity": 0,
+    "computed-property-spacing": 0,
+    "consistent-return": 0,
+    "consistent-this": 0,
+    "constructor-super": 2,
+    "curly": [2, "multi-line"],
+    "default-case": 0,
+    "dot-location": [2, "property"],
+    "dot-notation": 0,
+    "eol-last": 2,
+    "eqeqeq": [2, "allow-null"],
+    "func-names": 0,
+    "func-style": 0,
+    "generator-star": 0,
+    "generator-star-spacing": [2, { "before": true, "after": true }],
+    "global-strict": 0,
+    "guard-for-in": 0,
+    "handle-callback-err": [2, "^(err|error)$" ],
+    "indent": [2, 2],
+    "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
+    "linebreak-style": 0,
+    "lines-around-comment": 0,
+    "max-depth": 0,
+    "max-len": 0,
+    "max-nested-callbacks": 0,
+    "max-params": 0,
+    "max-statements": 0,
+    "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
+    "new-parens": 2,
+    "newline-after-var": 0,
+    "no-alert": 0,
+    "no-array-constructor": 2,
+    "no-bitwise": 0,
+    "no-caller": 2,
+    "no-catch-shadow": 0,
+    "no-comma-dangle": 0,
+    "no-cond-assign": 2,
+    "no-console": 0,
+    "no-constant-condition": 0,
+    "no-continue": 0,
+    "no-control-regex": 2,
+    "no-debugger": 2,
+    "no-delete-var": 2,
+    "no-div-regex": 0,
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-else-return": 0,
+    "no-empty": 0,
+    "no-empty-character-class": 2,
+    "no-empty-class": 0,
+    "no-empty-label": 2,
+    "no-eq-null": 0,
+    "no-eval": 2,
+    "no-ex-assign": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-parens": 0,
+    "no-extra-semi": 0,
+    "no-extra-strict": 0,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 2,
+    "no-func-assign": 2,
+    "no-implied-eval": 2,
+    "no-inline-comments": 0,
+    "no-inner-declarations": [2, "functions"],
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-iterator": 2,
+    "no-label-var": 2,
+    "no-labels": 2,
+    "no-lone-blocks": 2,
+    "no-lonely-if": 0,
+    "no-loop-func": 0,
+    "no-mixed-requires": 0,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multi-spaces": 2,
+    "no-multi-str": 2,
+    "no-multiple-empty-lines": [2, { "max": 1 }],
+    "no-native-reassign": 2,
+    "no-negated-in-lhs": 2,
+    "no-nested-ternary": 0,
+    "no-new": 2,
+    "no-new-func": 0,
+    "no-new-object": 2,
+    "no-new-require": 2,
+    "no-new-wrappers": 2,
+    "no-obj-calls": 2,
+    "no-octal": 2,
+    "no-octal-escape": 2,
+    "no-param-reassign": 0,
+    "no-path-concat": 0,
+    "no-plusplus": 0,
+    "no-process-env": 0,
+    "no-process-exit": 0,
+    "no-proto": 0,
+    "no-redeclare": 2,
+    "no-regex-spaces": 2,
+    "no-reserved-keys": 0,
+    "no-restricted-modules": 0,
+    "no-return-assign": 2,
+    "no-script-url": 0,
+    "no-self-compare": 2,
+    "no-sequences": 2,
+    "no-shadow": 0,
+    "no-shadow-restricted-names": 2,
+    "no-space-before-semi": 0,
+    "no-spaced-func": 2,
+    "no-sparse-arrays": 2,
+    "no-sync": 0,
+    "no-ternary": 0,
+    "no-this-before-super": 2,
+    "no-throw-literal": 2,
+    "no-trailing-spaces": 2,
+    "no-undef": 2,
+    "no-undef-init": 2,
+    "no-undefined": 0,
+    "no-underscore-dangle": 0,
+    "no-unexpected-multiline": 2,
+    "no-unneeded-ternary": 2,
+    "no-unreachable": 2,
+    "no-unused-expressions": 0,
+    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
+    "no-use-before-define": 0,
+    "no-var": 0,
+    "no-void": 0,
+    "no-warning-comments": 0,
+    "no-with": 2,
+    "object-curly-spacing": 0,
+    "object-shorthand": 0,
+    "one-var": [2, { "initialized": "never" }],
+    "operator-assignment": 0,
+    "operator-linebreak": [2, "after"],
+    "padded-blocks": 0,
+    "prefer-const": 0,
+    "quote-props": 0,
+    "quotes": [2, "single", "avoid-escape"],
+    "radix": 2,
+    "semi": [2, "never"],
+    "semi-spacing": 0,
+    "sort-vars": 0,
+    "space-after-function-name": 0,
+    "space-after-keywords": [2, "always"],
+    "space-before-blocks": [2, "always"],
+    "space-before-function-paren": [2, "always"],
+    "space-before-function-parentheses": 0,
+    "space-in-brackets": 0,
+    "space-in-parens": [2, "never"],
+    "space-infix-ops": 2,
+    "space-return-throw-case": 2,
+    "space-unary-ops": [2, { "words": true, "nonwords": false }],
+    "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
+    "spaced-line-comment": 0,
+    "strict": 0,
+    "use-isnan": 2,
+    "valid-jsdoc": 0,
+    "valid-typeof": 2,
+    "vars-on-top": 0,
+    "wrap-iife": [2, "any"],
+    "wrap-regex": 0,
+    "yoda": [2, "never"]
+  }
+}
diff --git a/lib/loader.js b/lib/loader.js
index 1965481bb..5ce83ff03 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,9 +1,9 @@
-var loaderUtils = require("loader-utils")
+var loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
+  var self = this
   this.cacheable()
   var cb = this.async()
-  var languages = {}
   var output = ''
   var vueUrl = loaderUtils.getRemainingRequest(this)
 
@@ -11,8 +11,8 @@ module.exports = function (content) {
   // vueLoader.withLoaders(), otherwise use defaults
   var loaders = loaderUtils.parseQuery(this.query)
   loaders.html = loaders.html || 'html'
-  loaders.css  = loaders.css || 'style!css'
-  loaders.js   = loaders.js || ''
+  loaders.css = loaders.css || 'style!css'
+  loaders.js = loaders.js || ''
 
   var loaderPrefix = {
     template: 'html!template-html-loader?raw&engine=',
@@ -33,7 +33,7 @@ module.exports = function (content) {
    * @param {String} lang
    * @return {String}
    */
-  function loader(part, lang) {
+  function loader (part, lang) {
     lang = lang || defaultLang[part]
     var loader = loaders[lang] !== undefined
       ? loaders[lang]
@@ -48,8 +48,7 @@ module.exports = function (content) {
    * @param {String} lang
    * @return {String}
    */
-  var self = this
-  function getRequire(part, lang) {
+  function getRequire (part, lang) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         '-!' + loader(part, lang) +
@@ -59,15 +58,15 @@ module.exports = function (content) {
     ')'
   }
 
-  var self = this
-  var url = "!!" + require.resolve("./parser.js") + "!" + vueUrl
-  this.loadModule(url, function(err, source) {
+  var url = '!!' + require.resolve('./parser.js') + '!' + vueUrl
+  this.loadModule(url, function (err, source) {
     if (err) return cb(err)
 
     // up to this part, what we have done is basically executing
     // parser.js on the raw vue file and get the parsing result
     // which is an object that contains info about the vue file.
     var parts = self.exec(source, url)
+    var lang
 
     // add require for all the src imports
     for (var i = 0; i < parts.includes.length; i++) {
@@ -76,20 +75,21 @@ module.exports = function (content) {
     }
 
     // add require for styles
-    for (var lang in parts.style) {
+    for (lang in parts.style) {
       output += getRequire('style', lang) + '\n'
     }
 
     // add require for script
-    for (var lang in parts.script) {
+    for (lang in parts.script) {
       output += 'module.exports = ' + getRequire('script', lang) + '\n'
     }
 
     // add require for template
     var hasTemplate = false
-    for (var lang in parts.template) {
-      if (hasTemplate)
+    for (lang in parts.template) {
+      if (hasTemplate) {
         return cb(new Error('Only one template element allowed per vue component!'))
+      }
       output += 'module.exports.template = ' + getRequire('template', lang)
       hasTemplate = true
     }
diff --git a/lib/parser.js b/lib/parser.js
index 433a62717..6f8441fd2 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,14 +1,9 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2, { locationInfo: true })
-var loaderUtils = require("loader-utils")
 
 module.exports = function (content) {
   this.cacheable()
   var cb = this.async()
-  var vueRequest = loaderUtils.getRemainingRequest(this)
-  var request = loaderUtils.getCurrentRequest(this)
-
-  var languages = {}
   var output = {
     template: {},
     style: {},
@@ -23,19 +18,22 @@ module.exports = function (content) {
       return
     }
 
-    if (!node.children || !node.children.length)
+    if (!node.children || !node.children.length) {
       return
+    }
 
     var lang = (node.attribs && node.attribs.lang) || ''
     var type = node.name
-    if (!output[type])
+    if (!output[type]) {
       return
+    }
 
     // Work around changes in parse5 >= 1.2.0
     if (node.children[0].type === 'root') {
       node = node.children[0]
-      if (!node.children.length)
-        return;
+      if (!node.children.length) {
+        return
+      }
     }
 
     var start = node.children[0].__location.start
diff --git a/lib/selector.js b/lib/selector.js
index c98db663c..63d157e56 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -4,8 +4,8 @@ module.exports = function () {
   var path = this.query.substr(1).split('/')
 
   var self = this
-  var url = "!!" + require.resolve("./parser.js") + "!" + this.resource
-  this.loadModule(url, function(err, source) {
+  var url = '!!' + require.resolve('./parser.js') + '!' + this.resource
+  this.loadModule(url, function (err, source) {
     if (err) return cb(err)
     var parts = self.exec(source, url)
     var type = path[0]
diff --git a/package.json b/package.json
index 95f085aef..455ecf1d1 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
   },
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
-    "test": "mocha test/test.js --slow 2000"
+    "lint": "eslint lib",
+    "test": "eslint lib && mocha test/test.js --slow 2000"
   },
   "dependencies": {
     "loader-utils": "^0.2.7",
@@ -35,6 +36,7 @@
     "babel-loader": "^5.1.4",
     "chai": "^3.0.0",
     "css-loader": "^0.14.4",
+    "eslint": "^1.0.0-rc-1",
     "html-loader": "^0.3.0",
     "jade": "^1.11.0",
     "jsdom": "^5.4.3",

From e682a36fc0bcbd5cbd6efd7182e5077b76d30e64 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jul 2015 23:45:36 -0700
Subject: [PATCH 028/877] upgrade deps & use parse5 default adaptor

---
 lib/parser.js | 38 ++++++++++++++++++++++++++------------
 package.json  |  6 +++---
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 6f8441fd2..d53e196fd 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,5 +1,5 @@
 var parse5 = require('parse5')
-var parser = new parse5.Parser(parse5.TreeAdapters.htmlparser2, { locationInfo: true })
+var parser = new parse5.Parser(null, { locationInfo: true })
 
 module.exports = function (content) {
   this.cacheable()
@@ -12,34 +12,48 @@ module.exports = function (content) {
   }
 
   var fragment = parser.parseFragment(content)
-  fragment.children.forEach(function (node) {
-    if (node.attribs && node.attribs.src) {
-      output.includes.push(node.attribs.src)
+  fragment.childNodes.forEach(function (node) {
+    var src = getAttribute(node, 'src')
+    if (src) {
+      output.includes.push(src)
       return
     }
 
-    if (!node.children || !node.children.length) {
+    if (!node.childNodes || !node.childNodes.length) {
       return
     }
 
-    var lang = (node.attribs && node.attribs.lang) || ''
-    var type = node.name
+    var lang = getAttribute(node, 'lang') || ''
+    var type = node.tagName
     if (!output[type]) {
       return
     }
 
     // Work around changes in parse5 >= 1.2.0
-    if (node.children[0].type === 'root') {
-      node = node.children[0]
-      if (!node.children.length) {
+    if (node.childNodes[0].nodeName === '#document-fragment') {
+      node = node.childNodes[0]
+      if (!node.childNodes.length) {
         return
       }
     }
 
-    var start = node.children[0].__location.start
-    var end = node.children[node.children.length - 1].__location.end
+    var start = node.childNodes[0].__location.start
+    var end = node.childNodes[node.childNodes.length - 1].__location.end
     output[type][lang] = content.substring(start, end).trim()
   })
 
   cb(null, 'module.exports = ' + JSON.stringify(output))
 }
+
+function getAttribute (node, name) {
+  if (node.attrs) {
+    var i = node.attrs.length
+    var attr
+    while (i--) {
+      attr = node.attrs[i]
+      if (attr.name === name) {
+        return attr.value
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 455ecf1d1..1e33f06a9 100644
--- a/package.json
+++ b/package.json
@@ -23,11 +23,11 @@
     "test": "eslint lib && mocha test/test.js --slow 2000"
   },
   "dependencies": {
-    "loader-utils": "^0.2.7",
-    "parse5": "^1.1.4"
+    "loader-utils": "^0.2.10",
+    "parse5": "^1.5.0"
   },
   "peerDependencies": {
-    "css-loader": "^0.14.4",
+    "css-loader": "^0.15.4",
     "html-loader": "^0.3.0",
     "style-loader": "^0.12.3"
   },

From c5119809212d37a674bebd14fecfc9f7c11b515d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 00:04:10 -0700
Subject: [PATCH 029/877] fix and add tests for import

---
 lib/loader.js            |  6 ++++--
 lib/parser.js            | 12 +++++++++---
 test/fixtures/import.css |  1 +
 test/fixtures/import.js  |  1 +
 test/fixtures/import.vue |  1 +
 test/test.js             | 12 +++++++++++-
 6 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/import.css
 create mode 100644 test/fixtures/import.js
 create mode 100644 test/fixtures/import.vue

diff --git a/lib/loader.js b/lib/loader.js
index 5ce83ff03..efce04317 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -70,8 +70,10 @@ module.exports = function (content) {
 
     // add require for all the src imports
     for (var i = 0; i < parts.includes.length; i++) {
-      var importReqeust = loaderUtils.urlToRequest(parts.includes[i])
-      output += 'require(' + loaderUtils.stringifyRequest(this, importReqeust) + ')\n'
+      var include = parts.includes[i]
+      output += 'require(' + loaderUtils.stringifyRequest(this,
+        '-!' + loader(include.type, include.lang) + include.src
+      ) + ')\n'
     }
 
     // add require for styles
diff --git a/lib/parser.js b/lib/parser.js
index d53e196fd..7766f732e 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -12,10 +12,18 @@ module.exports = function (content) {
   }
 
   var fragment = parser.parseFragment(content)
+
   fragment.childNodes.forEach(function (node) {
+    var type = node.tagName
+    var lang = getAttribute(node, 'lang') || ''
     var src = getAttribute(node, 'src')
+
     if (src) {
-      output.includes.push(src)
+      output.includes.push({
+        src: src,
+        type: type,
+        lang: lang
+      })
       return
     }
 
@@ -23,8 +31,6 @@ module.exports = function (content) {
       return
     }
 
-    var lang = getAttribute(node, 'lang') || ''
-    var type = node.tagName
     if (!output[type]) {
       return
     }
diff --git a/test/fixtures/import.css b/test/fixtures/import.css
new file mode 100644
index 000000000..5ce768ca5
--- /dev/null
+++ b/test/fixtures/import.css
@@ -0,0 +1 @@
+h1 { color: red; }
diff --git a/test/fixtures/import.js b/test/fixtures/import.js
new file mode 100644
index 000000000..a27caa453
--- /dev/null
+++ b/test/fixtures/import.js
@@ -0,0 +1 @@
+window.testModule = require('./import.vue')
diff --git a/test/fixtures/import.vue b/test/fixtures/import.vue
new file mode 100644
index 000000000..3425a8854
--- /dev/null
+++ b/test/fixtures/import.vue
@@ -0,0 +1 @@
+<style src="./import.css">
diff --git a/test/test.js b/test/test.js
index 3c3ad50ab..337ab8aaf 100644
--- a/test/test.js
+++ b/test/test.js
@@ -9,9 +9,9 @@ var SourceMapConsumer = require('source-map').SourceMapConsumer
 
 describe('vue-loader', function () {
 
+  var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
   var outputDir = path.resolve(__dirname, './output')
   var loaderPath = path.resolve(__dirname, '../')
-  var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
   var globalConfig = {
     output: {
       path: outputDir,
@@ -88,6 +88,16 @@ describe('vue-loader', function () {
     })
   })
 
+  it('import', function (done) {
+    test({
+      entry: './test/fixtures/import.js'
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('h1 { color: red; }')
+      done()
+    })
+  })
+
   it('source-map', function (done) {
     var config = assign({}, globalConfig, {
       entry: './test/fixtures/basic.js',

From 8a39647ec6f9aa2a32ceb169772a4b4cfc47422d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 00:04:30 -0700
Subject: [PATCH 030/877] bump 2.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1e33f06a9..969b8c5c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 14d63bb57e1cf38da7cae2e5a99f12188af138ea Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 00:11:40 -0700
Subject: [PATCH 031/877] fix dependencies

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 969b8c5c4..3e757ad2e 100644
--- a/package.json
+++ b/package.json
@@ -35,9 +35,7 @@
     "babel-core": "^5.5.8",
     "babel-loader": "^5.1.4",
     "chai": "^3.0.0",
-    "css-loader": "^0.14.4",
     "eslint": "^1.0.0-rc-1",
-    "html-loader": "^0.3.0",
     "jade": "^1.11.0",
     "jsdom": "^5.4.3",
     "mkdirp": "^0.5.1",
@@ -46,7 +44,6 @@
     "object-assign": "^3.0.0",
     "rimraf": "^2.4.0",
     "source-map": "^0.4.2",
-    "style-loader": "^0.12.3",
     "stylus-loader": "^1.2.0",
     "template-html-loader": "0.0.3",
     "webpack": "^1.9.11"

From 1eaf7a63cdc85bfb6ca3696a0a48e64a0e80a7d5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 00:43:22 -0700
Subject: [PATCH 032/877] still include default loaders as dev deps

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 3e757ad2e..4418c6ed4 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,9 @@
     "babel-core": "^5.5.8",
     "babel-loader": "^5.1.4",
     "chai": "^3.0.0",
+    "css-loader": "^0.15.4",
     "eslint": "^1.0.0-rc-1",
+    "html-loader": "^0.3.0",
     "jade": "^1.11.0",
     "jsdom": "^5.4.3",
     "mkdirp": "^0.5.1",
@@ -44,6 +46,7 @@
     "object-assign": "^3.0.0",
     "rimraf": "^2.4.0",
     "source-map": "^0.4.2",
+    "style-loader": "^0.12.3",
     "stylus-loader": "^1.2.0",
     "template-html-loader": "0.0.3",
     "webpack": "^1.9.11"

From 72f199135485fa149badc394b12696987bfc6a4e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 00:45:12 -0700
Subject: [PATCH 033/877] bump 2.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4418c6ed4..e5ee41521 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 39f322d50bb9918b2dedf2d6ab98b9887774f7ca Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 00:49:47 -0700
Subject: [PATCH 034/877] readme + bump 2.1.0 (because src import handling is a
 breaking change)

---
 README.md    | 7 ++++---
 package.json | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a8230ddf5..b5f69249a 100644
--- a/README.md
+++ b/README.md
@@ -47,13 +47,14 @@ module.exports =
 </script>
 ```
 
-And you can import using the `src` attribute (note that there's no need for a `lang` attribute here, as Webpack will
-be used to determine which loader applies):
+And you can import using the `src` attribute:
 
 ``` html
-<style src="style.styl"></style>
+<style lang="stylus" src="./style.styl"></style>
 ```
 
+**NOTE**: Starting from version 2.1.0, `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from node modules: `<style src="todomvc-app-css/index.css">`.
+
 ## Usage
 
 Config Webpack:
diff --git a/package.json b/package.json
index e5ee41521..b43ca86d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From f35429022b7460e572cdce58b32254a42b34f14a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 02:14:28 -0700
Subject: [PATCH 035/877] refactor

---
 lib/loader.js   | 105 +++++++++++++++++++++++++-----------------------
 lib/parser.js   |  24 ++++++++---
 lib/selector.js |   8 ++--
 3 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index efce04317..0a07966cb 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,4 +1,7 @@
 var loaderUtils = require('loader-utils')
+var selectorPath = require.resolve('./selector')
+var parserPath = require.resolve('./parser')
+var cssRewriterPath = require.resolve('./css-rewriter')
 
 module.exports = function (content) {
   var self = this
@@ -26,39 +29,48 @@ module.exports = function (content) {
     script: 'js'
   }
 
-  /**
-   * Determine the loaders to use for an extracted part.
-   *
-   * @param {String} part - style|script|template
-   * @param {String} lang
-   * @return {String}
-   */
-  function loader (part, lang) {
-    lang = lang || defaultLang[part]
-    var loader = loaders[lang] !== undefined
-      ? loaders[lang]
-      : loaderPrefix[part] + lang
-    return loader ? loader + '!' : ''
+  function getRequire (type, part, index) {
+    return 'require(' +
+      loaderUtils.stringifyRequest(self,
+        // disable system loaders (except post loaders)
+        '-!' +
+        // check for local CSS rewrite
+        (part.local ? cssRewriterPath + '!' : '') +
+        // get loader string for pre-processors
+        getPreprocessorString(type, part.lang) +
+        // select the corresponding part from the vue file
+        getSelectorString(type, index || 0) +
+        // the url to the actual vuefile
+        vueUrl
+      ) +
+    ')\n'
   }
 
-  /**
-   * Generate a require call for an extracted part.
-   *
-   * @param {String} part - style|script|template
-   * @param {String} lang
-   * @return {String}
-   */
-  function getRequire (part, lang) {
+  function getRequireForImport (include) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
-        '-!' + loader(part, lang) +
-        require.resolve('./selector.js') + '?' + part + '/' + lang + '!' +
-        vueUrl
+        '-!' +
+        getPreprocessorString(include.type, include.lang) +
+        include.src
       ) +
-    ')'
+    ')\n'
+  }
+
+  function getPreprocessorString (type, lang) {
+    lang = lang || defaultLang[type]
+    var loader = loaders[lang] !== undefined
+      ? loaders[lang]
+      : loaderPrefix[type] + lang
+    return loader ? loader + '!' : ''
   }
 
-  var url = '!!' + require.resolve('./parser.js') + '!' + vueUrl
+  function getSelectorString (type, index) {
+    return selectorPath +
+      '?type=' + type +
+      '&index=' + index + '!'
+  }
+
+  var url = '!!' + parserPath + '!' + vueUrl
   this.loadModule(url, function (err, source) {
     if (err) return cb(err)
 
@@ -66,34 +78,27 @@ module.exports = function (content) {
     // parser.js on the raw vue file and get the parsing result
     // which is an object that contains info about the vue file.
     var parts = self.exec(source, url)
-    var lang
-
-    // add require for all the src imports
-    for (var i = 0; i < parts.includes.length; i++) {
-      var include = parts.includes[i]
-      output += 'require(' + loaderUtils.stringifyRequest(this,
-        '-!' + loader(include.type, include.lang) + include.src
-      ) + ')\n'
-    }
 
-    // add require for styles
-    for (lang in parts.style) {
-      output += getRequire('style', lang) + '\n'
-    }
+    // add requires for src imports
+    parts.includes.forEach(function (include) {
+      output += getRequireForImport(include)
+    })
+
+    // add requires for styles
+    parts.style.forEach(function (style, i) {
+      output += getRequire('style', style, i)
+    })
 
-    // add require for script
-    for (lang in parts.script) {
-      output += 'module.exports = ' + getRequire('script', lang) + '\n'
+    // only one script tag allowed
+    if (parts.script.length) {
+      output += 'module.exports = ' +
+        getRequire('script', parts.script[0])
     }
 
-    // add require for template
-    var hasTemplate = false
-    for (lang in parts.template) {
-      if (hasTemplate) {
-        return cb(new Error('Only one template element allowed per vue component!'))
-      }
-      output += 'module.exports.template = ' + getRequire('template', lang)
-      hasTemplate = true
+    // only one template tag allowed
+    if (parts.template.length) {
+      output += 'module.exports.template = ' +
+        getRequire('template', parts.template[0])
     }
 
     // done
diff --git a/lib/parser.js b/lib/parser.js
index 7766f732e..92d2d6a5c 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -5,9 +5,9 @@ module.exports = function (content) {
   this.cacheable()
   var cb = this.async()
   var output = {
-    template: {},
-    style: {},
-    script: {},
+    template: [],
+    style: [],
+    script: [],
     includes: []
   }
 
@@ -15,8 +15,9 @@ module.exports = function (content) {
 
   fragment.childNodes.forEach(function (node) {
     var type = node.tagName
-    var lang = getAttribute(node, 'lang') || ''
+    var lang = getAttribute(node, 'lang')
     var src = getAttribute(node, 'src')
+    var local = getAttribute(node, 'local')
 
     if (src) {
       output.includes.push({
@@ -35,6 +36,15 @@ module.exports = function (content) {
       return
     }
 
+    if (
+      (type === 'script' || type === 'template') &&
+      output[type].length > 0
+    ) {
+      return cb(new Error(
+        'Only one <script> or <template> tag is allowed inside a Vue component.'
+      ))
+    }
+
     // Work around changes in parse5 >= 1.2.0
     if (node.childNodes[0].nodeName === '#document-fragment') {
       node = node.childNodes[0]
@@ -45,7 +55,11 @@ module.exports = function (content) {
 
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
-    output[type][lang] = content.substring(start, end).trim()
+    output[type].push({
+      lang: lang,
+      local: local,
+      content: content.substring(start, end).trim()
+    })
   })
 
   cb(null, 'module.exports = ' + JSON.stringify(output))
diff --git a/lib/selector.js b/lib/selector.js
index 63d157e56..10edd69aa 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -1,15 +1,15 @@
+var loaderUtils = require('loader-utils')
+
 module.exports = function () {
   this.cacheable()
   var cb = this.async()
-  var path = this.query.substr(1).split('/')
+  var query = loaderUtils.parseQuery(this.query)
 
   var self = this
   var url = '!!' + require.resolve('./parser.js') + '!' + this.resource
   this.loadModule(url, function (err, source) {
     if (err) return cb(err)
     var parts = self.exec(source, url)
-    var type = path[0]
-    var lang = path[1] || ''
-    cb(null, parts[type][lang])
+    cb(null, parts[query.type][query.index].content)
   })
 }

From 27e3500ed7392d613794df1106c593b51e9f4883 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 02:35:16 -0700
Subject: [PATCH 036/877] wip

---
 lib/css-rewriter.js         |  5 +++++
 lib/loader.js               | 20 ++++++++++----------
 lib/parser.js               |  2 +-
 test/fixtures/import.js     |  1 -
 test/fixtures/local-css.vue |  3 +++
 test/test.js                | 12 +++++++++++-
 6 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 lib/css-rewriter.js
 delete mode 100644 test/fixtures/import.js
 create mode 100644 test/fixtures/local-css.vue

diff --git a/lib/css-rewriter.js b/lib/css-rewriter.js
new file mode 100644
index 000000000..9648e4d4f
--- /dev/null
+++ b/lib/css-rewriter.js
@@ -0,0 +1,5 @@
+module.exports = function (css) {
+  this.cacheable()
+  console.log(css)
+  return css
+}
diff --git a/lib/loader.js b/lib/loader.js
index 0a07966cb..7873879fc 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -34,10 +34,8 @@ module.exports = function (content) {
       loaderUtils.stringifyRequest(self,
         // disable system loaders (except post loaders)
         '-!' +
-        // check for local CSS rewrite
-        (part.local ? cssRewriterPath + '!' : '') +
         // get loader string for pre-processors
-        getPreprocessorString(type, part.lang) +
+        getLoaderString(type, part) +
         // select the corresponding part from the vue file
         getSelectorString(type, index || 0) +
         // the url to the actual vuefile
@@ -50,18 +48,20 @@ module.exports = function (content) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         '-!' +
-        getPreprocessorString(include.type, include.lang) +
+        getLoaderString(include.type, include) +
         include.src
       ) +
     ')\n'
   }
 
-  function getPreprocessorString (type, lang) {
-    lang = lang || defaultLang[type]
-    var loader = loaders[lang] !== undefined
-      ? loaders[lang]
-      : loaderPrefix[type] + lang
-    return loader ? loader + '!' : ''
+  function getLoaderString (type, part) {
+    var lang = part.lang || defaultLang[type]
+    var localCssString = type === 'style' && part.local
+      ? cssRewriterPath + '!'
+      : ''
+    return loaders[lang] !== undefined
+      ? loaders[lang] + '!' + localCssString
+      : loaderPrefix[type] + localCssString + lang + '!'
   }
 
   function getSelectorString (type, index) {
diff --git a/lib/parser.js b/lib/parser.js
index 92d2d6a5c..79411b25b 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -57,7 +57,7 @@ module.exports = function (content) {
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     output[type].push({
       lang: lang,
-      local: local,
+      local: local != null,
       content: content.substring(start, end).trim()
     })
   })
diff --git a/test/fixtures/import.js b/test/fixtures/import.js
deleted file mode 100644
index a27caa453..000000000
--- a/test/fixtures/import.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./import.vue')
diff --git a/test/fixtures/local-css.vue b/test/fixtures/local-css.vue
new file mode 100644
index 000000000..85d8826c1
--- /dev/null
+++ b/test/fixtures/local-css.vue
@@ -0,0 +1,3 @@
+<style local>
+h1 { color: red; }
+</style>
diff --git a/test/test.js b/test/test.js
index 337ab8aaf..67f490e17 100644
--- a/test/test.js
+++ b/test/test.js
@@ -90,7 +90,17 @@ describe('vue-loader', function () {
 
   it('import', function (done) {
     test({
-      entry: './test/fixtures/import.js'
+      entry: './test/fixtures/import.vue'
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('h1 { color: red; }')
+      done()
+    })
+  })
+
+  it('local-css', function (done) {
+    test({
+      entry: './test/fixtures/local-css.vue'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('h1 { color: red; }')

From 9c93331cf7a843aa2b1b0948dc15ba39012d454d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 05:59:02 -0700
Subject: [PATCH 037/877] local css

---
 lib/css-rewriter.js         |  5 ---
 lib/loader.js               | 61 ++++++++++++++++++++++---------------
 lib/style-rewriter.js       | 33 ++++++++++++++++++++
 lib/template-rewriter.js    | 30 ++++++++++++++++++
 package.json                |  4 ++-
 test/fixtures/local-css.js  |  1 +
 test/fixtures/local-css.vue | 15 ++++++++-
 test/test.js                | 11 +++++--
 8 files changed, 126 insertions(+), 34 deletions(-)
 delete mode 100644 lib/css-rewriter.js
 create mode 100644 lib/style-rewriter.js
 create mode 100644 lib/template-rewriter.js
 create mode 100644 test/fixtures/local-css.js

diff --git a/lib/css-rewriter.js b/lib/css-rewriter.js
deleted file mode 100644
index 9648e4d4f..000000000
--- a/lib/css-rewriter.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = function (css) {
-  this.cacheable()
-  console.log(css)
-  return css
-}
diff --git a/lib/loader.js b/lib/loader.js
index 7873879fc..f3d823a6c 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,7 +1,17 @@
 var loaderUtils = require('loader-utils')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
-var cssRewriterPath = require.resolve('./css-rewriter')
+
+var defaultLang = {
+  template: 'html',
+  style: 'css',
+  script: 'js'
+}
+
+var rewriters = {
+  template: require.resolve('./template-rewriter') + '!',
+  style: require.resolve('./style-rewriter') + '!'
+}
 
 module.exports = function (content) {
   var self = this
@@ -17,25 +27,13 @@ module.exports = function (content) {
   loaders.css = loaders.css || 'style!css'
   loaders.js = loaders.js || ''
 
-  var loaderPrefix = {
-    template: 'html!template-html-loader?raw&engine=',
-    style: 'style!css!',
-    script: ''
-  }
-
-  var defaultLang = {
-    template: 'html',
-    style: 'css',
-    script: 'js'
-  }
-
-  function getRequire (type, part, index) {
+  function getRequire (type, part, index, local) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         // disable system loaders (except post loaders)
         '-!' +
         // get loader string for pre-processors
-        getLoaderString(type, part) +
+        getLoaderString(type, part, local) +
         // select the corresponding part from the vue file
         getSelectorString(type, index || 0) +
         // the url to the actual vuefile
@@ -54,14 +52,25 @@ module.exports = function (content) {
     ')\n'
   }
 
-  function getLoaderString (type, part) {
+  function getLoaderString (type, part, local) {
     var lang = part.lang || defaultLang[type]
-    var localCssString = type === 'style' && part.local
-      ? cssRewriterPath + '!'
-      : ''
-    return loaders[lang] !== undefined
-      ? loaders[lang] + '!' + localCssString
-      : loaderPrefix[type] + localCssString + lang + '!'
+    var rewriter = local ? rewriters[type] || '' : ''
+    var loader = loaders[lang]
+    if (loader !== undefined) {
+      // lang with default or pre-configured loader
+      if (loader) loader += '!'
+      return loader + rewriter
+    } else {
+      // unknown lang, assume a loader for it is used
+      switch (type) {
+      case 'template':
+        return 'html!' + rewriter + 'template-html-loader?raw&engine=' + lang + '!'
+      case 'style':
+        return 'style!css!' + rewriter + lang + '!'
+      case 'script':
+        return lang + '!'
+      }
+    }
   }
 
   function getSelectorString (type, index) {
@@ -78,6 +87,7 @@ module.exports = function (content) {
     // parser.js on the raw vue file and get the parsing result
     // which is an object that contains info about the vue file.
     var parts = self.exec(source, url)
+    var hasLocalStyles = false
 
     // add requires for src imports
     parts.includes.forEach(function (include) {
@@ -86,19 +96,20 @@ module.exports = function (content) {
 
     // add requires for styles
     parts.style.forEach(function (style, i) {
-      output += getRequire('style', style, i)
+      if (style.local) hasLocalStyles = true
+      output += getRequire('style', style, i, hasLocalStyles)
     })
 
     // only one script tag allowed
     if (parts.script.length) {
       output += 'module.exports = ' +
-        getRequire('script', parts.script[0])
+        getRequire('script', parts.script[0], 0, hasLocalStyles)
     }
 
     // only one template tag allowed
     if (parts.template.length) {
       output += 'module.exports.template = ' +
-        getRequire('template', parts.template[0])
+        getRequire('template', parts.template[0], 0, hasLocalStyles)
     }
 
     // done
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
new file mode 100644
index 000000000..3a13625b8
--- /dev/null
+++ b/lib/style-rewriter.js
@@ -0,0 +1,33 @@
+var postcss = require('postcss')
+var nested = require('postcss-nested')
+var hash = require('hash-sum')
+
+var currentClass
+var rootRE = /:root\b/g
+var processRoot = postcss.plugin('process-root', function () {
+  return function (root) {
+    root.each(function (node) {
+      node.each(function (node) {
+        if (rootRE.test(node.selector)) {
+          // replace :root selector
+          node.selector = node.selector.replace(rootRE, currentClass)
+          // move the node to the outer scope to avoid nesting
+          node.moveBefore(root.nodes[0])
+        }
+      })
+    })
+  }
+})
+
+module.exports = function (css) {
+  this.cacheable()
+  var cb = this.async()
+  var cls = currentClass = '.v-' + hash(this.resourcePath)
+  css = cls + '{' + css + '}'
+  postcss([processRoot, nested])
+    .process(css)
+    .then(function (result) {
+      cb(null, result)
+    })
+    .catch(cb)
+}
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
new file mode 100644
index 000000000..7ec2bf725
--- /dev/null
+++ b/lib/template-rewriter.js
@@ -0,0 +1,30 @@
+var parse5 = require('parse5')
+var parser = new parse5.Parser()
+var serializer = new parse5.Serializer()
+var hash = require('hash-sum')
+
+module.exports = function (html) {
+  this.cacheable()
+  var cls = 'v-' + hash(this.resourcePath)
+  var tree = parser.parseFragment(html)
+  tree.childNodes.forEach(function (node) {
+    if (node.attrs) {
+      var hasClass = false
+      for (var i = 0, l = node.attrs.length; i < l; i++) {
+        var attr = node.attrs[i]
+        if (attr.name === 'class') {
+          attr.value += ' ' + cls
+          hasClass = true
+          break
+        }
+      }
+      if (!hasClass) {
+        node.attrs.push({
+          name: 'class',
+          value: cls
+        })
+      }
+    }
+  })
+  return serializer.serialize(tree)
+}
diff --git a/package.json b/package.json
index b43ca86d0..b2dc28a51 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,10 @@
     "test": "eslint lib && mocha test/test.js --slow 2000"
   },
   "dependencies": {
+    "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
-    "parse5": "^1.5.0"
+    "parse5": "^1.5.0",
+    "postcss": "^4.1.16"
   },
   "peerDependencies": {
     "css-loader": "^0.15.4",
diff --git a/test/fixtures/local-css.js b/test/fixtures/local-css.js
new file mode 100644
index 000000000..519ba68d9
--- /dev/null
+++ b/test/fixtures/local-css.js
@@ -0,0 +1 @@
+window.testModule = require('./local-css.vue')
diff --git a/test/fixtures/local-css.vue b/test/fixtures/local-css.vue
index 85d8826c1..529b5f05f 100644
--- a/test/fixtures/local-css.vue
+++ b/test/fixtures/local-css.vue
@@ -1,3 +1,16 @@
 <style local>
-h1 { color: red; }
+:root {
+  color: red;
+}
+div:root.test {
+  color: blue;
+}
+h1 {
+  color: green;
+}
 </style>
+
+<template>
+<div><h1>hi</h1></div>
+<p class="abc def">hi</p>
+</template>
diff --git a/test/test.js b/test/test.js
index 67f490e17..544ddcaa7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -100,10 +100,17 @@ describe('vue-loader', function () {
 
   it('local-css', function (done) {
     test({
-      entry: './test/fixtures/local-css.vue'
+      entry: './test/fixtures/local-css.js'
     }, function (window) {
+      var module = window.testModule
+      expect(module.template).to.contain(
+        '<div class="v-5f0cf35a"><h1>hi</h1></div>\n' +
+        '<p class="abc def v-5f0cf35a">hi</p>'
+      )
       var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('h1 { color: red; }')
+      expect(style).to.match(/div\.v-5f0cf35a\.test {\s+color: blue;\n}/)
+      expect(style).to.match(/\.v-5f0cf35a {\s+color: red;\n}/)
+      expect(style).to.match(/\.v-5f0cf35a h1 {\s+color: green;\n}/)
       done()
     })
   })

From 1cc8f5b286bf0a67dca413e844b3c8ad0274ebf8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 06:00:01 -0700
Subject: [PATCH 038/877] include postcss-nested as dep

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2dc28a51..88e7abbb7 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
     "parse5": "^1.5.0",
-    "postcss": "^4.1.16"
+    "postcss": "^4.1.16",
+    "postcss-nested": "^0.3.2"
   },
   "peerDependencies": {
     "css-loader": "^0.15.4",

From fdb9e43b434f9340ab200d8de7b51f8c9487f08a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 06:18:08 -0700
Subject: [PATCH 039/877] make local styles work with import

---
 lib/loader.js                  | 15 ++++++++-------
 lib/parser.js                  | 20 +++++++++++++-------
 test/fixtures/import.local.css |  1 +
 test/fixtures/import.vue       |  3 ++-
 test/test.js                   | 26 ++++++++++++++------------
 5 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 test/fixtures/import.local.css

diff --git a/lib/loader.js b/lib/loader.js
index f3d823a6c..5a015ee87 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -42,12 +42,12 @@ module.exports = function (content) {
     ')\n'
   }
 
-  function getRequireForImport (include) {
+  function getRequireForImport (impt) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         '-!' +
-        getLoaderString(include.type, include) +
-        include.src
+        getLoaderString('style', impt, impt.local) +
+        impt.src
       ) +
     ')\n'
   }
@@ -90,20 +90,21 @@ module.exports = function (content) {
     var hasLocalStyles = false
 
     // add requires for src imports
-    parts.includes.forEach(function (include) {
-      output += getRequireForImport(include)
+    parts.styleImports.forEach(function (impt) {
+      if (impt.local) hasLocalStyles = true
+      output += getRequireForImport(impt)
     })
 
     // add requires for styles
     parts.style.forEach(function (style, i) {
       if (style.local) hasLocalStyles = true
-      output += getRequire('style', style, i, hasLocalStyles)
+      output += getRequire('style', style, i, style.local)
     })
 
     // only one script tag allowed
     if (parts.script.length) {
       output += 'module.exports = ' +
-        getRequire('script', parts.script[0], 0, hasLocalStyles)
+        getRequire('script', parts.script[0], 0)
     }
 
     // only one template tag allowed
diff --git a/lib/parser.js b/lib/parser.js
index 79411b25b..c7a764deb 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -8,7 +8,7 @@ module.exports = function (content) {
     template: [],
     style: [],
     script: [],
-    includes: []
+    styleImports: []
   }
 
   var fragment = parser.parseFragment(content)
@@ -17,13 +17,18 @@ module.exports = function (content) {
     var type = node.tagName
     var lang = getAttribute(node, 'lang')
     var src = getAttribute(node, 'src')
-    var local = getAttribute(node, 'local')
+    var local = getAttribute(node, 'local') != null
 
     if (src) {
-      output.includes.push({
+      if (type !== 'style') {
+        return cb(new Error(
+          '[vue-loader] src import is only supported for <style> tags.'
+        ))
+      }
+      output.styleImports.push({
         src: src,
-        type: type,
-        lang: lang
+        lang: lang,
+        local: local
       })
       return
     }
@@ -41,7 +46,8 @@ module.exports = function (content) {
       output[type].length > 0
     ) {
       return cb(new Error(
-        'Only one <script> or <template> tag is allowed inside a Vue component.'
+        '[vue-loader] Only one <script> or <template> tag is ' +
+        'allowed inside a Vue component.'
       ))
     }
 
@@ -57,7 +63,7 @@ module.exports = function (content) {
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     output[type].push({
       lang: lang,
-      local: local != null,
+      local: local,
       content: content.substring(start, end).trim()
     })
   })
diff --git a/test/fixtures/import.local.css b/test/fixtures/import.local.css
new file mode 100644
index 000000000..954b5d865
--- /dev/null
+++ b/test/fixtures/import.local.css
@@ -0,0 +1 @@
+h1 { color: green; }
diff --git a/test/fixtures/import.vue b/test/fixtures/import.vue
index 3425a8854..360ea5dd9 100644
--- a/test/fixtures/import.vue
+++ b/test/fixtures/import.vue
@@ -1 +1,2 @@
-<style src="./import.css">
+<style src="./import.css"></style>
+<style src="./import.local.css" local></style>
diff --git a/test/test.js b/test/test.js
index 544ddcaa7..a1e68185a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -88,17 +88,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('import', function (done) {
-    test({
-      entry: './test/fixtures/import.vue'
-    }, function (window) {
-      var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('h1 { color: red; }')
-      done()
-    })
-  })
-
-  it('local-css', function (done) {
+  it('local style', function (done) {
     test({
       entry: './test/fixtures/local-css.js'
     }, function (window) {
@@ -115,7 +105,19 @@ describe('vue-loader', function () {
     })
   })
 
-  it('source-map', function (done) {
+  it('style import', function (done) {
+    test({
+      entry: './test/fixtures/import.vue'
+    }, function (window) {
+      var styles = window.document.querySelectorAll('style')
+      expect(styles[0].textContent).to.match(/h1 { color: red; }/)
+      // import with local
+      expect(styles[1].textContent).to.match(/\.v-5751b9b6 h1 {\s+color: green;\n}/)
+      done()
+    })
+  })
+
+  it('source map', function (done) {
     var config = assign({}, globalConfig, {
       entry: './test/fixtures/basic.js',
       devtool: 'source-map'

From ee69e2597c9e8325aabaa8cd16ecb2b3402fe94d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 06:44:51 -0700
Subject: [PATCH 040/877] generate hash in tests

---
 test/test.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/test.js b/test/test.js
index a1e68185a..0403243fd 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,6 +5,7 @@ var jsdom = require('jsdom')
 var expect = require('chai').expect
 var assign = require('object-assign')
 var rimraf = require('rimraf')
+var hash = require('hash-sum')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 
 describe('vue-loader', function () {
@@ -98,9 +99,10 @@ describe('vue-loader', function () {
         '<p class="abc def v-5f0cf35a">hi</p>'
       )
       var style = window.document.querySelector('style').textContent
-      expect(style).to.match(/div\.v-5f0cf35a\.test {\s+color: blue;\n}/)
-      expect(style).to.match(/\.v-5f0cf35a {\s+color: red;\n}/)
-      expect(style).to.match(/\.v-5f0cf35a h1 {\s+color: green;\n}/)
+      var cls = '.v-' + hash(require.resolve('./fixtures/local-css.vue'))
+      expect(style).to.contain('div' + cls + '.test {\n    color: blue;\n}')
+      expect(style).to.contain(cls + ' {\n    color: red;\n}')
+      expect(style).to.contain(cls + ' h1 {\n    color: green;\n}')
       done()
     })
   })
@@ -110,9 +112,10 @@ describe('vue-loader', function () {
       entry: './test/fixtures/import.vue'
     }, function (window) {
       var styles = window.document.querySelectorAll('style')
-      expect(styles[0].textContent).to.match(/h1 { color: red; }/)
+      expect(styles[0].textContent).to.contain('h1 { color: red; }')
       // import with local
-      expect(styles[1].textContent).to.match(/\.v-5751b9b6 h1 {\s+color: green;\n}/)
+      var cls = '.v-' + hash(require.resolve('./fixtures/import.local.css'))
+      expect(styles[1].textContent).to.contain(cls + ' h1 {\n    color: green;\n}')
       done()
     })
   })

From 95da83773fcab0c92e0d59f22f766c46d1aba027 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 06:46:30 -0700
Subject: [PATCH 041/877] fix it for real

---
 test/test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test.js b/test/test.js
index 0403243fd..2352b5fab 100644
--- a/test/test.js
+++ b/test/test.js
@@ -94,12 +94,12 @@ describe('vue-loader', function () {
       entry: './test/fixtures/local-css.js'
     }, function (window) {
       var module = window.testModule
+      var cls = '.v-' + hash(require.resolve('./fixtures/local-css.vue'))
       expect(module.template).to.contain(
-        '<div class="v-5f0cf35a"><h1>hi</h1></div>\n' +
-        '<p class="abc def v-5f0cf35a">hi</p>'
+        '<div class="' + cls.slice(1) + '"><h1>hi</h1></div>\n' +
+        '<p class="abc def ' + cls.slice(1) + '">hi</p>'
       )
       var style = window.document.querySelector('style').textContent
-      var cls = '.v-' + hash(require.resolve('./fixtures/local-css.vue'))
       expect(style).to.contain('div' + cls + '.test {\n    color: blue;\n}')
       expect(style).to.contain(cls + ' {\n    color: red;\n}')
       expect(style).to.contain(cls + ' h1 {\n    color: green;\n}')

From 8bbc858742e28e72862d9e2dfb9cb69c0987a7f5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 07:12:49 -0700
Subject: [PATCH 042/877] lift rules that start with body

---
 lib/style-rewriter.js       | 15 +++++++++++----
 test/fixtures/local-css.vue |  3 +++
 test/test.js                | 12 +++++++++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 3a13625b8..14f1eaf6f 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -4,15 +4,22 @@ var hash = require('hash-sum')
 
 var currentClass
 var rootRE = /:root\b/g
+var liftRE = /^(html|head|body)\b/
 var processRoot = postcss.plugin('process-root', function () {
   return function (root) {
+    var lifted = 0
+    function lift (node) {
+      node.moveBefore(root.nodes[lifted++])
+    }
     root.each(function (node) {
       node.each(function (node) {
-        if (rootRE.test(node.selector)) {
+        var sel = node.selector
+        if (liftRE.test(sel)) {
+          lift(node)
+        } else if (rootRE.test(sel)) {
           // replace :root selector
-          node.selector = node.selector.replace(rootRE, currentClass)
-          // move the node to the outer scope to avoid nesting
-          node.moveBefore(root.nodes[0])
+          node.selector = sel.replace(rootRE, currentClass)
+          lift(node)
         }
       })
     })
diff --git a/test/fixtures/local-css.vue b/test/fixtures/local-css.vue
index 529b5f05f..7a2f2328b 100644
--- a/test/fixtures/local-css.vue
+++ b/test/fixtures/local-css.vue
@@ -1,4 +1,7 @@
 <style local>
+body {
+  color: yellow;
+}
 :root {
   color: red;
 }
diff --git a/test/test.js b/test/test.js
index 2352b5fab..5e21ed07e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -100,9 +100,15 @@ describe('vue-loader', function () {
         '<p class="abc def ' + cls.slice(1) + '">hi</p>'
       )
       var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('div' + cls + '.test {\n    color: blue;\n}')
-      expect(style).to.contain(cls + ' {\n    color: red;\n}')
-      expect(style).to.contain(cls + ' h1 {\n    color: green;\n}')
+      // lift selectors that start with body
+      expect(style).to.contain('body {\n    color: yellow;\n}')
+      expect(style).not.to.contain(cls + ' body')
+      // lift and replace :root inside compound selectors
+      expect(style).to.contain('\ndiv' + cls + '.test {\n    color: blue;\n}')
+      // lift :root
+      expect(style).to.contain('\n' + cls + ' {\n    color: red;\n}')
+      // nest normal selectors
+      expect(style).to.contain('\n' + cls + ' h1 {\n    color: green;\n}')
       done()
     })
   })

From 900b9413c3aabe39979c9207efa289ae9e9c667f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 16 Jul 2015 07:56:56 -0700
Subject: [PATCH 043/877] local -> scoped

---
 lib/loader.js                                    | 16 ++++++++--------
 lib/parser.js                                    |  6 +++---
 .../{import.local.css => import-scoped.css}      |  0
 test/fixtures/import.vue                         |  2 +-
 test/fixtures/local-css.js                       |  1 -
 test/fixtures/scoped-css.js                      |  1 +
 test/fixtures/{local-css.vue => scoped-css.vue}  |  2 +-
 test/test.js                                     | 10 +++++-----
 8 files changed, 19 insertions(+), 19 deletions(-)
 rename test/fixtures/{import.local.css => import-scoped.css} (100%)
 delete mode 100644 test/fixtures/local-css.js
 create mode 100644 test/fixtures/scoped-css.js
 rename test/fixtures/{local-css.vue => scoped-css.vue} (92%)

diff --git a/lib/loader.js b/lib/loader.js
index 5a015ee87..4cff9a78e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -27,13 +27,13 @@ module.exports = function (content) {
   loaders.css = loaders.css || 'style!css'
   loaders.js = loaders.js || ''
 
-  function getRequire (type, part, index, local) {
+  function getRequire (type, part, index, scoped) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         // disable system loaders (except post loaders)
         '-!' +
         // get loader string for pre-processors
-        getLoaderString(type, part, local) +
+        getLoaderString(type, part, scoped) +
         // select the corresponding part from the vue file
         getSelectorString(type, index || 0) +
         // the url to the actual vuefile
@@ -46,15 +46,15 @@ module.exports = function (content) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         '-!' +
-        getLoaderString('style', impt, impt.local) +
+        getLoaderString('style', impt, impt.scoped) +
         impt.src
       ) +
     ')\n'
   }
 
-  function getLoaderString (type, part, local) {
+  function getLoaderString (type, part, scoped) {
     var lang = part.lang || defaultLang[type]
-    var rewriter = local ? rewriters[type] || '' : ''
+    var rewriter = scoped ? rewriters[type] || '' : ''
     var loader = loaders[lang]
     if (loader !== undefined) {
       // lang with default or pre-configured loader
@@ -91,14 +91,14 @@ module.exports = function (content) {
 
     // add requires for src imports
     parts.styleImports.forEach(function (impt) {
-      if (impt.local) hasLocalStyles = true
+      if (impt.scoped) hasLocalStyles = true
       output += getRequireForImport(impt)
     })
 
     // add requires for styles
     parts.style.forEach(function (style, i) {
-      if (style.local) hasLocalStyles = true
-      output += getRequire('style', style, i, style.local)
+      if (style.scoped) hasLocalStyles = true
+      output += getRequire('style', style, i, style.scoped)
     })
 
     // only one script tag allowed
diff --git a/lib/parser.js b/lib/parser.js
index c7a764deb..7cb36bdc1 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -17,7 +17,7 @@ module.exports = function (content) {
     var type = node.tagName
     var lang = getAttribute(node, 'lang')
     var src = getAttribute(node, 'src')
-    var local = getAttribute(node, 'local') != null
+    var scoped = getAttribute(node, 'scoped') != null
 
     if (src) {
       if (type !== 'style') {
@@ -28,7 +28,7 @@ module.exports = function (content) {
       output.styleImports.push({
         src: src,
         lang: lang,
-        local: local
+        scoped: scoped
       })
       return
     }
@@ -63,7 +63,7 @@ module.exports = function (content) {
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     output[type].push({
       lang: lang,
-      local: local,
+      scoped: scoped,
       content: content.substring(start, end).trim()
     })
   })
diff --git a/test/fixtures/import.local.css b/test/fixtures/import-scoped.css
similarity index 100%
rename from test/fixtures/import.local.css
rename to test/fixtures/import-scoped.css
diff --git a/test/fixtures/import.vue b/test/fixtures/import.vue
index 360ea5dd9..d387476c3 100644
--- a/test/fixtures/import.vue
+++ b/test/fixtures/import.vue
@@ -1,2 +1,2 @@
 <style src="./import.css"></style>
-<style src="./import.local.css" local></style>
+<style src="./import-scoped.css" scoped></style>
diff --git a/test/fixtures/local-css.js b/test/fixtures/local-css.js
deleted file mode 100644
index 519ba68d9..000000000
--- a/test/fixtures/local-css.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./local-css.vue')
diff --git a/test/fixtures/scoped-css.js b/test/fixtures/scoped-css.js
new file mode 100644
index 000000000..607e0d58f
--- /dev/null
+++ b/test/fixtures/scoped-css.js
@@ -0,0 +1 @@
+window.testModule = require('./scoped-css.vue')
diff --git a/test/fixtures/local-css.vue b/test/fixtures/scoped-css.vue
similarity index 92%
rename from test/fixtures/local-css.vue
rename to test/fixtures/scoped-css.vue
index 7a2f2328b..0a335d6e6 100644
--- a/test/fixtures/local-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -1,4 +1,4 @@
-<style local>
+<style scoped>
 body {
   color: yellow;
 }
diff --git a/test/test.js b/test/test.js
index 5e21ed07e..7397e3a09 100644
--- a/test/test.js
+++ b/test/test.js
@@ -89,12 +89,12 @@ describe('vue-loader', function () {
     })
   })
 
-  it('local style', function (done) {
+  it('scoped style', function (done) {
     test({
-      entry: './test/fixtures/local-css.js'
+      entry: './test/fixtures/scoped-css.js'
     }, function (window) {
       var module = window.testModule
-      var cls = '.v-' + hash(require.resolve('./fixtures/local-css.vue'))
+      var cls = '.v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
       expect(module.template).to.contain(
         '<div class="' + cls.slice(1) + '"><h1>hi</h1></div>\n' +
         '<p class="abc def ' + cls.slice(1) + '">hi</p>'
@@ -119,8 +119,8 @@ describe('vue-loader', function () {
     }, function (window) {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red; }')
-      // import with local
-      var cls = '.v-' + hash(require.resolve('./fixtures/import.local.css'))
+      // import with scoped
+      var cls = '.v-' + hash(require.resolve('./fixtures/import-scoped.css'))
       expect(styles[1].textContent).to.contain(cls + ' h1 {\n    color: green;\n}')
       done()
     })

From 3689db7fd9156cb46422a81f73e3bad94c62cce9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 17 Jul 2015 14:10:45 -0400
Subject: [PATCH 044/877] bump 2.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 88e7abbb7..753788159 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 264676111f0e8fe3b50170d50a08a75030914586 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Aug 2015 07:54:51 -0400
Subject: [PATCH 045/877] :root -> scoped

---
 lib/style-rewriter.js        | 30 ++++++++++++++++++++----------
 test/fixtures/scoped-css.vue |  6 +++---
 test/test.js                 |  5 +++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 14f1eaf6f..8837e65ea 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,10 +1,10 @@
 var postcss = require('postcss')
 var nested = require('postcss-nested')
+var selectorParser = require('postcss-selector-parser')
 var hash = require('hash-sum')
 
-var currentClass
-var rootRE = /:root\b/g
 var liftRE = /^(html|head|body)\b/
+var scopeRE = /:scope\b/
 var processRoot = postcss.plugin('process-root', function () {
   return function (root) {
     var lifted = 0
@@ -13,13 +13,23 @@ var processRoot = postcss.plugin('process-root', function () {
     }
     root.each(function (node) {
       node.each(function (node) {
-        var sel = node.selector
-        if (liftRE.test(sel)) {
-          lift(node)
-        } else if (rootRE.test(sel)) {
-          // replace :root selector
-          node.selector = sel.replace(rootRE, currentClass)
-          lift(node)
+        var kept = []
+        selectorParser(function (selectors) {
+          selectors.each(function (selector) {
+            var sel = selector.toString()
+            if (liftRE.test(sel)) {
+              lift(node.clone({
+                selector: sel
+              }))
+            } else {
+              kept.push(sel)
+            }
+          })
+        }).process(node.selector)
+        if (!kept.length) {
+          node.removeSelf()
+        } else {
+          node.selector = kept.join(',').replace(scopeRE, '&')
         }
       })
     })
@@ -29,7 +39,7 @@ var processRoot = postcss.plugin('process-root', function () {
 module.exports = function (css) {
   this.cacheable()
   var cb = this.async()
-  var cls = currentClass = '.v-' + hash(this.resourcePath)
+  var cls = '.v-' + hash(this.resourcePath)
   css = cls + '{' + css + '}'
   postcss([processRoot, nested])
     .process(css)
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 0a335d6e6..ee925ca5d 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -1,11 +1,11 @@
 <style scoped>
-body {
+body, h2 {
   color: yellow;
 }
-:root {
+:scope {
   color: red;
 }
-div:root.test {
+div:scope.test {
   color: blue;
 }
 h1 {
diff --git a/test/test.js b/test/test.js
index 7397e3a09..1a179ee50 100644
--- a/test/test.js
+++ b/test/test.js
@@ -103,9 +103,10 @@ describe('vue-loader', function () {
       // lift selectors that start with body
       expect(style).to.contain('body {\n    color: yellow;\n}')
       expect(style).not.to.contain(cls + ' body')
-      // lift and replace :root inside compound selectors
+      expect(style).to.contain(cls + ' h2 {\n    color: yellow;\n}')
+      // lift and replace :scope inside compound selectors
       expect(style).to.contain('\ndiv' + cls + '.test {\n    color: blue;\n}')
-      // lift :root
+      // lift :scope
       expect(style).to.contain('\n' + cls + ' {\n    color: red;\n}')
       // nest normal selectors
       expect(style).to.contain('\n' + cls + ' h1 {\n    color: green;\n}')

From 80e74eaf699b0f6ad260f9f78285ca00a8b249ad Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Aug 2015 07:55:09 -0400
Subject: [PATCH 046/877] 3.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 753788159..da57f28e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From be6ef393633641b3ef45e97c10ea3cc8eb6b5dfb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Aug 2015 08:00:25 -0400
Subject: [PATCH 047/877] add missing dep

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index da57f28e0..3c6da040d 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.2",
     "object-assign": "^3.0.0",
+    "postcss-selector-parser": "^1.1.2",
     "rimraf": "^2.4.0",
     "source-map": "^0.4.2",
     "style-loader": "^0.12.3",

From 3ddb4d81ea22368017ccae775f6a566de4bd888f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Aug 2015 08:00:40 -0400
Subject: [PATCH 048/877] 3.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c6da040d..c2604a441 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 051982727956ae9f9428de17ca79a9d8524c63f9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Aug 2015 10:03:48 -0400
Subject: [PATCH 049/877] fix deps (for real)

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c2604a441..a1e07d67e 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "loader-utils": "^0.2.10",
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
-    "postcss-nested": "^0.3.2"
+    "postcss-nested": "^0.3.2",
+    "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
     "css-loader": "^0.15.4",
@@ -47,7 +48,6 @@
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.2",
     "object-assign": "^3.0.0",
-    "postcss-selector-parser": "^1.1.2",
     "rimraf": "^2.4.0",
     "source-map": "^0.4.2",
     "style-loader": "^0.12.3",

From 4925463d487fef34d4dce30d21b3477a966fe9bc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Aug 2015 10:03:57 -0400
Subject: [PATCH 050/877] 3.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a1e07d67e..ee218d992 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 490383a8c3098001005942da4e4557bbd6e76df5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 18 Aug 2015 12:43:51 -0400
Subject: [PATCH 051/877] do not enforce peer dep versions

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ee218d992..def0ef4d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -31,9 +31,9 @@
     "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
-    "css-loader": "^0.15.4",
-    "html-loader": "^0.3.0",
-    "style-loader": "^0.12.3"
+    "css-loader": "*",
+    "html-loader": "*",
+    "style-loader": "*"
   },
   "devDependencies": {
     "babel-core": "^5.5.8",

From a04507021c45656d0f5d842c5a9075b333f4cac6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 19 Aug 2015 13:33:06 -0400
Subject: [PATCH 052/877] improve readme

---
 README.md | 125 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 83 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index b5f69249a..20548fde2 100644
--- a/README.md
+++ b/README.md
@@ -27,48 +27,20 @@ It allows you to write your components in this format:
 </script>
 ```
 
-You can also mix preprocessor languages in the component file:
-
-``` html
-// app.vue
-<style lang="stylus">
-.red
-  color #f00
-</style>
-
-<template lang="jade">
-h1(class="red") {{msg}}
-</template>
-
-<script lang="coffee">
-module.exports =
-  data: ->
-    msg: 'Hello world!'
-</script>
-```
-
-And you can import using the `src` attribute:
-
-``` html
-<style lang="stylus" src="./style.styl"></style>
-```
-
-**NOTE**: Starting from version 2.1.0, `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from node modules: `<style src="todomvc-app-css/index.css">`.
-
-## Usage
+## Basic Usage
 
 Config Webpack:
 
 ``` js
 // webpack.config.js
 module.exports = {
-  entry: "./main.js",
+  entry: './main.js',
   output: {
-    filename: "build.js"
+    filename: 'build.js'
   },
   module: {
     loaders: [
-      { test: /\.vue$/, loader: "vue-loader" },
+      { test: /\.vue$/, loader: 'vue' },
     ]
   }
 }
@@ -85,28 +57,97 @@ var app = new Vue(appOptions).$mount('#app')
 
 ## Pre-Processors
 
-By default `vue-loader` needs `html-loader`, `css-loader` and `style-loader` as peer dependencies. In order to use pre-processors, you need to install the corresponding Webpack loader for that language.
+`vue-loader` allows you to use per-file pre-processors inside `*.vue` components with the `lang` attribute:
+
+``` html
+<style lang="stylus">
+  /* use stylus here */
+</style>
+```
+
+The `lang` attribute will be used to automatically locate the loader to use, and you can pass Webpack loader queries in it as well:
+
+``` html
+<style lang="sass?outputStyle=expanded">
+  /* use sass here with expanded output */
+</style>
+```
+
+#### A Note on Dependencies
+
+By default, `vue-loader` requires `html-loader`, `css-loader` and `style-loader` as peer dependencies. In order to use pre-processors, you also need to install the corresponding Webpack loader for that language.
+
+Also, for template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
+
+## Style Imports
+
+If you want, you can separate your styles into a separate file and import it using the `src` attribute:
 
-**Note** For template pre-processors, use `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
+``` html
+<style src="./style.css"></style>
+```
+
+Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from node modules: `<style src="todomvc-app-css/index.css">`.
+
+## Asset URL Handling
+
+By default, `vue-loader` automatically processes your style and template files with `css-loader` and `html-loader` - this means that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+
+For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives you some very powerful benefits in managing your static assets this way:
+
+1. `file-loader` allows you to customize where to copy and place the asset file (by specifying `publicPath` in your Webpack config), and how they should be named with version hashes.
+
+2. `url-loader` allows you to conditionally load a file as a inline Data URL if they are smaller than a given threshold.
 
-## Loader configuration
+For more details, see the respective documentations for [html-loader](https://github.com/webpack/html-loader) and [css-loader](https://github.com/webpack/css-loader).
+
+## Advanced Loader configuration
 
 By default, `vue-loader` will try to use the loader with the same name as
 the `lang` attribute, but you can configure which loader should be used.
 
-For example, to extract out the generated css into a separate file,
-use this configuration:
+#### Example: Using ES6 with Babel
+
+To apply Babel transforms to all your JavaScript, use this Webpack config:
+
+``` js
+var vue = require('vue-loader')
+
+module.exports = {
+  // entry, output...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: vue.withLoaders({
+          // apply babel transform to all javascript
+          // inside *.vue files.
+          js: 'babel?optional[]=runtime'
+        })
+      }
+    ]
+  },
+  devtool: 'source-map'
+}
+```
+
+Some explanantions: 
+
+1. Here `js` is the default language for `<script>` blocks.
+
+2. The `?optional[]=runtime` query string passed to the loader. This instructs Babel to use helper functions from the `babel-runtime` NPM package instead of injecting the helpers into every single file. You'll want this most of the time.
+
+#### Example: Extracting CSS into a Single File
+
+To extract out the generated css into a separate file,
+use this Webpack config:
 
 ``` js
-// webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 var vue = require("vue-loader");
 
 module.exports = {
-  entry: "./main.js",
-  output: {
-    filename: "build.js"
-  },
+  // entry, output...
   module: {
     loaders: [
       {

From 8d01512c958e173ffadbcabff771dc8cd420a44e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 19 Aug 2015 13:38:00 -0400
Subject: [PATCH 053/877] more readme

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 20548fde2..a90192414 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,18 @@ It allows you to write your components in this format:
 </script>
 ```
 
+## Table of Contents
+
+
+- [Basic Usage](#basic-usage)
+- [Pre-Processors](#pre-processors)
+- [Style Imports](#style-imports)
+- [Asset URL Handling](#asset-url-handling)
+- [Advanced Loader Configuration](#advanced-loader-configuration)
+  - [ES6 with Babel Example](#example-using-es6-with-babel)
+  - [Extract CSS Example](#example-extracting-css-into-a-single-file)
+- [Example Project](https://github.com/vuejs/vue-loader-example)
+
 ## Basic Usage
 
 Config Webpack:
@@ -163,3 +175,7 @@ module.exports = {
   ]
 }
 ```
+
+## Example Project
+
+See [vue-loader-example](https://github.com/vuejs/vue-loader-example).

From 5274985d128141542f85a7345c17f4345411a66c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Oct 2015 15:02:29 -0400
Subject: [PATCH 054/877] switch to vue-html-loader

---
 circle.yml    | 2 +-
 lib/loader.js | 6 +++---
 package.json  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/circle.yml b/circle.yml
index 72b639b85..27aa1aefd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,3 @@
 machine:
   node:
-    version: iojs-v2.3.0
+    version: iojs-v4.0.0
diff --git a/lib/loader.js b/lib/loader.js
index 4cff9a78e..f32ef83b6 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -23,7 +23,7 @@ module.exports = function (content) {
   // check if there are custom loaders specified with
   // vueLoader.withLoaders(), otherwise use defaults
   var loaders = loaderUtils.parseQuery(this.query)
-  loaders.html = loaders.html || 'html'
+  loaders.html = loaders.html || 'vue-html'
   loaders.css = loaders.css || 'style!css'
   loaders.js = loaders.js || ''
 
@@ -64,7 +64,7 @@ module.exports = function (content) {
       // unknown lang, assume a loader for it is used
       switch (type) {
       case 'template':
-        return 'html!' + rewriter + 'template-html-loader?raw&engine=' + lang + '!'
+        return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
       case 'style':
         return 'style!css!' + rewriter + lang + '!'
       case 'script':
@@ -123,5 +123,5 @@ module.exports = function (content) {
  * end for the extracted parts of a component.
  */
 module.exports.withLoaders = function (opts) {
-  return 'vue-loader?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
+  return 'vue?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
 }
diff --git a/package.json b/package.json
index def0ef4d0..3de8300ad 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
     "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
+    "vue-html-loader": "^1.0.0",
     "css-loader": "*",
-    "html-loader": "*",
     "style-loader": "*"
   },
   "devDependencies": {
@@ -41,7 +41,7 @@
     "chai": "^3.0.0",
     "css-loader": "^0.15.4",
     "eslint": "^1.0.0-rc-1",
-    "html-loader": "^0.3.0",
+    "vue-html-loader": "^1.0.0",
     "jade": "^1.11.0",
     "jsdom": "^5.4.3",
     "mkdirp": "^0.5.1",

From 2e7473c141b6b144700b6b942aafdd5639b5b6d7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Oct 2015 15:03:38 -0400
Subject: [PATCH 055/877] fix circle ci node version

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 27aa1aefd..df960ce4c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,3 @@
 machine:
   node:
-    version: iojs-v4.0.0
+    version: 4.0.0

From 84b10b1dfc8cd68a3e2744f1fc1df6270a300275 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Oct 2015 15:05:56 -0400
Subject: [PATCH 056/877] bump test time limit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3de8300ad..62a378c75 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
     "lint": "eslint lib",
-    "test": "eslint lib && mocha test/test.js --slow 2000"
+    "test": "eslint lib && mocha test/test.js --slow 5000"
   },
   "dependencies": {
     "hash-sum": "^1.0.2",

From 85e1c1e6494102c07952a3fc0db7630d8b7b940a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Oct 2015 15:11:30 -0400
Subject: [PATCH 057/877] update readme

---
 README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a90192414..336d9a4c0 100644
--- a/README.md
+++ b/README.md
@@ -85,11 +85,13 @@ The `lang` attribute will be used to automatically locate the loader to use, and
 </style>
 ```
 
-#### A Note on Dependencies
+#### A Note on Loader Dependencies
 
-By default, `vue-loader` requires `html-loader`, `css-loader` and `style-loader` as peer dependencies. In order to use pre-processors, you also need to install the corresponding Webpack loader for that language.
+By default, `vue-loader` requires `vue-html-loader`, `css-loader` and `style-loader` as peer dependencies. In order to use pre-processors, you also need to install the corresponding Webpack loader for that language.
 
-Also, for template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
+#### Template Pre-Processors
+
+For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
 
 ## Style Imports
 
@@ -103,7 +105,7 @@ Beware that `src` imports follow similar rules to `require()` calls, which means
 
 ## Asset URL Handling
 
-By default, `vue-loader` automatically processes your style and template files with `css-loader` and `html-loader` - this means that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+By default, `vue-loader` automatically processes your style and template files with `css-loader` and `vue-html-loader` - this means that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
 
 For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives you some very powerful benefits in managing your static assets this way:
 
@@ -111,7 +113,7 @@ For example, `url(image.png)` will be translated into `require('./image.png')`.
 
 2. `url-loader` allows you to conditionally load a file as a inline Data URL if they are smaller than a given threshold.
 
-For more details, see the respective documentations for [html-loader](https://github.com/webpack/html-loader) and [css-loader](https://github.com/webpack/css-loader).
+For more details, see the respective documentations for [vue-html-loader](https://github.com/vuejs/vue-html-loader) and [css-loader](https://github.com/webpack/css-loader).
 
 ## Advanced Loader configuration
 

From 5282f7e86e0e40c080bfbb09be6b7e3278faa398 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Oct 2015 15:12:20 -0400
Subject: [PATCH 058/877] bump 3.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62a378c75..eaf019091 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From a977487148c7bcbbbf353347679c48c4832cebdd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 13 Oct 2015 17:34:16 -0400
Subject: [PATCH 059/877] new scoped css implementation

---
 lib/id-generator.js          | 12 ++++++++++
 lib/style-rewriter.js        | 44 ++++++++++--------------------------
 lib/template-rewriter.js     | 34 +++++++++++++---------------
 package.json                 |  2 --
 test/fixtures/scoped-css.vue |  8 +------
 test/test.js                 | 20 ++++------------
 6 files changed, 46 insertions(+), 74 deletions(-)
 create mode 100644 lib/id-generator.js

diff --git a/lib/id-generator.js b/lib/id-generator.js
new file mode 100644
index 000000000..e1c242d95
--- /dev/null
+++ b/lib/id-generator.js
@@ -0,0 +1,12 @@
+// keep track of unique ids for component modules.
+
+var ids = Object.create(null)
+var count = 0
+
+exports.get = function (path) {
+  var id = ids[path]
+  if (!id) {
+    id = ids[path] = ++count
+  }
+  return '_v-' + id
+}
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 8837e65ea..4088e9a4e 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,37 +1,18 @@
 var postcss = require('postcss')
-var nested = require('postcss-nested')
 var selectorParser = require('postcss-selector-parser')
-var hash = require('hash-sum')
+var idGen = require('./id-generator')
 
-var liftRE = /^(html|head|body)\b/
-var scopeRE = /:scope\b/
-var processRoot = postcss.plugin('process-root', function () {
+var currentId
+var addId = postcss.plugin('add-id', function () {
   return function (root) {
-    var lifted = 0
-    function lift (node) {
-      node.moveBefore(root.nodes[lifted++])
-    }
     root.each(function (node) {
-      node.each(function (node) {
-        var kept = []
-        selectorParser(function (selectors) {
-          selectors.each(function (selector) {
-            var sel = selector.toString()
-            if (liftRE.test(sel)) {
-              lift(node.clone({
-                selector: sel
-              }))
-            } else {
-              kept.push(sel)
-            }
-          })
-        }).process(node.selector)
-        if (!kept.length) {
-          node.removeSelf()
-        } else {
-          node.selector = kept.join(',').replace(scopeRE, '&')
-        }
-      })
+      node.selector = selectorParser(function (selectors) {
+        selectors.each(function (selector) {
+          selector.append(selectorParser.attribute({
+            attribute: currentId
+          }))
+        })
+      }).process(node.selector).result
     })
   }
 })
@@ -39,9 +20,8 @@ var processRoot = postcss.plugin('process-root', function () {
 module.exports = function (css) {
   this.cacheable()
   var cb = this.async()
-  var cls = '.v-' + hash(this.resourcePath)
-  css = cls + '{' + css + '}'
-  postcss([processRoot, nested])
+  currentId = idGen.get(this.resourcePath)
+  postcss([addId])
     .process(css)
     .then(function (result) {
       cb(null, result)
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
index 7ec2bf725..f91ade954 100644
--- a/lib/template-rewriter.js
+++ b/lib/template-rewriter.js
@@ -1,30 +1,28 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser()
 var serializer = new parse5.Serializer()
-var hash = require('hash-sum')
+var idGen = require('./id-generator')
 
 module.exports = function (html) {
   this.cacheable()
-  var cls = 'v-' + hash(this.resourcePath)
+  var id = idGen.get(this.resourcePath)
   var tree = parser.parseFragment(html)
-  tree.childNodes.forEach(function (node) {
+  walk(tree, function (node) {
     if (node.attrs) {
-      var hasClass = false
-      for (var i = 0, l = node.attrs.length; i < l; i++) {
-        var attr = node.attrs[i]
-        if (attr.name === 'class') {
-          attr.value += ' ' + cls
-          hasClass = true
-          break
-        }
-      }
-      if (!hasClass) {
-        node.attrs.push({
-          name: 'class',
-          value: cls
-        })
-      }
+      node.attrs.push({
+        name: id,
+        value: ''
+      })
     }
   })
   return serializer.serialize(tree)
 }
+
+function walk (tree, fn) {
+  if (tree.childNodes) {
+    tree.childNodes.forEach(function (node) {
+      fn(node)
+      walk(node, fn)
+    })
+  }
+}
diff --git a/package.json b/package.json
index eaf019091..c6f915162 100644
--- a/package.json
+++ b/package.json
@@ -23,11 +23,9 @@
     "test": "eslint lib && mocha test/test.js --slow 5000"
   },
   "dependencies": {
-    "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
-    "postcss-nested": "^0.3.2",
     "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index ee925ca5d..515ee88f1 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -1,13 +1,7 @@
 <style scoped>
-body, h2 {
+.test {
   color: yellow;
 }
-:scope {
-  color: red;
-}
-div:scope.test {
-  color: blue;
-}
 h1 {
   color: green;
 }
diff --git a/test/test.js b/test/test.js
index 1a179ee50..b44f3c784 100644
--- a/test/test.js
+++ b/test/test.js
@@ -94,22 +94,13 @@ describe('vue-loader', function () {
       entry: './test/fixtures/scoped-css.js'
     }, function (window) {
       var module = window.testModule
-      var cls = '.v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
       expect(module.template).to.contain(
-        '<div class="' + cls.slice(1) + '"><h1>hi</h1></div>\n' +
-        '<p class="abc def ' + cls.slice(1) + '">hi</p>'
+        '<div _v-1=""><h1 _v-1="">hi</h1></div>\n' +
+        '<p class="abc def" _v-1="">hi</p>'
       )
       var style = window.document.querySelector('style').textContent
-      // lift selectors that start with body
-      expect(style).to.contain('body {\n    color: yellow;\n}')
-      expect(style).not.to.contain(cls + ' body')
-      expect(style).to.contain(cls + ' h2 {\n    color: yellow;\n}')
-      // lift and replace :scope inside compound selectors
-      expect(style).to.contain('\ndiv' + cls + '.test {\n    color: blue;\n}')
-      // lift :scope
-      expect(style).to.contain('\n' + cls + ' {\n    color: red;\n}')
-      // nest normal selectors
-      expect(style).to.contain('\n' + cls + ' h1 {\n    color: green;\n}')
+      expect(style).to.contain('.test[_v-1] {\n  color: yellow;\n}')
+      expect(style).to.contain('h1[_v-1] {\n  color: green;\n}')
       done()
     })
   })
@@ -121,8 +112,7 @@ describe('vue-loader', function () {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red; }')
       // import with scoped
-      var cls = '.v-' + hash(require.resolve('./fixtures/import-scoped.css'))
-      expect(styles[1].textContent).to.contain(cls + ' h1 {\n    color: green;\n}')
+      expect(styles[1].textContent).to.contain('h1[_v-2] { color: green; }')
       done()
     })
   })

From 9d9b63bab258bb1b74d15acd4d22a4b314cadeb3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 12:19:23 -0400
Subject: [PATCH 060/877] wip: hot-reload

---
 lib/hot-shim.js | 36 ++++++++++++++++++++++++++++
 lib/loader.js   | 63 +++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 lib/hot-shim.js

diff --git a/lib/hot-shim.js b/lib/hot-shim.js
new file mode 100644
index 000000000..4ac00dc00
--- /dev/null
+++ b/lib/hot-shim.js
@@ -0,0 +1,36 @@
+// override component directive's resolveComponent function.
+// When component is resolved:
+//   - remove self from previous component's list
+//   - add self to current component's list
+
+var shimmed = false
+module.exports = function (Vue) {
+  if (shimmed) return
+  shimmed = true
+  console.log('[HMR] Vue component hot reload shim applied.')
+  var map = window.map = Vue.config._hotComponents = Object.create(null)
+  var componentDir = Vue.internalDirectives.component
+  var resolve = componentDir.resolveComponent
+  componentDir.resolveComponent = function (id, cb) {
+    var view = this
+    var prevComponent = view.Component
+    var prevId = prevComponent && prevComponent.options.hotID
+    resolve.call(this, id, function () {
+      var Component = view.Component
+      var newId = Component.options.hotID
+      if (prevId) {
+        map[prevId].instances.$remove(view)
+      }
+      if (newId) {
+        if (!map[newId]) {
+          map[newId] = {
+            Ctor: Component,
+            instances: []
+          }
+        }
+        map[newId].instances.push(view)
+      }
+      cb()
+    })
+  }
+}
diff --git a/lib/loader.js b/lib/loader.js
index f32ef83b6..609945457 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,6 +1,7 @@
 var loaderUtils = require('loader-utils')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
+var hotShimPath = require.resolve('./hot-shim')
 
 var defaultLang = {
   template: 'html',
@@ -29,19 +30,23 @@ module.exports = function (content) {
 
   function getRequire (type, part, index, scoped) {
     return 'require(' +
-      loaderUtils.stringifyRequest(self,
-        // disable system loaders (except post loaders)
-        '-!' +
-        // get loader string for pre-processors
-        getLoaderString(type, part, scoped) +
-        // select the corresponding part from the vue file
-        getSelectorString(type, index || 0) +
-        // the url to the actual vuefile
-        vueUrl
-      ) +
+      getRequireString(type, part, index, scoped) +
     ')\n'
   }
 
+  function getRequireString (type, part, index, scoped) {
+    return loaderUtils.stringifyRequest(self,
+      // disable system loaders (except post loaders)
+      '-!' +
+      // get loader string for pre-processors
+      getLoaderString(type, part, scoped) +
+      // select the corresponding part from the vue file
+      getSelectorString(type, index || 0) +
+      // the url to the actual vuefile
+      vueUrl
+    )
+  }
+
   function getRequireForImport (impt) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
@@ -113,6 +118,44 @@ module.exports = function (content) {
         getRequire('template', parts.template[0], 0, hasLocalStyles)
     }
 
+    // hot reload
+    if (parts.script.length || parts.template.length) {
+      var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
+      var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
+      var accepted = []
+      if (scriptString) {
+        accepted.push(scriptString.slice(1, -1))
+      }
+      if (templateString) {
+        accepted.push(templateString.slice(1, -1))
+      }
+      output +=
+        'if (module.hot) {\n' +
+          '(function () {\n' +
+            // shim the component directive so that it
+            // registers the instances
+            'var Vue = require("vue")\n' +
+            'require("' + hotShimPath + '")(Vue)\n' +
+            'var map = Vue.config._hotComponents\n' +
+            'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
+            'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
+              'var Ctor = map[id].Ctor\n' + 
+              // overwrite existing constructor's options 
+              (scriptString ? 'Ctor.options = Vue.util.mergeOptions(Vue.options, require(' + scriptString + '))\n' : '') +
+              (templateString ? 'Ctor.options.template = require(' + templateString + ')\n' : '') + 
+              // reset linker
+              'Ctor.linker = null\n' +
+              // reload directive instances
+              'map[id].instances.forEach(function (view) {\n' +
+                'var state = view.childVM.$data\n' +
+                'view.mountComponent()\n' +
+                'view.childVM.$data = state\n' +
+              '})\n' +
+            '})\n' +
+          '})()\n' +
+        '}'
+    }
+
     // done
     cb(null, output)
   })

From 090848405b45aaf10d50ee73920a16428ef55174 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 21:33:05 -0400
Subject: [PATCH 061/877] handle keep-alive

---
 lib/hot-shim.js | 64 ++++++++++++++++++++++++++++++++++++++++---------
 lib/loader.js   | 18 +++++++-------
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/lib/hot-shim.js b/lib/hot-shim.js
index 4ac00dc00..026f4dbbc 100644
--- a/lib/hot-shim.js
+++ b/lib/hot-shim.js
@@ -1,26 +1,34 @@
-// override component directive's resolveComponent function.
-// When component is resolved:
-//   - remove self from previous component's list
-//   - add self to current component's list
+/**
+ * override component directive's resolveComponent function.
+ * When component is resolved:
+ *   - remove self from previous component's list
+ *   - add self to current component's list
+ */
 
 var shimmed = false
-module.exports = function (Vue) {
+exports.install = function (Vue) {
   if (shimmed) return
   shimmed = true
   console.log('[HMR] Vue component hot reload shim applied.')
-  var map = window.map = Vue.config._hotComponents = Object.create(null)
+  var map = Vue.config._hotComponents = Object.create(null)
   var componentDir = Vue.internalDirectives.component
+
+  var set = componentDir.setComponent
+  componentDir.setComponent = function (id, cb) {
+    var prevComponent = this.Component
+    var prevId = prevComponent && prevComponent.options.hotID
+    if (prevId) {
+      map[prevId].instances.$remove(this)
+    }
+    set.call(this, id, cb)
+  }
+
   var resolve = componentDir.resolveComponent
   componentDir.resolveComponent = function (id, cb) {
     var view = this
-    var prevComponent = view.Component
-    var prevId = prevComponent && prevComponent.options.hotID
     resolve.call(this, id, function () {
       var Component = view.Component
       var newId = Component.options.hotID
-      if (prevId) {
-        map[prevId].instances.$remove(view)
-      }
       if (newId) {
         if (!map[newId]) {
           map[newId] = {
@@ -33,4 +41,38 @@ module.exports = function (Vue) {
       cb()
     })
   }
+
+  var unbind = componentDir.unbind
+  componentDir.unbind = function () {
+    var id = this.Component && this.Component.options.hotID
+    if (id) {
+      map[id].instances.$remove(this)
+    }
+    unbind.call(this)
+  }
+}
+
+/**
+ * Update a component directive instance
+ *
+ * @param {Directive} view
+ */
+
+exports.update = function (view) {
+  if (!view._bound) {
+    return
+  }
+  // disable transitions
+  view.vm._isCompiled = false
+  // save state
+  var state = view.childVM.$data
+  // remount, make sure to disable keep-alive
+  var keepAlive = view.keepAlive
+  view.keepAlive = false
+  view.mountComponent()
+  view.keepAlive = keepAlive
+  // restore state
+  view.childVM.$data = state
+  // re-eanble transitions
+  view.vm._isCompiled = true
 }
diff --git a/lib/loader.js b/lib/loader.js
index 609945457..e2e7f2abb 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,7 +1,6 @@
 var loaderUtils = require('loader-utils')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
-var hotShimPath = require.resolve('./hot-shim')
 
 var defaultLang = {
   template: 'html',
@@ -119,7 +118,10 @@ module.exports = function (content) {
     }
 
     // hot reload
-    if (parts.script.length || parts.template.length) {
+    if (
+      process.env.NODE_ENV !== 'production' &&
+      (parts.script.length || parts.template.length)
+    ) {
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
       var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
       var accepted = []
@@ -135,22 +137,20 @@ module.exports = function (content) {
             // shim the component directive so that it
             // registers the instances
             'var Vue = require("vue")\n' +
-            'require("' + hotShimPath + '")(Vue)\n' +
+            'var shim = require("' + require.resolve('./hot-shim') + '")\n' +
+            'shim.install(Vue)\n' +
             'var map = Vue.config._hotComponents\n' +
             'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
               'var Ctor = map[id].Ctor\n' + 
-              // overwrite existing constructor's options 
+              // overwrite existing constructor's options
               (scriptString ? 'Ctor.options = Vue.util.mergeOptions(Vue.options, require(' + scriptString + '))\n' : '') +
               (templateString ? 'Ctor.options.template = require(' + templateString + ')\n' : '') + 
               // reset linker
               'Ctor.linker = null\n' +
               // reload directive instances
-              'map[id].instances.forEach(function (view) {\n' +
-                'var state = view.childVM.$data\n' +
-                'view.mountComponent()\n' +
-                'view.childVM.$data = state\n' +
-              '})\n' +
+              'map[id].instances.forEach(shim.update)\n' +
+              // re-enable transitions
             '})\n' +
           '})()\n' +
         '}'

From 64279847963e1d192b30c76f727f2be1e7eed213 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 21:48:11 -0400
Subject: [PATCH 062/877] handle older versions of Vue

---
 lib/{hot-shim.js => hot-reload-api.js} | 18 ++++++++++++++++--
 lib/loader.js                          |  7 ++++---
 2 files changed, 20 insertions(+), 5 deletions(-)
 rename lib/{hot-shim.js => hot-reload-api.js} (86%)

diff --git a/lib/hot-shim.js b/lib/hot-reload-api.js
similarity index 86%
rename from lib/hot-shim.js
rename to lib/hot-reload-api.js
index 026f4dbbc..8d91dbea7 100644
--- a/lib/hot-shim.js
+++ b/lib/hot-reload-api.js
@@ -9,10 +9,22 @@ var shimmed = false
 exports.install = function (Vue) {
   if (shimmed) return
   shimmed = true
-  console.log('[HMR] Vue component hot reload shim applied.')
+
+  exports.compatible = !!Vue.internalDirectives
+  if (!exports.compatible) {
+    console.warn(
+      '[HMR] vue-loader hot reload is only compatible with ' +
+      'Vue.js 1.0.0+.'
+    )
+    return
+  }
+
+  // create global hot reload map
   var map = Vue.config._hotComponents = Object.create(null)
+  // check compatibility
   var componentDir = Vue.internalDirectives.component
-
+  
+  // shim the component directive
   var set = componentDir.setComponent
   componentDir.setComponent = function (id, cb) {
     var prevComponent = this.Component
@@ -50,6 +62,8 @@ exports.install = function (Vue) {
     }
     unbind.call(this)
   }
+
+  console.log('[HMR] Vue component hot reload shim applied.')
 }
 
 /**
diff --git a/lib/loader.js b/lib/loader.js
index e2e7f2abb..3e366be9e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -137,8 +137,9 @@ module.exports = function (content) {
             // shim the component directive so that it
             // registers the instances
             'var Vue = require("vue")\n' +
-            'var shim = require("' + require.resolve('./hot-shim') + '")\n' +
-            'shim.install(Vue)\n' +
+            'var hotAPI = require("' + require.resolve('./hot-reload-api') + '")\n' +
+            'hotAPI.install(Vue)\n' +
+            'if (!hotAPI.compatible) return\n' +
             'var map = Vue.config._hotComponents\n' +
             'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
@@ -149,7 +150,7 @@ module.exports = function (content) {
               // reset linker
               'Ctor.linker = null\n' +
               // reload directive instances
-              'map[id].instances.forEach(shim.update)\n' +
+              'map[id].instances.forEach(hotAPI.update)\n' +
               // re-enable transitions
             '})\n' +
           '})()\n' +

From 74dcac400d9bddda33a3284a637126917078a44e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 22:02:19 -0400
Subject: [PATCH 063/877] bump deps & lint

---
 lib/hot-reload-api.js |  2 +-
 lib/loader.js         |  4 ++--
 package.json          | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
index 8d91dbea7..55cb4eebf 100644
--- a/lib/hot-reload-api.js
+++ b/lib/hot-reload-api.js
@@ -23,7 +23,7 @@ exports.install = function (Vue) {
   var map = Vue.config._hotComponents = Object.create(null)
   // check compatibility
   var componentDir = Vue.internalDirectives.component
-  
+
   // shim the component directive
   var set = componentDir.setComponent
   componentDir.setComponent = function (id, cb) {
diff --git a/lib/loader.js b/lib/loader.js
index 3e366be9e..fdbcc5548 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -143,10 +143,10 @@ module.exports = function (content) {
             'var map = Vue.config._hotComponents\n' +
             'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
-              'var Ctor = map[id].Ctor\n' + 
+              'var Ctor = map[id].Ctor\n' +
               // overwrite existing constructor's options
               (scriptString ? 'Ctor.options = Vue.util.mergeOptions(Vue.options, require(' + scriptString + '))\n' : '') +
-              (templateString ? 'Ctor.options.template = require(' + templateString + ')\n' : '') + 
+              (templateString ? 'Ctor.options.template = require(' + templateString + ')\n' : '') +
               // reset linker
               'Ctor.linker = null\n' +
               // reload directive instances
diff --git a/package.json b/package.json
index c6f915162..ccee76669 100644
--- a/package.json
+++ b/package.json
@@ -34,23 +34,23 @@
     "style-loader": "*"
   },
   "devDependencies": {
-    "babel-core": "^5.5.8",
-    "babel-loader": "^5.1.4",
+    "babel-core": "^5.8.25",
+    "babel-loader": "^5.3.2",
     "chai": "^3.0.0",
-    "css-loader": "^0.15.4",
-    "eslint": "^1.0.0-rc-1",
+    "css-loader": "^0.19.0",
+    "eslint": "^1.6.0",
     "vue-html-loader": "^1.0.0",
     "jade": "^1.11.0",
-    "jsdom": "^5.4.3",
+    "jsdom": "^6.5.1",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
-    "node-libs-browser": "^0.5.2",
+    "node-libs-browser": "^0.5.3",
     "object-assign": "^3.0.0",
     "rimraf": "^2.4.0",
-    "source-map": "^0.4.2",
-    "style-loader": "^0.12.3",
-    "stylus-loader": "^1.2.0",
-    "template-html-loader": "0.0.3",
-    "webpack": "^1.9.11"
+    "source-map": "^0.5.1",
+    "style-loader": "^0.12.4",
+    "stylus-loader": "^1.4.0",
+    "template-html-loader": "^0.0.3",
+    "webpack": "^1.12.2"
   }
 }

From f057ad5415a66d1cbab963f228934bb528798150 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 22:02:37 -0400
Subject: [PATCH 064/877] bump 4.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ccee76669..5ed0970f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "3.0.4",
+  "version": "4.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From a1a58923410e46f2136129280a494a3294e32921 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 22:27:10 -0400
Subject: [PATCH 065/877] readme

---
 README.md | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 336d9a4c0..6f0822f3d 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,9 @@ It allows you to write your components in this format:
 
 - [Basic Usage](#basic-usage)
 - [Pre-Processors](#pre-processors)
+- [Template Pre-Processors](#template-pre-processors)
+- [Scoped Styles](#scoped-styles)
+- [Hot Reload](#hot-reload)
 - [Style Imports](#style-imports)
 - [Asset URL Handling](#asset-url-handling)
 - [Advanced Loader Configuration](#advanced-loader-configuration)
@@ -69,7 +72,7 @@ var app = new Vue(appOptions).$mount('#app')
 
 ## Pre-Processors
 
-`vue-loader` allows you to use per-file pre-processors inside `*.vue` components with the `lang` attribute:
+`vue-loader` allows you to use other Webpack loaders to pre-process the different parts inside your `*.vue` components. Just specify the loader to use with the `lang` attribute (you also need to install the loader, obviously):
 
 ``` html
 <style lang="stylus">
@@ -77,7 +80,7 @@ var app = new Vue(appOptions).$mount('#app')
 </style>
 ```
 
-The `lang` attribute will be used to automatically locate the loader to use, and you can pass Webpack loader queries in it as well:
+You can also include Webpack loader queries in the `lang` attribute:
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -85,13 +88,81 @@ The `lang` attribute will be used to automatically locate the loader to use, and
 </style>
 ```
 
-#### A Note on Loader Dependencies
+## Template Pre-Processors
 
-By default, `vue-loader` requires `vue-html-loader`, `css-loader` and `style-loader` as peer dependencies. In order to use pre-processors, you also need to install the corresponding Webpack loader for that language.
+For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
 
-#### Template Pre-Processors
+## Scoped Styles
 
-For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
+When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM, but doesn't require any polyfills. It is achieved by transforming the following:
+
+``` html
+<style>
+.example {
+  color: red;
+}
+</style>
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+Into the following:
+
+``` html
+<style>
+.example[_v-1] {
+  color: red;
+}
+</style>
+<template>
+  <div class="example" _v-1>hi</div>
+</template>
+```
+
+#### Notes
+
+1. You can include both scoped and non-scoped styles in the same component.
+
+2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
+
+3. Partials are not affected by scoped styles.
+
+## Hot Reload
+
+When using `webpack-dev-server` in hot mode, `vue-loader` enables hot component reloading for Vue.js 1.0.0+. An example config:
+
+``` js
+module.exports = {
+  entry: ['webpack/hot/dev-server', './src/main.js'],
+  output: {
+    publicPath: '/static/',
+    filename: 'build.js'
+  },
+  module: {
+    loaders: [
+      { test: /\.vue$/, loader: 'vue' },
+    ]
+  },
+  devtool: '#source-map'
+}
+```
+
+In `index.html`, include the bundle:
+
+``` html
+<script src="/https/gitblind.noratr.app/static/build.js"></script>
+```
+
+Then, run the dev server with:
+
+``` bash
+webpack-dev-server --hot --config build/webpack.dev.config.js
+```
+
+Finally, visit `http://localhost:8080/webpack-dev-server/` to see the app with hot reloading.
+
+For a complete example with hot reloading in action, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).
 
 ## Style Imports
 
@@ -180,4 +251,6 @@ module.exports = {
 
 ## Example Project
 
-See [vue-loader-example](https://github.com/vuejs/vue-loader-example).
+For a simple setup example, see [vue-loader-example](https://github.com/vuejs/vue-loader-example).
+
+For an actual project with dev setup with hot reloading and production setup with minification, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).

From d67b6ea26c8537d85519eb8ade42478505cce3bc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 14 Oct 2015 22:29:10 -0400
Subject: [PATCH 066/877] adjust order in readme

---
 README.md | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 6f0822f3d..7078d4c7d 100644
--- a/README.md
+++ b/README.md
@@ -33,10 +33,10 @@ It allows you to write your components in this format:
 - [Basic Usage](#basic-usage)
 - [Pre-Processors](#pre-processors)
 - [Template Pre-Processors](#template-pre-processors)
-- [Scoped Styles](#scoped-styles)
-- [Hot Reload](#hot-reload)
 - [Style Imports](#style-imports)
 - [Asset URL Handling](#asset-url-handling)
+- [Scoped Styles](#scoped-styles)
+- [Hot Reload](#hot-reload)
 - [Advanced Loader Configuration](#advanced-loader-configuration)
   - [ES6 with Babel Example](#example-using-es6-with-babel)
   - [Extract CSS Example](#example-extracting-css-into-a-single-file)
@@ -92,8 +92,32 @@ You can also include Webpack loader queries in the `lang` attribute:
 
 For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
 
+## Style Imports
+
+If you want, you can separate your styles into a separate file and import it using the `src` attribute:
+
+``` html
+<style src="./style.css"></style>
+```
+
+Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from node modules: `<style src="todomvc-app-css/index.css">`.
+
+## Asset URL Handling
+
+By default, `vue-loader` automatically processes your style and template files with `css-loader` and `vue-html-loader` - this means that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+
+For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives you some very powerful benefits in managing your static assets this way:
+
+1. `file-loader` allows you to customize where to copy and place the asset file (by specifying `publicPath` in your Webpack config), and how they should be named with version hashes.
+
+2. `url-loader` allows you to conditionally load a file as a inline Data URL if they are smaller than a given threshold.
+
+For more details, see the respective documentations for [vue-html-loader](https://github.com/vuejs/vue-html-loader) and [css-loader](https://github.com/webpack/css-loader).
+
 ## Scoped Styles
 
+> Experimental
+
 When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM, but doesn't require any polyfills. It is achieved by transforming the following:
 
 ``` html
@@ -130,6 +154,8 @@ Into the following:
 
 ## Hot Reload
 
+> Experimental
+
 When using `webpack-dev-server` in hot mode, `vue-loader` enables hot component reloading for Vue.js 1.0.0+. An example config:
 
 ``` js
@@ -164,28 +190,6 @@ Finally, visit `http://localhost:8080/webpack-dev-server/` to see the app with h
 
 For a complete example with hot reloading in action, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).
 
-## Style Imports
-
-If you want, you can separate your styles into a separate file and import it using the `src` attribute:
-
-``` html
-<style src="./style.css"></style>
-```
-
-Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from node modules: `<style src="todomvc-app-css/index.css">`.
-
-## Asset URL Handling
-
-By default, `vue-loader` automatically processes your style and template files with `css-loader` and `vue-html-loader` - this means that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
-
-For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives you some very powerful benefits in managing your static assets this way:
-
-1. `file-loader` allows you to customize where to copy and place the asset file (by specifying `publicPath` in your Webpack config), and how they should be named with version hashes.
-
-2. `url-loader` allows you to conditionally load a file as a inline Data URL if they are smaller than a given threshold.
-
-For more details, see the respective documentations for [vue-html-loader](https://github.com/vuejs/vue-html-loader) and [css-loader](https://github.com/webpack/css-loader).
-
 ## Advanced Loader configuration
 
 By default, `vue-loader` will try to use the loader with the same name as

From 88f99dac95ce23e29887e83d66f2d0e531d4a57e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 13:04:35 -0400
Subject: [PATCH 067/877] hot reload: handle router-view

---
 lib/hot-reload-api.js | 109 ++++++++++++++++++++++++++++--------------
 1 file changed, 73 insertions(+), 36 deletions(-)

diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
index 55cb4eebf..c965e8f96 100644
--- a/lib/hot-reload-api.js
+++ b/lib/hot-reload-api.js
@@ -21,53 +21,90 @@ exports.install = function (Vue) {
 
   // create global hot reload map
   var map = Vue.config._hotComponents = Object.create(null)
-  // check compatibility
-  var componentDir = Vue.internalDirectives.component
+  // shim component
+  shimComponent(Vue.internalDirectives.component, map)
+  console.log('[HMR] vue component hot reload shim applied.')
+  // shim router-view if present
+  var routerView = Vue.elementDirective('router-view')
+  if (routerView) {
+    shimComponent(routerView, map)
+    console.log('[HMR] vue-router <router-view> hot reload shim applied.')
+  }
+}
 
-  // shim the component directive
-  var set = componentDir.setComponent
-  componentDir.setComponent = function (id, cb) {
-    var prevComponent = this.Component
-    var prevId = prevComponent && prevComponent.options.hotID
-    if (prevId) {
-      map[prevId].instances.$remove(this)
+/**
+ * Shim the component directive.
+ *
+ * @param {Object} dir
+ * @param {Object} map - hot component map
+ */
+
+function shimComponent (dir, map) {
+  shimMethod(dir, 'unbuild', function (defer) {
+    var prevComponent = this.childVM && this.childVM.constructor
+    removeComponent(prevComponent, map, this)
+    // defer = true means we are transitioning to a new
+    // Component. Register this new component to the list.
+    if (defer) {
+      addComponent(this.Component, map, this)
     }
-    set.call(this, id, cb)
+  })
+}
+
+/**
+ * Shim a directive method.
+ *
+ * @param {Object} dir
+ * @param {String} methodName
+ * @param {Function} fn
+ */
+
+function shimMethod (dir, methodName, fn) {
+  var original = dir[methodName]
+  dir[methodName] = function () {
+    fn.apply(this, arguments)
+    return original.apply(this, arguments)
   }
+}
 
-  var resolve = componentDir.resolveComponent
-  componentDir.resolveComponent = function (id, cb) {
-    var view = this
-    resolve.call(this, id, function () {
-      var Component = view.Component
-      var newId = Component.options.hotID
-      if (newId) {
-        if (!map[newId]) {
-          map[newId] = {
-            Ctor: Component,
-            instances: []
-          }
-        }
-        map[newId].instances.push(view)
-      }
-      cb()
-    })
+/**
+ * Remove a component view from a Component's hot list
+ *
+ * @param {Function} Component
+ * @param {Object} map - hot component map
+ * @param {Directive} view - view directive instance
+ */
+
+function removeComponent (Component, map, view) {
+  var id = Component && Component.options.hotID
+  if (id) {
+    map[id].instances.$remove(view)
   }
+}
 
-  var unbind = componentDir.unbind
-  componentDir.unbind = function () {
-    var id = this.Component && this.Component.options.hotID
-    if (id) {
-      map[id].instances.$remove(this)
+/**
+ * Add a component view to a Component's hot list
+ *
+ * @param {Function} Component
+ * @param {Object} map - hot component map
+ * @param {Directive} view - view directive instance
+ */
+
+function addComponent (Component, map, view) {
+  var id = Component && Component.options.hotID
+  if (id) {
+    if (!map[id]) {
+      map[id] = {
+        Ctor: Component,
+        instances: []
+      }
     }
-    unbind.call(this)
+    map[id].instances.push(view)
   }
-
-  console.log('[HMR] Vue component hot reload shim applied.')
 }
 
 /**
- * Update a component directive instance
+ * Update a component view instance
  *
  * @param {Directive} view
  */

From e4d6e4902546b7c5a50ee9e55f684a8c81890099 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 13:19:53 -0400
Subject: [PATCH 068/877] bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ed0970f7..5dbea9a8a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 28ae14c1650ea55a2e487e595be1a2aaed51607a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 16:48:29 -0400
Subject: [PATCH 069/877] fix: only unregister/register components when not hot
 updating in shimmed unbuild function

---
 lib/hot-reload-api.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
index c965e8f96..15b9c23b8 100644
--- a/lib/hot-reload-api.js
+++ b/lib/hot-reload-api.js
@@ -41,12 +41,14 @@ exports.install = function (Vue) {
 
 function shimComponent (dir, map) {
   shimMethod(dir, 'unbuild', function (defer) {
-    var prevComponent = this.childVM && this.childVM.constructor
-    removeComponent(prevComponent, map, this)
-    // defer = true means we are transitioning to a new
-    // Component. Register this new component to the list.
-    if (defer) {
-      addComponent(this.Component, map, this)
+    if (!this.hotUpdating) {
+      var prevComponent = this.childVM && this.childVM.constructor
+      removeComponent(prevComponent, map, this)
+      // defer = true means we are transitioning to a new
+      // Component. Register this new component to the list.
+      if (defer) {
+        addComponent(this.Component, map, this)
+      }
     }
   })
 }
@@ -113,6 +115,7 @@ exports.update = function (view) {
   if (!view._bound) {
     return
   }
+  view.hotUpdating = true
   // disable transitions
   view.vm._isCompiled = false
   // save state
@@ -126,4 +129,5 @@ exports.update = function (view) {
   view.childVM.$data = state
   // re-eanble transitions
   view.vm._isCompiled = true
+  view.hotUpdating = false
 }

From f2af5db26b6a3c6e63886cccaa47d45176b71963 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 16:48:47 -0400
Subject: [PATCH 070/877] bump 4.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5dbea9a8a..abb7aa10f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From e72ecc8cd5959808dec268cb94e3a49afbc68d94 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 20:41:48 -0400
Subject: [PATCH 071/877] scoped css: adjust id generation

---
 lib/id-generator.js      | 12 ------------
 lib/style-rewriter.js    |  4 ++--
 lib/template-rewriter.js |  4 ++--
 package.json             |  1 +
 test/test.js             | 12 +++++++-----
 5 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 lib/id-generator.js

diff --git a/lib/id-generator.js b/lib/id-generator.js
deleted file mode 100644
index e1c242d95..000000000
--- a/lib/id-generator.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// keep track of unique ids for component modules.
-
-var ids = Object.create(null)
-var count = 0
-
-exports.get = function (path) {
-  var id = ids[path]
-  if (!id) {
-    id = ids[path] = ++count
-  }
-  return '_v-' + id
-}
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 4088e9a4e..5ca48ecbb 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,6 +1,6 @@
 var postcss = require('postcss')
 var selectorParser = require('postcss-selector-parser')
-var idGen = require('./id-generator')
+var hash = require('hash-sum')
 
 var currentId
 var addId = postcss.plugin('add-id', function () {
@@ -20,7 +20,7 @@ var addId = postcss.plugin('add-id', function () {
 module.exports = function (css) {
   this.cacheable()
   var cb = this.async()
-  currentId = idGen.get(this.resourcePath)
+  currentId = '_v-' + hash(this.resourcePath)
   postcss([addId])
     .process(css)
     .then(function (result) {
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
index f91ade954..82d9d24bc 100644
--- a/lib/template-rewriter.js
+++ b/lib/template-rewriter.js
@@ -1,11 +1,11 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser()
 var serializer = new parse5.Serializer()
-var idGen = require('./id-generator')
+var hash = require('hash-sum')
 
 module.exports = function (html) {
   this.cacheable()
-  var id = idGen.get(this.resourcePath)
+  var id = '_v-' + hash(this.resourcePath)
   var tree = parser.parseFragment(html)
   walk(tree, function (node) {
     if (node.attrs) {
diff --git a/package.json b/package.json
index abb7aa10f..e56ef4ea1 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "test": "eslint lib && mocha test/test.js --slow 5000"
   },
   "dependencies": {
+    "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
diff --git a/test/test.js b/test/test.js
index b44f3c784..934c729a3 100644
--- a/test/test.js
+++ b/test/test.js
@@ -94,13 +94,14 @@ describe('vue-loader', function () {
       entry: './test/fixtures/scoped-css.js'
     }, function (window) {
       var module = window.testModule
+      var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
       expect(module.template).to.contain(
-        '<div _v-1=""><h1 _v-1="">hi</h1></div>\n' +
-        '<p class="abc def" _v-1="">hi</p>'
+        '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
+        '<p class="abc def" ' + id + '="">hi</p>'
       )
       var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('.test[_v-1] {\n  color: yellow;\n}')
-      expect(style).to.contain('h1[_v-1] {\n  color: green;\n}')
+      expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
+      expect(style).to.contain('h1[' + id + '] {\n  color: green;\n}')
       done()
     })
   })
@@ -112,7 +113,8 @@ describe('vue-loader', function () {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red; }')
       // import with scoped
-      expect(styles[1].textContent).to.contain('h1[_v-2] { color: green; }')
+      var id = '_v-' + hash(require.resolve('./fixtures/import-scoped.css'))
+      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green; }')
       done()
     })
   })

From 9c74e86d2a993ff04fa138f5b8d2ab8f2c7b6cd8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 20:42:05 -0400
Subject: [PATCH 072/877] bump 4.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e56ef4ea1..b3ea66a90 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 034f262e56b839cbfe88df6274639287061f477d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 15 Oct 2015 20:44:02 -0400
Subject: [PATCH 073/877] readme: add npm badge [ci skip]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7078d4c7d..b9280444d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader [![Build Status](https://img.shields.io/circleci/project/vuejs/vue-loader.svg)](https://circleci.com/gh/vuejs/vue-loader)
+# vue-loader [![Build Status](https://img.shields.io/circleci/project/vuejs/vue-loader.svg)](https://circleci.com/gh/vuejs/vue-loader) [![npm package](https://img.shields.io/npm/v/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
 
 > Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
 

From c6b090e236d2188d2e6373a8e73b895e0cbe74b8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 16 Oct 2015 11:45:50 -0400
Subject: [PATCH 074/877] hot reload: better handle root and non-rendered
 components

---
 lib/loader.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index fdbcc5548..f28b1b40d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -122,6 +122,7 @@ module.exports = function (content) {
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {
+      var hotReloadAPIPath = require.resolve('./hot-reload-api').replace(/\\/g, "\\\\")
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
       var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
       var accepted = []
@@ -137,16 +138,25 @@ module.exports = function (content) {
             // shim the component directive so that it
             // registers the instances
             'var Vue = require("vue")\n' +
-            'var hotAPI = require("' + require.resolve('./hot-reload-api') + '")\n' +
+            'var hotAPI = require("' + hotReloadAPIPath + '")\n' +
             'hotAPI.install(Vue)\n' +
             'if (!hotAPI.compatible) return\n' +
             'var map = Vue.config._hotComponents\n' +
             'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
+            // store the record
+            'if (typeof module.exports.el !== "string" && typeof module.exports.data !== "object") {\n' +
+              'map[id] = { Ctor: Vue.extend(module.exports), instances: [] }\n' +
+            '}\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
+              'if (!map[id]) {\n' +
+                'throw new Error("Root or manually-mounted instance modified. Full reload is required.")\n' +
+              '}\n' +
               'var Ctor = map[id].Ctor\n' +
               // overwrite existing constructor's options
               (scriptString ? 'Ctor.options = Vue.util.mergeOptions(Vue.options, require(' + scriptString + '))\n' : '') +
               (templateString ? 'Ctor.options.template = require(' + templateString + ')\n' : '') +
+              // handle recursive names
+              'if (Ctor.options.name) Ctor.options.components[Ctor.options.name] = Ctor\n' +
               // reset linker
               'Ctor.linker = null\n' +
               // reload directive instances

From f3d3d2b66c7db788c563dd237278a07a012dc645 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 16 Oct 2015 11:46:05 -0400
Subject: [PATCH 075/877] nump 4.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b3ea66a90..bd4ab7e0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b80b93a9654868ce48f1edf9c5713ea3e346cf17 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 16 Oct 2015 11:55:34 -0400
Subject: [PATCH 076/877] fix lint

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index f28b1b40d..45ea18046 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -122,7 +122,7 @@ module.exports = function (content) {
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {
-      var hotReloadAPIPath = require.resolve('./hot-reload-api').replace(/\\/g, "\\\\")
+      var hotReloadAPIPath = require.resolve('./hot-reload-api').replace(/\\/g, '\\\\')
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
       var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
       var accepted = []

From d6c9768aafab14b7392fb61647d797c17b8de5b5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 16 Oct 2015 20:32:54 -0400
Subject: [PATCH 077/877] readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b9280444d..f34a725a6 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ For more details, see the respective documentations for [vue-html-loader](https:
 When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM, but doesn't require any polyfills. It is achieved by transforming the following:
 
 ``` html
-<style>
+<style scoped>
 .example {
   color: red;
 }

From 12cce73099fc7c581be28114ad332ac1c4b80cea Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 16 Oct 2015 20:37:56 -0400
Subject: [PATCH 078/877] readme [ci skip]

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f34a725a6..2d5ecd40a 100644
--- a/README.md
+++ b/README.md
@@ -159,8 +159,9 @@ Into the following:
 When using `webpack-dev-server` in hot mode, `vue-loader` enables hot component reloading for Vue.js 1.0.0+. An example config:
 
 ``` js
+// webpack.example.config.js
 module.exports = {
-  entry: ['webpack/hot/dev-server', './src/main.js'],
+  entry: './src/main.js',
   output: {
     publicPath: '/static/',
     filename: 'build.js'
@@ -183,7 +184,7 @@ In `index.html`, include the bundle:
 Then, run the dev server with:
 
 ``` bash
-webpack-dev-server --hot --config build/webpack.dev.config.js
+webpack-dev-server --inline --hot --config webpack.example.config.js
 ```
 
 Finally, visit `http://localhost:8080/webpack-dev-server/` to see the app with hot reloading.

From eeae8d75ffb27627a33beb6b9025f08d067b9c29 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 17 Oct 2015 17:51:46 -0400
Subject: [PATCH 079/877] readme [ci skip]

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 2d5ecd40a..3e02cf93d 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,14 @@ Finally, visit `http://localhost:8080/webpack-dev-server/` to see the app with h
 
 For a complete example with hot reloading in action, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).
 
+### Hot Reload Notes
+
+- When a component is hot-reloaded, its current state is preserved. However, the component itself is destroyed and recreated, so all of its lifecycle hooks will be called accordingly. Make sure to properly teardown any side effects in your lifecycle hooks.
+
+- Private state for child components of a hot-reloaded component is not guaranteed to be preserved across reloads.
+
+- A root Vue instance or a manually mounted instance cannot be hot-reloaded. It will always force a full reload.
+
 ## Advanced Loader configuration
 
 By default, `vue-loader` will try to use the loader with the same name as

From 58be42800e0d7478b1a6991161bc65d43062a51e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Oct 2015 10:47:08 -0400
Subject: [PATCH 080/877] hot reload: extract more into the api

---
 lib/hot-reload-api.js | 100 ++++++++++++++++++++++++++++++++++--------
 lib/loader.js         |  27 +++---------
 2 files changed, 88 insertions(+), 39 deletions(-)

diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
index 15b9c23b8..a5edbb056 100644
--- a/lib/hot-reload-api.js
+++ b/lib/hot-reload-api.js
@@ -5,11 +5,15 @@
  *   - add self to current component's list
  */
 
+var Vue
+var map = Object.create(null)
 var shimmed = false
-exports.install = function (Vue) {
+
+exports.install = function (vue) {
   if (shimmed) return
   shimmed = true
-
+  
+  Vue = vue
   exports.compatible = !!Vue.internalDirectives
   if (!exports.compatible) {
     console.warn(
@@ -19,15 +23,13 @@ exports.install = function (Vue) {
     return
   }
 
-  // create global hot reload map
-  var map = Vue.config._hotComponents = Object.create(null)
   // shim component
-  shimComponent(Vue.internalDirectives.component, map)
+  shimComponent(Vue.internalDirectives.component)
   console.log('[HMR] vue component hot reload shim applied.')
   // shim router-view if present
   var routerView = Vue.elementDirective('router-view')
   if (routerView) {
-    shimComponent(routerView, map)
+    shimComponent(routerView)
     console.log('[HMR] vue-router <router-view> hot reload shim applied.')
   }
 }
@@ -36,18 +38,17 @@ exports.install = function (Vue) {
  * Shim the component directive.
  *
  * @param {Object} dir
- * @param {Object} map - hot component map
  */
 
-function shimComponent (dir, map) {
+function shimComponent (dir) {
   shimMethod(dir, 'unbuild', function (defer) {
     if (!this.hotUpdating) {
       var prevComponent = this.childVM && this.childVM.constructor
-      removeComponent(prevComponent, map, this)
+      removeComponent(prevComponent, this)
       // defer = true means we are transitioning to a new
       // Component. Register this new component to the list.
       if (defer) {
-        addComponent(this.Component, map, this)
+        addComponent(this.Component, this)
       }
     }
   })
@@ -73,14 +74,13 @@ function shimMethod (dir, methodName, fn) {
  * Remove a component view from a Component's hot list
  *
  * @param {Function} Component
- * @param {Object} map - hot component map
  * @param {Directive} view - view directive instance
  */
 
-function removeComponent (Component, map, view) {
+function removeComponent (Component, view) {
   var id = Component && Component.options.hotID
   if (id) {
-    map[id].instances.$remove(view)
+    map[id].views.$remove(view)
   }
 }
 
@@ -88,21 +88,85 @@ function removeComponent (Component, map, view) {
  * Add a component view to a Component's hot list
  *
  * @param {Function} Component
- * @param {Object} map - hot component map
  * @param {Directive} view - view directive instance
  */
 
-function addComponent (Component, map, view) {
+function addComponent (Component, view) {
   var id = Component && Component.options.hotID
   if (id) {
     if (!map[id]) {
       map[id] = {
-        Ctor: Component,
+        Component: Component,
+        views: [],
         instances: []
       }
     }
-    map[id].instances.push(view)
+    map[id].views.push(view)
+  }
+}
+
+/**
+ * Create a record for a hot module, which keeps track of its construcotr,
+ * instnaces and views (component directives or router-views).
+ *
+ * @param {String} id
+ * @param {Object} options
+ */
+
+exports.createRecord = function (id, options) {
+  if (typeof options.el !== 'string' && typeof options.data !== 'object') {
+    var add = function () {
+      map[id].instances.push(this)
+    }
+    var remove = function () {
+      map[id].instances.$remove(this)
+    }
+    options.created = options.created
+      ? [options.created, add]
+      : add
+    options.beforeDestroy = options.beforeDestroy
+      ? [options.beforeDestroy, remove]
+      : remove
+    map[id] = {
+      Component: Vue.extend(options),
+      views: [],
+      instances: []
+    }
+  }
+}
+
+/**
+ * Update a hot component.
+ *
+ * @param {String} id
+ * @param {Object|null} newOptions
+ * @param {String|null} newTemplate
+ */
+
+exports.update = function (id, newOptions, newTemplate) {
+  var record = map[id]
+  // force full-reload if an instance of the component is active but is not
+  // managed by a view
+  if (!record || (record.instances.length && !record.views.length)) {
+    throw new Error('Root or manually-mounted instance modified. Full reload is required.')
+  }
+  var Component = record.Component
+  // update constructor
+  if (newOptions) {
+    Component.options = Vue.util.mergeOptions(Vue.options, newOptions)
+  }
+  if (newTemplate) {
+    Component.options.template = newTemplate
+  }
+  // handle recursive lookup
+  if (Component.options.name) {
+    console.log(Component.options)
+    Component.options.components[Component.options.name] = Component
   }
+  // reset constructor cached linker
+  Component.linker = null
+  // reload all views
+  record.views.forEach(updateView)
 }
 
 /**
@@ -111,7 +175,7 @@ function addComponent (Component, map, view) {
  * @param {Directive} view
  */
 
-exports.update = function (view) {
+function updateView (view) {
   if (!view._bound) {
     return
   }
diff --git a/lib/loader.js b/lib/loader.js
index 45ea18046..c03e0c582 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -137,31 +137,16 @@ module.exports = function (content) {
           '(function () {\n' +
             // shim the component directive so that it
             // registers the instances
-            'var Vue = require("vue")\n' +
             'var hotAPI = require("' + hotReloadAPIPath + '")\n' +
-            'hotAPI.install(Vue)\n' +
+            'hotAPI.install(require("vue"))\n' +
             'if (!hotAPI.compatible) return\n' +
-            'var map = Vue.config._hotComponents\n' +
             'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
-            // store the record
-            'if (typeof module.exports.el !== "string" && typeof module.exports.data !== "object") {\n' +
-              'map[id] = { Ctor: Vue.extend(module.exports), instances: [] }\n' +
-            '}\n' +
+            // create the record
+            'hotAPI.createRecord(id, module.exports)\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
-              'if (!map[id]) {\n' +
-                'throw new Error("Root or manually-mounted instance modified. Full reload is required.")\n' +
-              '}\n' +
-              'var Ctor = map[id].Ctor\n' +
-              // overwrite existing constructor's options
-              (scriptString ? 'Ctor.options = Vue.util.mergeOptions(Vue.options, require(' + scriptString + '))\n' : '') +
-              (templateString ? 'Ctor.options.template = require(' + templateString + ')\n' : '') +
-              // handle recursive names
-              'if (Ctor.options.name) Ctor.options.components[Ctor.options.name] = Ctor\n' +
-              // reset linker
-              'Ctor.linker = null\n' +
-              // reload directive instances
-              'map[id].instances.forEach(hotAPI.update)\n' +
-              // re-enable transitions
+              'var newOptions = ' + (scriptString ? 'require(' + scriptString + ')\n' : 'null\n') +
+              'var newTemplate = ' + (templateString ? 'require(' + templateString + ')\n' : 'null\n') +
+              'hotAPI.update(id, newOptions, newTemplate)\n' +
             '})\n' +
           '})()\n' +
         '}'

From cff012bbfcd69baf8a583152038f8d08f13e6bf3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Oct 2015 10:48:43 -0400
Subject: [PATCH 081/877] fix eslint

---
 .eslintrc             | 2 +-
 lib/hot-reload-api.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 068f0d4a4..9a90c1d8e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -146,7 +146,7 @@
     "object-shorthand": 0,
     "one-var": [2, { "initialized": "never" }],
     "operator-assignment": 0,
-    "operator-linebreak": [2, "after"],
+    "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
     "padded-blocks": 0,
     "prefer-const": 0,
     "quote-props": 0,
diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
index a5edbb056..be2a25705 100644
--- a/lib/hot-reload-api.js
+++ b/lib/hot-reload-api.js
@@ -12,7 +12,7 @@ var shimmed = false
 exports.install = function (vue) {
   if (shimmed) return
   shimmed = true
-  
+
   Vue = vue
   exports.compatible = !!Vue.internalDirectives
   if (!exports.compatible) {

From ebca6e1b996a9ed7e997c2fb4f469d6414669b65 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Oct 2015 10:49:26 -0400
Subject: [PATCH 082/877] bump 4.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd4ab7e0f..0dd683de3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b6a3b65272f401b80ff247e467b3d9d2fc8af5c8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Oct 2015 14:18:28 -0400
Subject: [PATCH 083/877] code cleanup

---
 lib/hot-reload-api.js | 74 ++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
index be2a25705..a12263a12 100644
--- a/lib/hot-reload-api.js
+++ b/lib/hot-reload-api.js
@@ -1,14 +1,13 @@
-/**
- * override component directive's resolveComponent function.
- * When component is resolved:
- *   - remove self from previous component's list
- *   - add self to current component's list
- */
-
-var Vue
+var Vue // late bind
 var map = Object.create(null)
 var shimmed = false
 
+/**
+ * Determine compatibility and apply patch.
+ *
+ * @param {Function} vue
+ */
+
 exports.install = function (vue) {
   if (shimmed) return
   shimmed = true
@@ -23,25 +22,26 @@ exports.install = function (vue) {
     return
   }
 
-  // shim component
-  shimComponent(Vue.internalDirectives.component)
+  // patch view directive
+  patchView(Vue.internalDirectives.component)
   console.log('[HMR] vue component hot reload shim applied.')
   // shim router-view if present
   var routerView = Vue.elementDirective('router-view')
   if (routerView) {
-    shimComponent(routerView)
+    patchView(routerView)
     console.log('[HMR] vue-router <router-view> hot reload shim applied.')
   }
 }
 
 /**
- * Shim the component directive.
+ * Shim the view directive (component or router-view).
  *
- * @param {Object} dir
+ * @param {Object} View
  */
 
-function shimComponent (dir) {
-  shimMethod(dir, 'unbuild', function (defer) {
+function patchView (View) {
+  var unbuild = View.unbuild
+  View.unbuild = function (defer) {
     if (!this.hotUpdating) {
       var prevComponent = this.childVM && this.childVM.constructor
       removeComponent(prevComponent, this)
@@ -51,57 +51,43 @@ function shimComponent (dir) {
         addComponent(this.Component, this)
       }
     }
-  })
-}
-
-/**
- * Shim a directive method.
- *
- * @param {Object} dir
- * @param {String} methodName
- * @param {Function} fn
- */
-
-function shimMethod (dir, methodName, fn) {
-  var original = dir[methodName]
-  dir[methodName] = function () {
-    fn.apply(this, arguments)
-    return original.apply(this, arguments)
+    // call original
+    return unbuild.call(this, defer)
   }
 }
 
 /**
- * Remove a component view from a Component's hot list
+ * Add a component view to a Component's hot list
  *
  * @param {Function} Component
  * @param {Directive} view - view directive instance
  */
 
-function removeComponent (Component, view) {
+function addComponent (Component, view) {
   var id = Component && Component.options.hotID
   if (id) {
-    map[id].views.$remove(view)
+    if (!map[id]) {
+      map[id] = {
+        Component: Component,
+        views: [],
+        instances: []
+      }
+    }
+    map[id].views.push(view)
   }
 }
 
 /**
- * Add a component view to a Component's hot list
+ * Remove a component view from a Component's hot list
  *
  * @param {Function} Component
  * @param {Directive} view - view directive instance
  */
 
-function addComponent (Component, view) {
+function removeComponent (Component, view) {
   var id = Component && Component.options.hotID
   if (id) {
-    if (!map[id]) {
-      map[id] = {
-        Component: Component,
-        views: [],
-        instances: []
-      }
-    }
-    map[id].views.push(view)
+    map[id].views.$remove(view)
   }
 }
 

From cb5f3270d653a4ed978e9b3b5e4f8ef2ccc99d1a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 21 Oct 2015 14:39:03 -0400
Subject: [PATCH 084/877] split vue-hot-reload-api

---
 lib/hot-reload-api.js | 183 ------------------------------------------
 lib/loader.js         |   2 +-
 package.json          |   5 +-
 3 files changed, 4 insertions(+), 186 deletions(-)
 delete mode 100644 lib/hot-reload-api.js

diff --git a/lib/hot-reload-api.js b/lib/hot-reload-api.js
deleted file mode 100644
index a12263a12..000000000
--- a/lib/hot-reload-api.js
+++ /dev/null
@@ -1,183 +0,0 @@
-var Vue // late bind
-var map = Object.create(null)
-var shimmed = false
-
-/**
- * Determine compatibility and apply patch.
- *
- * @param {Function} vue
- */
-
-exports.install = function (vue) {
-  if (shimmed) return
-  shimmed = true
-
-  Vue = vue
-  exports.compatible = !!Vue.internalDirectives
-  if (!exports.compatible) {
-    console.warn(
-      '[HMR] vue-loader hot reload is only compatible with ' +
-      'Vue.js 1.0.0+.'
-    )
-    return
-  }
-
-  // patch view directive
-  patchView(Vue.internalDirectives.component)
-  console.log('[HMR] vue component hot reload shim applied.')
-  // shim router-view if present
-  var routerView = Vue.elementDirective('router-view')
-  if (routerView) {
-    patchView(routerView)
-    console.log('[HMR] vue-router <router-view> hot reload shim applied.')
-  }
-}
-
-/**
- * Shim the view directive (component or router-view).
- *
- * @param {Object} View
- */
-
-function patchView (View) {
-  var unbuild = View.unbuild
-  View.unbuild = function (defer) {
-    if (!this.hotUpdating) {
-      var prevComponent = this.childVM && this.childVM.constructor
-      removeComponent(prevComponent, this)
-      // defer = true means we are transitioning to a new
-      // Component. Register this new component to the list.
-      if (defer) {
-        addComponent(this.Component, this)
-      }
-    }
-    // call original
-    return unbuild.call(this, defer)
-  }
-}
-
-/**
- * Add a component view to a Component's hot list
- *
- * @param {Function} Component
- * @param {Directive} view - view directive instance
- */
-
-function addComponent (Component, view) {
-  var id = Component && Component.options.hotID
-  if (id) {
-    if (!map[id]) {
-      map[id] = {
-        Component: Component,
-        views: [],
-        instances: []
-      }
-    }
-    map[id].views.push(view)
-  }
-}
-
-/**
- * Remove a component view from a Component's hot list
- *
- * @param {Function} Component
- * @param {Directive} view - view directive instance
- */
-
-function removeComponent (Component, view) {
-  var id = Component && Component.options.hotID
-  if (id) {
-    map[id].views.$remove(view)
-  }
-}
-
-/**
- * Create a record for a hot module, which keeps track of its construcotr,
- * instnaces and views (component directives or router-views).
- *
- * @param {String} id
- * @param {Object} options
- */
-
-exports.createRecord = function (id, options) {
-  if (typeof options.el !== 'string' && typeof options.data !== 'object') {
-    var add = function () {
-      map[id].instances.push(this)
-    }
-    var remove = function () {
-      map[id].instances.$remove(this)
-    }
-    options.created = options.created
-      ? [options.created, add]
-      : add
-    options.beforeDestroy = options.beforeDestroy
-      ? [options.beforeDestroy, remove]
-      : remove
-    map[id] = {
-      Component: Vue.extend(options),
-      views: [],
-      instances: []
-    }
-  }
-}
-
-/**
- * Update a hot component.
- *
- * @param {String} id
- * @param {Object|null} newOptions
- * @param {String|null} newTemplate
- */
-
-exports.update = function (id, newOptions, newTemplate) {
-  var record = map[id]
-  // force full-reload if an instance of the component is active but is not
-  // managed by a view
-  if (!record || (record.instances.length && !record.views.length)) {
-    throw new Error('Root or manually-mounted instance modified. Full reload is required.')
-  }
-  var Component = record.Component
-  // update constructor
-  if (newOptions) {
-    Component.options = Vue.util.mergeOptions(Vue.options, newOptions)
-  }
-  if (newTemplate) {
-    Component.options.template = newTemplate
-  }
-  // handle recursive lookup
-  if (Component.options.name) {
-    console.log(Component.options)
-    Component.options.components[Component.options.name] = Component
-  }
-  // reset constructor cached linker
-  Component.linker = null
-  // reload all views
-  record.views.forEach(updateView)
-}
-
-/**
- * Update a component view instance
- *
- * @param {Directive} view
- */
-
-function updateView (view) {
-  if (!view._bound) {
-    return
-  }
-  view.hotUpdating = true
-  // disable transitions
-  view.vm._isCompiled = false
-  // save state
-  var state = view.childVM.$data
-  // remount, make sure to disable keep-alive
-  var keepAlive = view.keepAlive
-  view.keepAlive = false
-  view.mountComponent()
-  view.keepAlive = keepAlive
-  // restore state
-  view.childVM.$data = state
-  // re-eanble transitions
-  view.vm._isCompiled = true
-  view.hotUpdating = false
-}
diff --git a/lib/loader.js b/lib/loader.js
index c03e0c582..e01aa6a25 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -122,7 +122,7 @@ module.exports = function (content) {
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {
-      var hotReloadAPIPath = require.resolve('./hot-reload-api').replace(/\\/g, '\\\\')
+      var hotReloadAPIPath = require.resolve('vue-hot-reload-api').replace(/\\/g, '\\\\')
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
       var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
       var accepted = []
diff --git a/package.json b/package.json
index 0dd683de3..e85fa6c04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -27,7 +27,8 @@
     "loader-utils": "^0.2.10",
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
-    "postcss-selector-parser": "^1.1.2"
+    "postcss-selector-parser": "^1.1.2",
+    "vue-hot-reload-api": "^1.0.0"
   },
   "peerDependencies": {
     "vue-html-loader": "^1.0.0",

From 34b98b66ac63ff83e3400898f42af1fdf5b1e3cb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 21 Oct 2015 15:32:44 -0400
Subject: [PATCH 085/877] respect babelrc

---
 lib/loader.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/loader.js b/lib/loader.js
index e01aa6a25..417e04706 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -2,6 +2,14 @@ var loaderUtils = require('loader-utils')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
 
+// load babelrc
+var babelrc
+var fs = require('fs')
+var babelrcPath = process.cwd() + '/.babelrc'
+if (fs.existsSync(babelrcPath)) {
+  babelrc = JSON.stringify(JSON.parse(fs.readFileSync(babelrcPath, 'utf-8')))
+}
+
 var defaultLang = {
   template: 'html',
   style: 'css',
@@ -61,6 +69,10 @@ module.exports = function (content) {
     var rewriter = scoped ? rewriters[type] || '' : ''
     var loader = loaders[lang]
     if (loader !== undefined) {
+      // make sure babelrc is respected
+      if (loader === 'babel') {
+        loader += '?' + babelrc
+      }
       // lang with default or pre-configured loader
       if (loader) loader += '!'
       return loader + rewriter

From 510979d18b5de8f24754acd41a93b3f74818275c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 21 Oct 2015 15:33:10 -0400
Subject: [PATCH 086/877] bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e85fa6c04..2617a3d8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 5b3d7753d86cd9ebf961fe3d1dc2be016b1df576 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 21 Oct 2015 16:50:49 -0400
Subject: [PATCH 087/877] revert babelrc sniffing

---
 lib/loader.js | 12 ------------
 package.json  |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 417e04706..e01aa6a25 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -2,14 +2,6 @@ var loaderUtils = require('loader-utils')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
 
-// load babelrc
-var babelrc
-var fs = require('fs')
-var babelrcPath = process.cwd() + '/.babelrc'
-if (fs.existsSync(babelrcPath)) {
-  babelrc = JSON.stringify(JSON.parse(fs.readFileSync(babelrcPath, 'utf-8')))
-}
-
 var defaultLang = {
   template: 'html',
   style: 'css',
@@ -69,10 +61,6 @@ module.exports = function (content) {
     var rewriter = scoped ? rewriters[type] || '' : ''
     var loader = loaders[lang]
     if (loader !== undefined) {
-      // make sure babelrc is respected
-      if (loader === 'babel') {
-        loader += '?' + babelrc
-      }
       // lang with default or pre-configured loader
       if (loader) loader += '!'
       return loader + rewriter
diff --git a/package.json b/package.json
index 2617a3d8d..557a23916 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.7",
+  "version": "4.0.8",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From e85c56ac93c91e2b9068b67ba26b3c4af80b54e3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 21 Oct 2015 23:47:16 -0400
Subject: [PATCH 088/877] small tweaks

---
 README.md     | 4 ++--
 lib/loader.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3e02cf93d..cdddcb7cf 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ It allows you to write your components in this format:
 - [Template Pre-Processors](#template-pre-processors)
 - [Style Imports](#style-imports)
 - [Asset URL Handling](#asset-url-handling)
-- [Scoped Styles](#scoped-styles)
+- [Scoped CSS](#scoped-css)
 - [Hot Reload](#hot-reload)
 - [Advanced Loader Configuration](#advanced-loader-configuration)
   - [ES6 with Babel Example](#example-using-es6-with-babel)
@@ -114,7 +114,7 @@ For example, `url(image.png)` will be translated into `require('./image.png')`.
 
 For more details, see the respective documentations for [vue-html-loader](https://github.com/vuejs/vue-html-loader) and [css-loader](https://github.com/webpack/css-loader).
 
-## Scoped Styles
+## Scoped CSS
 
 > Experimental
 
diff --git a/lib/loader.js b/lib/loader.js
index e01aa6a25..7797761b8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -122,7 +122,7 @@ module.exports = function (content) {
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {
-      var hotReloadAPIPath = require.resolve('vue-hot-reload-api').replace(/\\/g, '\\\\')
+      var hotReloadAPIPath = JSON.stringify(require.resolve('vue-hot-reload-api'))
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
       var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
       var accepted = []
@@ -137,7 +137,7 @@ module.exports = function (content) {
           '(function () {\n' +
             // shim the component directive so that it
             // registers the instances
-            'var hotAPI = require("' + hotReloadAPIPath + '")\n' +
+            'var hotAPI = require(' + hotReloadAPIPath + ')\n' +
             'hotAPI.install(require("vue"))\n' +
             'if (!hotAPI.compatible) return\n' +
             'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +

From 64d5bb6858c8190ad3a3619e44d03dd5306fc591 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 21 Oct 2015 23:49:01 -0400
Subject: [PATCH 089/877] bump hot api version

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 557a23916..8fc531780 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -28,10 +28,10 @@
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
     "postcss-selector-parser": "^1.1.2",
-    "vue-hot-reload-api": "^1.0.0"
+    "vue-hot-reload-api": "^1.1.0"
   },
   "peerDependencies": {
-    "vue-html-loader": "^1.0.0",
+    "vue-html-loader": "*",
     "css-loader": "*",
     "style-loader": "*"
   },

From 1e520c676286036465f72c105cbac8cde93d4961 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 23 Oct 2015 12:00:06 -0400
Subject: [PATCH 090/877] support modules that export already extended
 contructors

---
 lib/loader.js | 10 ++++++----
 package.json  |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 7797761b8..2a09e0098 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -105,15 +105,17 @@ module.exports = function (content) {
       output += getRequire('style', style, i, style.scoped)
     })
 
-    // only one script tag allowed
+    // add require for script
     if (parts.script.length) {
       output += 'module.exports = ' +
         getRequire('script', parts.script[0], 0)
     }
 
-    // only one template tag allowed
+    // add require for template
     if (parts.template.length) {
-      output += 'module.exports.template = ' +
+      output += ';(typeof module.exports === "function" ' +
+        '? module.exports.options ' +
+        ': module.exports).template = ' +
         getRequire('template', parts.template[0], 0, hasLocalStyles)
     }
 
@@ -140,7 +142,7 @@ module.exports = function (content) {
             'var hotAPI = require(' + hotReloadAPIPath + ')\n' +
             'hotAPI.install(require("vue"))\n' +
             'if (!hotAPI.compatible) return\n' +
-            'var id = module.exports.hotID = ' + (scriptString || templateString) + '\n' +
+            'var id = ' + (scriptString || templateString) + '\n' +
             // create the record
             'hotAPI.createRecord(id, module.exports)\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
diff --git a/package.json b/package.json
index 8fc531780..6f65e16fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -28,7 +28,7 @@
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
     "postcss-selector-parser": "^1.1.2",
-    "vue-hot-reload-api": "^1.1.0"
+    "vue-hot-reload-api": "^1.2.0"
   },
   "peerDependencies": {
     "vue-html-loader": "*",

From 557dcb8f9cac6f98c35cdf4e1f3f690d53e1842a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 23 Oct 2015 15:37:00 -0400
Subject: [PATCH 091/877] es2015 by default

---
 README.md     | 94 +++++++++++++++++++++++++++++++++++----------------
 lib/loader.js | 12 +++++--
 package.json  |  8 +++--
 3 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index cdddcb7cf..7bf8f6c07 100644
--- a/README.md
+++ b/README.md
@@ -6,40 +6,39 @@ It allows you to write your components in this format:
 
 ``` html
 // app.vue
-<style>
-  .red {
-    color: #f00;
-  }
-</style>
-
 <template>
   <h1 class="red">{{msg}}</h1>
 </template>
 
 <script>
-  module.exports = {
-    data: function () {
-      return {
-        msg: 'Hello world!'
-      }
+export default {
+  data () {
+    return {
+      msg: 'Hello world!'
     }
   }
+}
 </script>
+
+<style>
+.red {
+  color: #f00;
+}
+</style>
 ```
 
 ## Table of Contents
 
 
 - [Basic Usage](#basic-usage)
-- [Pre-Processors](#pre-processors)
+- [ES2015 by Default](#es2015-by-default)
+- [CSS Pre-Processors](#css-pre-processors)
 - [Template Pre-Processors](#template-pre-processors)
 - [Style Imports](#style-imports)
 - [Asset URL Handling](#asset-url-handling)
 - [Scoped CSS](#scoped-css)
 - [Hot Reload](#hot-reload)
 - [Advanced Loader Configuration](#advanced-loader-configuration)
-  - [ES6 with Babel Example](#example-using-es6-with-babel)
-  - [Extract CSS Example](#example-extracting-css-into-a-single-file)
 - [Example Project](https://github.com/vuejs/vue-loader-example)
 
 ## Basic Usage
@@ -66,11 +65,56 @@ And this is all you need to do in your main entry file:
 ``` js
 // main.js
 var Vue = require('vue')
-var appOptions = require('./app.vue')
-var app = new Vue(appOptions).$mount('#app')
+var App = require('./app.vue')
+
+new Vue({
+  el: 'body',
+  components: {
+    app: App
+  }
+})
+```
+
+In your HTML:
+
+``` html
+<body>
+  <app></app>
+  <script src="build.js"></script>
+</body>
+```
+
+## ES2015 by Default
+
+`vue-loader` automatically applies Babel transforms to the JavaScript inside `*.vue` components. Write ES2015 today!
+
+The default Babel options used for Vue.js components are:
+
+``` js
+{
+  // use babel-runtime library for common helpers
+  optional: ['runtime'],
+  // use loose mode for faster builds
+  loose: 'all',
+  // disable non-standard stuff (e.g. JSX)
+  nonStandard: false
+}
+```
+
+If you wish to mofidy this, you can add a `babel` field in your webpack config, which will be merged with the default options. For example:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  babel: {
+    // enable stage 0 transforms
+    stage: 0
+  }
+}
 ```
 
-## Pre-Processors
+## CSS Pre-Processors
 
 `vue-loader` allows you to use other Webpack loaders to pre-process the different parts inside your `*.vue` components. Just specify the loader to use with the `lang` attribute (you also need to install the loader, obviously):
 
@@ -204,9 +248,7 @@ For a complete example with hot reloading in action, see [vue-hackernews](https:
 By default, `vue-loader` will try to use the loader with the same name as
 the `lang` attribute, but you can configure which loader should be used.
 
-#### Example: Using ES6 with Babel
-
-To apply Babel transforms to all your JavaScript, use this Webpack config:
+#### Example: Use CoffeeScript for all `<script>` tags
 
 ``` js
 var vue = require('vue-loader')
@@ -218,23 +260,15 @@ module.exports = {
       {
         test: /\.vue$/,
         loader: vue.withLoaders({
-          // apply babel transform to all javascript
-          // inside *.vue files.
-          js: 'babel?optional[]=runtime'
+          js: 'coffee'
         })
       }
     ]
   },
-  devtool: 'source-map'
+  devtool: '#source-map'
 }
 ```
 
-Some explanantions: 
-
-1. Here `js` is the default language for `<script>` blocks.
-
-2. The `?optional[]=runtime` query string passed to the loader. This instructs Babel to use helper functions from the `babel-runtime` NPM package instead of injecting the helpers into every single file. You'll want this most of the time.
-
 #### Example: Extracting CSS into a Single File
 
 To extract out the generated css into a separate file,
diff --git a/lib/loader.js b/lib/loader.js
index 2a09e0098..8fb82aef6 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -8,6 +8,12 @@ var defaultLang = {
   script: 'js'
 }
 
+var defaultLoaders = {
+  html: 'vue-html',
+  css: 'style!css',
+  js: 'babel?optional[]=runtime&loose=all&nonStandard=false'
+}
+
 var rewriters = {
   template: require.resolve('./template-rewriter') + '!',
   style: require.resolve('./style-rewriter') + '!'
@@ -23,9 +29,9 @@ module.exports = function (content) {
   // check if there are custom loaders specified with
   // vueLoader.withLoaders(), otherwise use defaults
   var loaders = loaderUtils.parseQuery(this.query)
-  loaders.html = loaders.html || 'vue-html'
-  loaders.css = loaders.css || 'style!css'
-  loaders.js = loaders.js || ''
+  loaders.html = loaders.html || defaultLoaders.html
+  loaders.css = loaders.css || defaultLoaders.css
+  loaders.js = loaders.js || defaultLoaders.js
 
   function getRequire (type, part, index, scoped) {
     return 'require(' +
diff --git a/package.json b/package.json
index 6f65e16fd..a7c415333 100644
--- a/package.json
+++ b/package.json
@@ -31,9 +31,11 @@
     "vue-hot-reload-api": "^1.2.0"
   },
   "peerDependencies": {
-    "vue-html-loader": "*",
-    "css-loader": "*",
-    "style-loader": "*"
+    "vue-html-loader": "^1.0.0",
+    "css-loader": "^0.21.0",
+    "style-loader": "^0.13.0",
+    "babel-loader": "^5.3.2",
+    "babel-runtime": "^5.8.25"
   },
   "devDependencies": {
     "babel-core": "^5.8.25",

From a44abfa5b18ccee73d735517cafa7a30236ce047 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 23 Oct 2015 15:58:56 -0400
Subject: [PATCH 092/877] make vue-hot-reload-api a peer dep

---
 lib/loader.js |  3 +--
 package.json  | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 8fb82aef6..a3b1ae091 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -130,7 +130,6 @@ module.exports = function (content) {
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {
-      var hotReloadAPIPath = JSON.stringify(require.resolve('vue-hot-reload-api'))
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
       var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
       var accepted = []
@@ -145,7 +144,7 @@ module.exports = function (content) {
           '(function () {\n' +
             // shim the component directive so that it
             // registers the instances
-            'var hotAPI = require(' + hotReloadAPIPath + ')\n' +
+            'var hotAPI = require("vue-hot-reload-api")\n' +
             'hotAPI.install(require("vue"))\n' +
             'if (!hotAPI.compatible) return\n' +
             'var id = ' + (scriptString || templateString) + '\n' +
diff --git a/package.json b/package.json
index a7c415333..99273d597 100644
--- a/package.json
+++ b/package.json
@@ -27,21 +27,21 @@
     "loader-utils": "^0.2.10",
     "parse5": "^1.5.0",
     "postcss": "^4.1.16",
-    "postcss-selector-parser": "^1.1.2",
-    "vue-hot-reload-api": "^1.2.0"
+    "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
     "vue-html-loader": "^1.0.0",
     "css-loader": "^0.21.0",
     "style-loader": "^0.13.0",
     "babel-loader": "^5.3.2",
-    "babel-runtime": "^5.8.25"
+    "babel-runtime": "^5.8.25",
+    "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
     "babel-core": "^5.8.25",
     "babel-loader": "^5.3.2",
     "chai": "^3.0.0",
-    "css-loader": "^0.19.0",
+    "css-loader": "^0.21.0",
     "eslint": "^1.6.0",
     "vue-html-loader": "^1.0.0",
     "jade": "^1.11.0",
@@ -52,7 +52,7 @@
     "object-assign": "^3.0.0",
     "rimraf": "^2.4.0",
     "source-map": "^0.5.1",
-    "style-loader": "^0.12.4",
+    "style-loader": "^0.13.0",
     "stylus-loader": "^1.4.0",
     "template-html-loader": "^0.0.3",
     "webpack": "^1.12.2"

From 9bc4901be5b6d9ebb674e5cbca71e20c8481c3fd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 23 Oct 2015 15:59:24 -0400
Subject: [PATCH 093/877] bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 99273d597..322a8aaa1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "4.0.10",
+  "version": "5.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9985f1ff70f612a057cde65bafbde6b8e7c84920 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Oct 2015 12:18:59 -0400
Subject: [PATCH 094/877] autoprefixer + new configuration API

---
 lib/loader.js                | 35 ++++++++++++++++++++++-------------
 lib/style-rewriter.js        | 18 +++++++++++++++++-
 package.json                 |  5 +++--
 test/fixtures/autoprefix.js  |  1 +
 test/fixtures/autoprefix.vue |  5 +++++
 test/test.js                 | 10 ++++++++++
 6 files changed, 58 insertions(+), 16 deletions(-)
 create mode 100644 test/fixtures/autoprefix.js
 create mode 100644 test/fixtures/autoprefix.vue

diff --git a/lib/loader.js b/lib/loader.js
index a3b1ae091..315a4689d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,4 +1,5 @@
 var loaderUtils = require('loader-utils')
+var assign = require('object-assign')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
 
@@ -15,8 +16,8 @@ var defaultLoaders = {
 }
 
 var rewriters = {
-  template: require.resolve('./template-rewriter') + '!',
-  style: require.resolve('./style-rewriter') + '!'
+  template: require.resolve('./template-rewriter'),
+  style: require.resolve('./style-rewriter')
 }
 
 module.exports = function (content) {
@@ -24,14 +25,12 @@ module.exports = function (content) {
   this.cacheable()
   var cb = this.async()
   var output = ''
+  var options = this.options.vue || {}
   var vueUrl = loaderUtils.getRemainingRequest(this)
 
   // check if there are custom loaders specified with
   // vueLoader.withLoaders(), otherwise use defaults
-  var loaders = loaderUtils.parseQuery(this.query)
-  loaders.html = loaders.html || defaultLoaders.html
-  loaders.css = loaders.css || defaultLoaders.css
-  loaders.js = loaders.js || defaultLoaders.js
+  var loaders = assign({}, defaultLoaders, options.loaders)
 
   function getRequire (type, part, index, scoped) {
     return 'require(' +
@@ -64,8 +63,8 @@ module.exports = function (content) {
 
   function getLoaderString (type, part, scoped) {
     var lang = part.lang || defaultLang[type]
-    var rewriter = scoped ? rewriters[type] || '' : ''
     var loader = loaders[lang]
+    var rewriter = getRewriter(type, scoped)
     if (loader !== undefined) {
       // lang with default or pre-configured loader
       if (loader) loader += '!'
@@ -83,6 +82,17 @@ module.exports = function (content) {
     }
   }
 
+  function getRewriter (type, scoped) {
+    switch (type) {
+    case 'template':
+      return scoped ? (rewriters.template + '!') : ''
+    case 'style':
+      return rewriters.style + (scoped ? '?scoped=true!' : '!')
+    default:
+      return ''
+    }
+  }
+
   function getSelectorString (type, index) {
     return selectorPath +
       '?type=' + type +
@@ -164,10 +174,9 @@ module.exports = function (content) {
   })
 }
 
-/**
- * Expose a way to specify custom loaders to be used at the
- * end for the extracted parts of a component.
- */
-module.exports.withLoaders = function (opts) {
-  return 'vue?' + JSON.stringify(opts).replace(/!/g, '\\u0021')
+module.exports.withLoaders = function () {
+  throw new Error(
+    'vue.withLoaders has been deprecated in vue-loader 6.0. ' +
+    'Add a "vue" section to the webpack config instead.'
+  )
 }
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 5ca48ecbb..dabbeee21 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,6 +1,7 @@
 var postcss = require('postcss')
 var selectorParser = require('postcss-selector-parser')
 var hash = require('hash-sum')
+var loaderUtils = require('loader-utils')
 
 var currentId
 var addId = postcss.plugin('add-id', function () {
@@ -20,8 +21,23 @@ var addId = postcss.plugin('add-id', function () {
 module.exports = function (css) {
   this.cacheable()
   var cb = this.async()
+
+  var query = loaderUtils.parseQuery(this.query)
+  var options = this.options.vue || {}
+  var autoprefixOptions = options.autoprefix
+
+  var processors = []
+  if (query.scoped) {
+    processors.push(addId)
+  }
+  if (autoprefixOptions !== false) {
+    autoprefixOptions = autoprefixOptions || { remove: false }
+    var autoprefixer = require('autoprefixer')(autoprefixOptions)
+    processors.push(autoprefixer)
+  }
+
   currentId = '_v-' + hash(this.resourcePath)
-  postcss([addId])
+  postcss(processors)
     .process(css)
     .then(function (result) {
       cb(null, result)
diff --git a/package.json b/package.json
index 322a8aaa1..5801e5a65 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,12 @@
     "test": "eslint lib && mocha test/test.js --slow 5000"
   },
   "dependencies": {
+    "autoprefixer": "^6.0.3",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
+    "object-assign": "^3.0.0",
     "parse5": "^1.5.0",
-    "postcss": "^4.1.16",
+    "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2"
   },
   "peerDependencies": {
@@ -49,7 +51,6 @@
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.3",
-    "object-assign": "^3.0.0",
     "rimraf": "^2.4.0",
     "source-map": "^0.5.1",
     "style-loader": "^0.13.0",
diff --git a/test/fixtures/autoprefix.js b/test/fixtures/autoprefix.js
new file mode 100644
index 000000000..a5e9680a8
--- /dev/null
+++ b/test/fixtures/autoprefix.js
@@ -0,0 +1 @@
+window.testModule = require('./autoprefix.vue')
diff --git a/test/fixtures/autoprefix.vue b/test/fixtures/autoprefix.vue
new file mode 100644
index 000000000..a5308b2e0
--- /dev/null
+++ b/test/fixtures/autoprefix.vue
@@ -0,0 +1,5 @@
+<style>
+body {
+  transform: scale(1);
+}
+</style>
diff --git a/test/test.js b/test/test.js
index 934c729a3..9bda3b9ad 100644
--- a/test/test.js
+++ b/test/test.js
@@ -148,4 +148,14 @@ describe('vue-loader', function () {
     })
   })
 
+  it('autoprefix', function (done) {
+    test({
+      entry: './test/fixtures/autoprefix.js'
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('body {\n  -webkit-transform: scale(1);\n      -ms-transform: scale(1);\n          transform: scale(1);\n}')
+      done()
+    })
+  })
+
 })

From 3558dbbaf43ec56dd4958e14f67a4d8948ef1a14 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Oct 2015 12:25:54 -0400
Subject: [PATCH 095/877] update readme

---
 README.md             | 48 +++++++++++++++++++++++++++++--------------
 lib/style-rewriter.js |  2 +-
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 7bf8f6c07..6a115e98f 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ export default {
 - [Basic Usage](#basic-usage)
 - [ES2015 by Default](#es2015-by-default)
 - [CSS Pre-Processors](#css-pre-processors)
+- [Autoprefixing](#autoprefixing)
 - [Template Pre-Processors](#template-pre-processors)
 - [Style Imports](#style-imports)
 - [Asset URL Handling](#asset-url-handling)
@@ -132,6 +133,23 @@ You can also include Webpack loader queries in the `lang` attribute:
 </style>
 ```
 
+## Autoprefixing
+
+Starting in 6.0.0, Any CSS output via `vue-loader` is piped through [autoprefixer](https://github.com/postcss/autoprefixer) by default. You can customize this behavior in the `vue` section of your webpack config:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  vue: {
+    // disable autoprefixing
+    autoprefixer: false,
+    // OR: custom options
+    autoprefixer: { browsers: ['last 2 versions'] }
+  }
+}
+```
+
 ## Template Pre-Processors
 
 For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
@@ -251,19 +269,17 @@ the `lang` attribute, but you can configure which loader should be used.
 #### Example: Use CoffeeScript for all `<script>` tags
 
 ``` js
-var vue = require('vue-loader')
-
 module.exports = {
   // entry, output...
   module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: vue.withLoaders({
-          js: 'coffee'
-        })
-      }
-    ]
+    loaders: [{
+      test: /\.vue$/, loader: 'vue'
+    }]
+  },
+  vue: {
+    loaders: {
+      js: 'coffee'
+    }
   },
   devtool: '#source-map'
 }
@@ -276,20 +292,22 @@ use this Webpack config:
 
 ``` js
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var vue = require("vue-loader");
 
 module.exports = {
   // entry, output...
   module: {
     loaders: [
       {
-        test: /\.vue$/, loader: vue.withLoaders({
-          css: ExtractTextPlugin.extract("css"),
-          stylus: ExtractTextPlugin.extract("css!stylus")
-        })
+        test: /\.vue$/, loader: 'vue'
       },
     ]
   },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      stylus: ExtractTextPlugin.extract("css!stylus")
+    }
+  },
   plugins: [
     new ExtractTextPlugin("[name].css")
   ]
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index dabbeee21..094c84b2d 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -24,7 +24,7 @@ module.exports = function (css) {
 
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
-  var autoprefixOptions = options.autoprefix
+  var autoprefixOptions = options.autoprefixer
 
   var processors = []
   if (query.scoped) {

From a8dd195e99bea9b0c1335dd67baf4dab8931a38b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Oct 2015 12:26:06 -0400
Subject: [PATCH 096/877] bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5801e5a65..c59bcb11a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 863a163e6eaa98033a6bed0f80e7aa7e8e0c4f7f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Oct 2015 17:11:46 -0400
Subject: [PATCH 097/877] simplify hot reloading example

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6a115e98f..fb6dfac68 100644
--- a/README.md
+++ b/README.md
@@ -221,7 +221,7 @@ Into the following:
 When using `webpack-dev-server` in hot mode, `vue-loader` enables hot component reloading for Vue.js 1.0.0+. An example config:
 
 ``` js
-// webpack.example.config.js
+// webpack.config.js
 module.exports = {
   entry: './src/main.js',
   output: {
@@ -240,16 +240,16 @@ module.exports = {
 In `index.html`, include the bundle:
 
 ``` html
-<script src="/https/gitblind.noratr.app/static/build.js"></script>
+<script src="static/build.js"></script>
 ```
 
 Then, run the dev server with:
 
 ``` bash
-webpack-dev-server --inline --hot --config webpack.example.config.js
+webpack-dev-server --inline --hot
 ```
 
-Finally, visit `http://localhost:8080/webpack-dev-server/` to see the app with hot reloading.
+Finally, visit `http://localhost:8080/` to see the app with hot reloading.
 
 For a complete example with hot reloading in action, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).
 

From 24e42a018ef0d1f2f99a464813e8fedc0cf426e4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 30 Oct 2015 10:39:29 -0400
Subject: [PATCH 098/877] show badge for master status

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb6dfac68..7c9a2507c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader [![Build Status](https://img.shields.io/circleci/project/vuejs/vue-loader.svg)](https://circleci.com/gh/vuejs/vue-loader) [![npm package](https://img.shields.io/npm/v/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
+# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
 
 > Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
 

From e8611e5f5f034b2b83290fd4f736317d5672b8c6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 30 Oct 2015 10:40:58 -0400
Subject: [PATCH 099/877] use fury.io badge [ci skip]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c9a2507c..61e3561bd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
+# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://badge.fury.io/js/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
 
 > Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
 

From b14b1e7c8cb3bb77ded7a544d913d8f8d4cde176 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 30 Oct 2015 11:36:57 -0400
Subject: [PATCH 100/877] fix scoped css for rules with pseudo classes

---
 lib/style-rewriter.js        | 6 +++++-
 test/fixtures/scoped-css.vue | 3 +++
 test/test.js                 | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 094c84b2d..b20e5d828 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -9,7 +9,11 @@ var addId = postcss.plugin('add-id', function () {
     root.each(function (node) {
       node.selector = selectorParser(function (selectors) {
         selectors.each(function (selector) {
-          selector.append(selectorParser.attribute({
+          var node = null
+          selector.each(function (n) {
+            if (n.type !== 'pseudo') node = n
+          })
+          selector.insertAfter(node, selectorParser.attribute({
             attribute: currentId
           }))
         })
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 515ee88f1..580745de0 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -2,6 +2,9 @@
 .test {
   color: yellow;
 }
+.test:after {
+  content: 'bye!';
+}
 h1 {
   color: green;
 }
diff --git a/test/test.js b/test/test.js
index 9bda3b9ad..3eeddfa93 100644
--- a/test/test.js
+++ b/test/test.js
@@ -101,6 +101,7 @@ describe('vue-loader', function () {
       )
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
+      expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
       expect(style).to.contain('h1[' + id + '] {\n  color: green;\n}')
       done()
     })

From 4d4aa1812f6f7407b1a4049812abaad6dc0fe938 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 30 Oct 2015 11:37:06 -0400
Subject: [PATCH 101/877] bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c59bcb11a..c9a4707f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From a8e29755e7906b67bb31972f0b331b03c035212e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 00:24:00 -0400
Subject: [PATCH 102/877] fix media query with scoped styles

---
 lib/style-rewriter.js         | 14 ++++++++++++--
 test/fixtures/media-query.js  |  1 +
 test/fixtures/media-query.vue |  7 +++++++
 test/test.js                  | 11 +++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/media-query.js
 create mode 100644 test/fixtures/media-query.vue

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index b20e5d828..fe1a01c10 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -6,7 +6,14 @@ var loaderUtils = require('loader-utils')
 var currentId
 var addId = postcss.plugin('add-id', function () {
   return function (root) {
-    root.each(function (node) {
+    root.each(function rewriteSelector (node) {
+      if (!node.selector) {
+        // handle media queries
+        if (node.type === 'atrule' && node.name === 'media') {
+          node.each(rewriteSelector)
+        }
+        return
+      }
       node.selector = selectorParser(function (selectors) {
         selectors.each(function (selector) {
           var node = null
@@ -46,5 +53,8 @@ module.exports = function (css) {
     .then(function (result) {
       cb(null, result)
     })
-    .catch(cb)
+    .catch(function (e) {
+      console.log(e)
+      cb(e)
+    })
 }
diff --git a/test/fixtures/media-query.js b/test/fixtures/media-query.js
new file mode 100644
index 000000000..1a292f332
--- /dev/null
+++ b/test/fixtures/media-query.js
@@ -0,0 +1 @@
+window.testModule = require('./media-query.vue')
diff --git a/test/fixtures/media-query.vue b/test/fixtures/media-query.vue
new file mode 100644
index 000000000..9dbe0ee21
--- /dev/null
+++ b/test/fixtures/media-query.vue
@@ -0,0 +1,7 @@
+<style scoped>
+@media print {
+  .foo {
+    color: #000;
+  }
+}
+</style>
diff --git a/test/test.js b/test/test.js
index 3eeddfa93..9408613f9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -159,4 +159,15 @@ describe('vue-loader', function () {
     })
   })
 
+  it('media-query', function (done) {
+    test({
+      entry: './test/fixtures/media-query.js'
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      var id = '_v-' + hash(require.resolve('./fixtures/media-query.vue'))
+      expect(style).to.contain('@media print {\n  .foo[' + id + '] {\n    color: #000;\n  }\n}')
+      done()
+    })
+  })
+
 })

From 812f24ddf3353202af4fdae5a6a8942980c45b62 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 11:17:19 -0500
Subject: [PATCH 103/877] fix compat with extract css plugin (close #51)

---
 lib/loader.js                 | 27 ++++++++++++++++++++++++---
 package.json                  |  3 ++-
 test/fixtures/extract-css.js  |  1 +
 test/fixtures/extract-css.vue | 10 ++++++++++
 test/test.js                  | 22 ++++++++++++++++++++++
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/extract-css.js
 create mode 100644 test/fixtures/extract-css.vue

diff --git a/lib/loader.js b/lib/loader.js
index 315a4689d..c18a6d137 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -65,10 +65,23 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = getRewriter(type, scoped)
+    var cssRE = /\b(css!?)\b/
+    var htmlRE = /\b((vue-)?html!?)\b/
     if (loader !== undefined) {
-      // lang with default or pre-configured loader
-      if (loader) loader += '!'
-      return loader + rewriter
+      // inject rewriter before css/html loader for
+      // extractTextPlugin use cases
+      if (cssRE.test(loader)) {
+        loader = loader.replace(cssRE, function (m, $1) {
+          return ensureBang($1) + rewriter
+        })
+      } else if (htmlRE.test(loader)) {
+        loader = loader.replace(htmlRE, function (m, $1) {
+          return ensureBang($1) + rewriter
+        })
+      } else {
+        loader = ensureBang(loader) + rewriter
+      }
+      return ensureBang(loader)
     } else {
       // unknown lang, assume a loader for it is used
       switch (type) {
@@ -99,6 +112,14 @@ module.exports = function (content) {
       '&index=' + index + '!'
   }
 
+  function ensureBang (loader) {
+    if (loader.charAt(loader.length - 1) !== '!') {
+      return loader + '!'
+    } else {
+      return loader
+    }
+  }
+
   var url = '!!' + parserPath + '!' + vueUrl
   this.loadModule(url, function (err, source) {
     if (err) return cb(err)
diff --git a/package.json b/package.json
index c9a4707f1..c0e2d1481 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "chai": "^3.0.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",
-    "vue-html-loader": "^1.0.0",
+    "extract-text-webpack-plugin": "^0.8.2",
     "jade": "^1.11.0",
     "jsdom": "^6.5.1",
     "mkdirp": "^0.5.1",
@@ -56,6 +56,7 @@
     "style-loader": "^0.13.0",
     "stylus-loader": "^1.4.0",
     "template-html-loader": "^0.0.3",
+    "vue-html-loader": "^1.0.0",
     "webpack": "^1.12.2"
   }
 }
diff --git a/test/fixtures/extract-css.js b/test/fixtures/extract-css.js
new file mode 100644
index 000000000..ce602cf28
--- /dev/null
+++ b/test/fixtures/extract-css.js
@@ -0,0 +1 @@
+require('./extract-css.vue')
diff --git a/test/fixtures/extract-css.vue b/test/fixtures/extract-css.vue
new file mode 100644
index 000000000..75034b07c
--- /dev/null
+++ b/test/fixtures/extract-css.vue
@@ -0,0 +1,10 @@
+<style lang="stylus">
+h1
+  color red
+</style>
+
+<style>
+h2 {
+  color: green;
+}
+</style>
diff --git a/test/test.js b/test/test.js
index 9408613f9..7de307a1b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -7,6 +7,7 @@ var assign = require('object-assign')
 var rimraf = require('rimraf')
 var hash = require('hash-sum')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 describe('vue-loader', function () {
 
@@ -170,4 +171,25 @@ describe('vue-loader', function () {
     })
   })
 
+  it('extract CSS', function (done) {
+    webpack(Object.assign({}, globalConfig, {
+      entry: './test/fixtures/extract-css.js',
+      vue: {
+        loaders: {
+          css: ExtractTextPlugin.extract('css'),
+          stylus: ExtractTextPlugin.extract('css!stylus')
+        }
+      },
+      plugins: [
+        new ExtractTextPlugin('test.output.css')
+      ]
+    }), function (err) {
+      expect(err).to.be.null
+      getFile('test.output.css', function (data) {
+        expect(data).to.contain('h1 {\n  color: #f00;\n}\nh2 {\n  color: green;\n}')
+        done()
+      })
+    })
+  })
+
 })

From 4d45aedbe214e90384d9c7feb731bb15d8edf634 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 11:28:45 -0500
Subject: [PATCH 104/877] bump 6.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c0e2d1481..59ea2487a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 1e7dd932edbf562c316875b11499ccd4ca4b6437 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 11:44:26 -0500
Subject: [PATCH 105/877] also repsect external autoprefixer options

---
 lib/style-rewriter.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index fe1a01c10..aa9b55413 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -2,6 +2,7 @@ var postcss = require('postcss')
 var selectorParser = require('postcss-selector-parser')
 var hash = require('hash-sum')
 var loaderUtils = require('loader-utils')
+var assign = require('object-assign')
 
 var currentId
 var addId = postcss.plugin('add-id', function () {
@@ -42,7 +43,12 @@ module.exports = function (css) {
     processors.push(addId)
   }
   if (autoprefixOptions !== false) {
-    autoprefixOptions = autoprefixOptions || { remove: false }
+    autoprefixOptions = assign(
+      {},
+      // also respect autoprefixer-loader options
+      this.options.autoprefixer,
+      autoprefixOptions
+    )
     var autoprefixer = require('autoprefixer')(autoprefixOptions)
     processors.push(autoprefixer)
   }

From 9375f5cfefe532d420baca92e9448904d4249cc8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 15:15:30 -0500
Subject: [PATCH 106/877] fix custom loaders with queries

---
 lib/loader.js | 11 +++--------
 test/test.js  |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index c18a6d137..78bd57456 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -15,6 +15,7 @@ var defaultLoaders = {
   js: 'babel?optional[]=runtime&loose=all&nonStandard=false'
 }
 
+var rewriterInjectRE = /\b((css|(vue-)?html)(\?[^!]+)?!?)\b/
 var rewriters = {
   template: require.resolve('./template-rewriter'),
   style: require.resolve('./style-rewriter')
@@ -65,17 +66,11 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = getRewriter(type, scoped)
-    var cssRE = /\b(css!?)\b/
-    var htmlRE = /\b((vue-)?html!?)\b/
     if (loader !== undefined) {
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
-      if (cssRE.test(loader)) {
-        loader = loader.replace(cssRE, function (m, $1) {
-          return ensureBang($1) + rewriter
-        })
-      } else if (htmlRE.test(loader)) {
-        loader = loader.replace(htmlRE, function (m, $1) {
+      if (rewriterInjectRE.test(loader)) {
+        loader = loader.replace(rewriterInjectRE, function (m, $1) {
           return ensureBang($1) + rewriter
         })
       } else {
diff --git a/test/test.js b/test/test.js
index 7de307a1b..058d8be4b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -177,7 +177,7 @@ describe('vue-loader', function () {
       vue: {
         loaders: {
           css: ExtractTextPlugin.extract('css'),
-          stylus: ExtractTextPlugin.extract('css!stylus')
+          stylus: ExtractTextPlugin.extract('css?sourceMap!stylus')
         }
       },
       plugins: [

From 12628f61d776b4bf737538f5dfa6911adeea2a3c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 15:15:55 -0500
Subject: [PATCH 107/877] bump 6.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 59ea2487a..58c0f0b67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 788223473941b17b94fa0c07c7677f67ec2af746 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 22:28:12 -0500
Subject: [PATCH 108/877] properly support sourcemaps in style-rewriter

---
 lib/style-rewriter.js | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index aa9b55413..74975ffef 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -30,18 +30,21 @@ var addId = postcss.plugin('add-id', function () {
   }
 })
 
-module.exports = function (css) {
+module.exports = function (css, map) {
   this.cacheable()
   var cb = this.async()
 
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
+  var plugins = []
 
-  var processors = []
+  // scoped css
   if (query.scoped) {
-    processors.push(addId)
+    plugins.push(addId)
   }
+
+  // autoprefixer
   if (autoprefixOptions !== false) {
     autoprefixOptions = assign(
       {},
@@ -50,14 +53,29 @@ module.exports = function (css) {
       autoprefixOptions
     )
     var autoprefixer = require('autoprefixer')(autoprefixOptions)
-    processors.push(autoprefixer)
+    plugins.push(autoprefixer)
+  }
+
+  // postcss options, for source maps
+  var file = loaderUtils.getRemainingRequest(this)
+  var opts
+  opts = {
+    from: file,
+    to: file,
+    map: {
+      inline: false,
+      annotation: false
+    }
+  }
+  if (map) {
+    opts.map.prev = map
   }
 
   currentId = '_v-' + hash(this.resourcePath)
-  postcss(processors)
-    .process(css)
+  postcss(plugins)
+    .process(css, opts)
     .then(function (result) {
-      cb(null, result)
+      cb(null, result.css, result.map)
     })
     .catch(function (e) {
       console.log(e)

From 73def6f7b0bd498f132f3182d966182596e81a27 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 1 Nov 2015 22:28:36 -0500
Subject: [PATCH 109/877] bump 6.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58c0f0b67..44860ce87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 6af8b3b55190a8df7cbf5536f5bf278266541ac2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 6 Nov 2015 17:10:51 -0500
Subject: [PATCH 110/877] support user-provided postcss plugins

---
 README.md             | 40 +++++++++++++++++++++++++++++-----------
 lib/style-rewriter.js |  2 +-
 package.json          |  2 +-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 61e3561bd..e8172fc6c 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ export default {
 - [Basic Usage](#basic-usage)
 - [ES2015 by Default](#es2015-by-default)
 - [CSS Pre-Processors](#css-pre-processors)
-- [Autoprefixing](#autoprefixing)
+- [PostCSS](#postcss)
 - [Template Pre-Processors](#template-pre-processors)
 - [Style Imports](#style-imports)
 - [Asset URL Handling](#asset-url-handling)
@@ -133,19 +133,35 @@ You can also include Webpack loader queries in the `lang` attribute:
 </style>
 ```
 
-## Autoprefixing
+## PostCSS
 
-Starting in 6.0.0, Any CSS output via `vue-loader` is piped through [autoprefixer](https://github.com/postcss/autoprefixer) by default. You can customize this behavior in the `vue` section of your webpack config:
+Any CSS output via `vue-loader` 6.0+ is piped through [PostCSS](https://github.com/postcss/postcss) for [scoped CSS](#scoped-css) rewriting and aut-prefixed by default using [autoprefixer](https://github.com/postcss/autoprefixer). You can configure autoprefixer or provide your own PostCSS plugins in the `vue` section of your webpack config:
 
 ``` js
 // webpack.config.js
 module.exports = {
   // other configs...
   vue: {
-    // disable autoprefixing
-    autoprefixer: false,
-    // OR: custom options
-    autoprefixer: { browsers: ['last 2 versions'] }
+    // configure autoprefixer
+    autoprefixer: {
+      browsers: ['last 2 versions']
+    }
+  }
+}
+```
+
+Using other PostCSS plugins:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  vue: {
+    // use custom postcss plugins
+    postcss: [require('cssnext')()],
+    // disable vue-loader autoprefixing.
+    // this is a good idea since cssnext comes with it too.
+    autoprefixer: false
   }
 }
 ```
@@ -180,7 +196,7 @@ For more details, see the respective documentations for [vue-html-loader](https:
 
 > Experimental
 
-When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM, but doesn't require any polyfills. It is achieved by transforming the following:
+When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM, but doesn't require any polyfills. It is achieved by using PostCSS to transform the following:
 
 ``` html
 <style scoped>
@@ -197,12 +213,12 @@ Into the following:
 
 ``` html
 <style>
-.example[_v-1] {
+.example[_v-f3f3eg9] {
   color: red;
 }
 </style>
 <template>
-  <div class="example" _v-1>hi</div>
+  <div class="example" _v-f3f3eg9>hi</div>
 </template>
 ```
 
@@ -212,7 +228,9 @@ Into the following:
 
 2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
 
-3. Partials are not affected by scoped styles.
+3. If you are nesting a component inside itself, the styles may still leak down since they are considered the same component.
+
+4. Partials are not affected by scoped styles.
 
 ## Hot Reload
 
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 74975ffef..d8edb3e1f 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -37,7 +37,7 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
-  var plugins = []
+  var plugins = options.postcss || []
 
   // scoped css
   if (query.scoped) {
diff --git a/package.json b/package.json
index 44860ce87..ec3bd6b63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From f2b2d558a35b38596486483aafd8e48c52154050 Mon Sep 17 00:00:00 2001
From: Daiwei <daiweilu123@gmail.com>
Date: Sun, 8 Nov 2015 20:41:38 -0500
Subject: [PATCH 111/877] Upgrade to Babel 6

---
 lib/loader.js |  2 +-
 package.json  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 78bd57456..e3b1d2e3d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -12,7 +12,7 @@ var defaultLang = {
 var defaultLoaders = {
   html: 'vue-html',
   css: 'style!css',
-  js: 'babel?optional[]=runtime&loose=all&nonStandard=false'
+  js: 'babel?presets[]=es2015&plugins[]=transform-runtime'
 }
 
 var rewriterInjectRE = /\b((css|(vue-)?html)(\?[^!]+)?!?)\b/
diff --git a/package.json b/package.json
index ec3bd6b63..8566da610 100644
--- a/package.json
+++ b/package.json
@@ -35,13 +35,17 @@
     "vue-html-loader": "^1.0.0",
     "css-loader": "^0.21.0",
     "style-loader": "^0.13.0",
-    "babel-loader": "^5.3.2",
-    "babel-runtime": "^5.8.25",
+    "babel-loader": "^6.0.1",
+    "babel-plugin-transform-runtime": "^6.1.2",
+    "babel-preset-es2015": "^6.1.2",
+    "babel-runtime": "^6.0.14",
     "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.1.2",
+    "babel-loader": "^6.0.1",
+    "babel-plugin-transform-runtime": "^6.1.2",
+    "babel-preset-es2015": "^6.1.2",
     "chai": "^3.0.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",

From e1f1430c2bb84399c687fa55b2c8034f02b8d96c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 13:07:17 -0500
Subject: [PATCH 112/877] fix test issues for babel 6

---
 lib/loader.js           | 11 +++++++++--
 package.json            |  7 ++++---
 test/fixtures/basic.vue |  4 ++--
 test/fixtures/pre.vue   |  2 +-
 test/test.js            |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index e3b1d2e3d..d59a272b0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -29,6 +29,11 @@ module.exports = function (content) {
   var options = this.options.vue || {}
   var vueUrl = loaderUtils.getRemainingRequest(this)
 
+  // respect user babel options
+  if (this.options.babel) {
+    defaultLoaders.js = 'babel'
+  }
+
   // check if there are custom loaders specified with
   // vueLoader.withLoaders(), otherwise use defaults
   var loaders = assign({}, defaultLoaders, options.loaders)
@@ -139,8 +144,9 @@ module.exports = function (content) {
 
     // add require for script
     if (parts.script.length) {
-      output += 'module.exports = ' +
-        getRequire('script', parts.script[0], 0)
+      output +=
+        'module.exports = ' + getRequire('script', parts.script[0], 0) + '\n' +
+        'if (module.exports.__esModule) module.exports = module.exports.default\n'
     }
 
     // add require for template
@@ -178,6 +184,7 @@ module.exports = function (content) {
             'hotAPI.createRecord(id, module.exports)\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
               'var newOptions = ' + (scriptString ? 'require(' + scriptString + ')\n' : 'null\n') +
+              'if (newOptions.__esModule) newOptions = newOptions.default\n' +
               'var newTemplate = ' + (templateString ? 'require(' + templateString + ')\n' : 'null\n') +
               'hotAPI.update(id, newOptions, newTemplate)\n' +
             '})\n' +
diff --git a/package.json b/package.json
index 8566da610..637b5ea5a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
     "lint": "eslint lib",
-    "test": "eslint lib && mocha test/test.js --slow 5000"
+    "test": "eslint lib && mocha test/test.js --slow 5000 --timeout 10000"
   },
   "dependencies": {
     "autoprefixer": "^6.0.3",
@@ -35,7 +35,7 @@
     "vue-html-loader": "^1.0.0",
     "css-loader": "^0.21.0",
     "style-loader": "^0.13.0",
-    "babel-loader": "^6.0.1",
+    "babel-loader": "^6.1.0",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
     "babel-runtime": "^6.0.14",
@@ -43,9 +43,10 @@
   },
   "devDependencies": {
     "babel-core": "^6.1.2",
-    "babel-loader": "^6.0.1",
+    "babel-loader": "^6.1.0",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
+    "babel-runtime": "^6.0.14",
     "chai": "^3.0.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",
diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
index 5cf4c68ac..47a9344d8 100644
--- a/test/fixtures/basic.vue
+++ b/test/fixtures/basic.vue
@@ -9,8 +9,8 @@ comp-a h2 {
 </template>
 
 <script>
-module.exports = {
-  data: function () {
+export default {
+  data () {
     return {
       msg: 'Hello from Component A!'
     }
diff --git a/test/fixtures/pre.vue b/test/fixtures/pre.vue
index 74685ec49..3b0d578a1 100644
--- a/test/fixtures/pre.vue
+++ b/test/fixtures/pre.vue
@@ -12,7 +12,7 @@ comp-a
 comp-b
 </template>
 
-<script lang="babel">
+<script>
 export default {
   data () {
     return {
diff --git a/test/test.js b/test/test.js
index 058d8be4b..156b1dde0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -43,7 +43,7 @@ describe('vue-loader', function () {
   function test (options, assert) {
     var config = assign({}, globalConfig, options)
     webpack(config, function (err) {
-      expect(err).to.be.null
+      if (err) throw err
       getFile('test.build.js', function (data) {
         jsdom.env({
           html: testHTML,

From 6407b5cd38de3ec3767db3f5248b1a3b6b71e354 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 13:16:20 -0500
Subject: [PATCH 113/877] add note about babel 6 in readme

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e8172fc6c..10671e0ae 100644
--- a/README.md
+++ b/README.md
@@ -89,28 +89,28 @@ In your HTML:
 
 `vue-loader` automatically applies Babel transforms to the JavaScript inside `*.vue` components. Write ES2015 today!
 
+**Compatibility Note:** vue-loader 7.0+ uses Babel 6. If you need to use Babel 5 for transpiling your code, use vue-loader 6.x.
+
 The default Babel options used for Vue.js components are:
 
 ``` js
 {
-  // use babel-runtime library for common helpers
-  optional: ['runtime'],
-  // use loose mode for faster builds
-  loose: 'all',
-  // disable non-standard stuff (e.g. JSX)
-  nonStandard: false
+  presets: ['es2015'],
+  plugins: ['transform-runtime']
 }
 ```
 
-If you wish to mofidy this, you can add a `babel` field in your webpack config, which will be merged with the default options. For example:
+If you wish to override this, you can add a `babel` field in your webpack config, which will be applied to all JavaScript processed by `babel-loader`. For example:
 
 ``` js
 // webpack.config.js
 module.exports = {
   // other configs...
   babel: {
-    // enable stage 0 transforms
-    stage: 0
+    // enable stage 0 transforms.
+    // make sure to install babel-presets-stage-0
+    presets: ['es2015', 'stage-0'],
+    plugins: ['transform-runtime']
   }
 }
 ```

From 31d41eb04e5607bdfc29fc244df22142bd08d8e7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 13:21:48 -0500
Subject: [PATCH 114/877] bump 7.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 637b5ea5a..58cfaa197 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "6.0.5",
+  "version": "7.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 65fd7e03c2055a307532cc3d69df0ecda033e6be Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 13:26:18 -0500
Subject: [PATCH 115/877] babel-core is also a peer-dep

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 58cfaa197..25c8f1f7d 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "css-loader": "^0.21.0",
     "style-loader": "^0.13.0",
     "babel-loader": "^6.1.0",
+    "babel-core": "^6.1.2",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
     "babel-runtime": "^6.0.14",

From c417f187711052c1cb90915e7f352a0cbfdf7d32 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 13:26:46 -0500
Subject: [PATCH 116/877] bump 7.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 25c8f1f7d..bf69824df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From f77b68b0ab90de1534d3cfc9d6fc791372fad01d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 18:33:29 -0500
Subject: [PATCH 117/877] fix hot reload for babel 6

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index d59a272b0..14d2c3652 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -184,7 +184,7 @@ module.exports = function (content) {
             'hotAPI.createRecord(id, module.exports)\n' +
             'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
               'var newOptions = ' + (scriptString ? 'require(' + scriptString + ')\n' : 'null\n') +
-              'if (newOptions.__esModule) newOptions = newOptions.default\n' +
+              'if (newOptions && newOptions.__esModule) newOptions = newOptions.default\n' +
               'var newTemplate = ' + (templateString ? 'require(' + templateString + ')\n' : 'null\n') +
               'hotAPI.update(id, newOptions, newTemplate)\n' +
             '})\n' +

From a758e1640d1b9d0026b0cebfd39d45b0a427154b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 9 Nov 2015 18:33:44 -0500
Subject: [PATCH 118/877] bump 7.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bf69824df..2fdf3d63c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 7039f2ecd54fda12304e5d34c9d74037fc7eb861 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Nov 2015 16:58:01 -0500
Subject: [PATCH 119/877] fix scoped css for style with src import

---
 lib/loader.js            | 6 ++++--
 lib/style-rewriter.js    | 3 +--
 lib/template-rewriter.js | 5 +++--
 test/test.js             | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 14d2c3652..177ddf0b0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -2,6 +2,7 @@ var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
+var hash = require('hash-sum')
 
 var defaultLang = {
   template: 'html',
@@ -28,6 +29,7 @@ module.exports = function (content) {
   var output = ''
   var options = this.options.vue || {}
   var vueUrl = loaderUtils.getRemainingRequest(this)
+  var moduleId = '_v-' + hash(this.resourcePath)
 
   // respect user babel options
   if (this.options.babel) {
@@ -98,9 +100,9 @@ module.exports = function (content) {
   function getRewriter (type, scoped) {
     switch (type) {
     case 'template':
-      return scoped ? (rewriters.template + '!') : ''
+      return scoped ? (rewriters.template + '?id=' + moduleId + '!') : ''
     case 'style':
-      return rewriters.style + (scoped ? '?scoped=true!' : '!')
+      return rewriters.style + '?id=' + moduleId + (scoped ? '&scoped=true!' : '!')
     default:
       return ''
     }
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index d8edb3e1f..2003ab49a 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,6 +1,5 @@
 var postcss = require('postcss')
 var selectorParser = require('postcss-selector-parser')
-var hash = require('hash-sum')
 var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
 
@@ -71,7 +70,7 @@ module.exports = function (css, map) {
     opts.map.prev = map
   }
 
-  currentId = '_v-' + hash(this.resourcePath)
+  currentId = query.id
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
index 82d9d24bc..ba7b9b6ef 100644
--- a/lib/template-rewriter.js
+++ b/lib/template-rewriter.js
@@ -1,11 +1,12 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser()
 var serializer = new parse5.Serializer()
-var hash = require('hash-sum')
+var loaderUtils = require('loader-utils')
 
 module.exports = function (html) {
   this.cacheable()
-  var id = '_v-' + hash(this.resourcePath)
+  var query = loaderUtils.parseQuery(this.query)
+  var id = query.id
   var tree = parser.parseFragment(html)
   walk(tree, function (node) {
     if (node.attrs) {
diff --git a/test/test.js b/test/test.js
index 156b1dde0..e15e1d763 100644
--- a/test/test.js
+++ b/test/test.js
@@ -115,7 +115,7 @@ describe('vue-loader', function () {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red; }')
       // import with scoped
-      var id = '_v-' + hash(require.resolve('./fixtures/import-scoped.css'))
+      var id = '_v-' + hash(require.resolve('./fixtures/import.vue'))
       expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green; }')
       done()
     })

From fc1312003a9083cfe09ff6211b5087e23f241946 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 14 Nov 2015 16:58:17 -0500
Subject: [PATCH 120/877] bump 7.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2fdf3d63c..f5b051d05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 69f087075985034be56a88ba763293859bab32ed Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 19 Nov 2015 12:29:37 -0500
Subject: [PATCH 121/877] support src import for templates

---
 lib/loader.js                                 | 33 +++++++++-----
 lib/parser.js                                 | 43 +++++++++++--------
 test/fixtures/import.vue                      |  2 -
 ...ort-scoped.css => style-import-scoped.css} |  0
 .../fixtures/{import.css => style-import.css} |  0
 test/fixtures/style-import.vue                |  2 +
 test/fixtures/template-import.jade            |  2 +
 test/fixtures/template-import.js              |  1 +
 test/fixtures/template-import.vue             |  1 +
 test/test.js                                  | 14 +++++-
 10 files changed, 67 insertions(+), 31 deletions(-)
 delete mode 100644 test/fixtures/import.vue
 rename test/fixtures/{import-scoped.css => style-import-scoped.css} (100%)
 rename test/fixtures/{import.css => style-import.css} (100%)
 create mode 100644 test/fixtures/style-import.vue
 create mode 100644 test/fixtures/template-import.jade
 create mode 100644 test/fixtures/template-import.js
 create mode 100644 test/fixtures/template-import.vue

diff --git a/lib/loader.js b/lib/loader.js
index 177ddf0b0..6eba9fe6e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -59,16 +59,20 @@ module.exports = function (content) {
     )
   }
 
-  function getRequireForImport (impt) {
+  function getRequireForImport (type, impt, scoped) {
     return 'require(' +
-      loaderUtils.stringifyRequest(self,
-        '-!' +
-        getLoaderString('style', impt, impt.scoped) +
-        impt.src
-      ) +
+      getRequireForImportString(type, impt, scoped) +
     ')\n'
   }
 
+  function getRequireForImportString (type, impt, scoped) {
+    return loaderUtils.stringifyRequest(self,
+      '-!' +
+      getLoaderString(type, impt, scoped) +
+      impt.src
+    )
+  }
+
   function getLoaderString (type, part, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
@@ -135,7 +139,7 @@ module.exports = function (content) {
     // add requires for src imports
     parts.styleImports.forEach(function (impt) {
       if (impt.scoped) hasLocalStyles = true
-      output += getRequireForImport(impt)
+      output += getRequireForImport('style', impt, impt.scoped)
     })
 
     // add requires for styles
@@ -152,11 +156,16 @@ module.exports = function (content) {
     }
 
     // add require for template
+    var template
     if (parts.template.length) {
+      template = parts.template[0]
       output += ';(typeof module.exports === "function" ' +
         '? module.exports.options ' +
-        ': module.exports).template = ' +
-        getRequire('template', parts.template[0], 0, hasLocalStyles)
+        ': module.exports).template = ' + (
+          template.src
+            ? getRequireForImport('template', template, hasLocalStyles)
+            : getRequire('template', template, 0, hasLocalStyles)
+        )
     }
 
     // hot reload
@@ -165,7 +174,11 @@ module.exports = function (content) {
       (parts.script.length || parts.template.length)
     ) {
       var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
-      var templateString = parts.template.length ? getRequireString('template', parts.template[0], 0, hasLocalStyles) : ''
+      var templateString = template
+        ? template.src
+          ? getRequireForImportString('template', template, hasLocalStyles)
+          : getRequireString('template', template, 0, hasLocalStyles)
+        : ''
       var accepted = []
       if (scriptString) {
         accepted.push(scriptString.slice(1, -1))
diff --git a/lib/parser.js b/lib/parser.js
index 7cb36bdc1..8302fb4fe 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -19,17 +19,36 @@ module.exports = function (content) {
     var src = getAttribute(node, 'src')
     var scoped = getAttribute(node, 'scoped') != null
 
+    // node count check
+    if (
+      (type === 'script' || type === 'template') &&
+      output[type].length > 0
+    ) {
+      return cb(new Error(
+        '[vue-loader] Only one <script> or <template> tag is ' +
+        'allowed inside a Vue component.'
+      ))
+    }
+
+    // handle src imports
     if (src) {
-      if (type !== 'style') {
+      if (type !== 'style' && type !== 'template') {
         return cb(new Error(
-          '[vue-loader] src import is only supported for <style> tags.'
+          '[vue-loader] src import is only supported for <template> and <style> tags.'
         ))
       }
-      output.styleImports.push({
-        src: src,
-        lang: lang,
-        scoped: scoped
-      })
+      if (type === 'style') {
+        output.styleImports.push({
+          src: src,
+          lang: lang,
+          scoped: scoped
+        })
+      } else if (type === 'template') {
+        output.template.push({
+          src: src,
+          lang: lang
+        })
+      }
       return
     }
 
@@ -41,16 +60,6 @@ module.exports = function (content) {
       return
     }
 
-    if (
-      (type === 'script' || type === 'template') &&
-      output[type].length > 0
-    ) {
-      return cb(new Error(
-        '[vue-loader] Only one <script> or <template> tag is ' +
-        'allowed inside a Vue component.'
-      ))
-    }
-
     // Work around changes in parse5 >= 1.2.0
     if (node.childNodes[0].nodeName === '#document-fragment') {
       node = node.childNodes[0]
diff --git a/test/fixtures/import.vue b/test/fixtures/import.vue
deleted file mode 100644
index d387476c3..000000000
--- a/test/fixtures/import.vue
+++ /dev/null
@@ -1,2 +0,0 @@
-<style src="./import.css"></style>
-<style src="./import-scoped.css" scoped></style>
diff --git a/test/fixtures/import-scoped.css b/test/fixtures/style-import-scoped.css
similarity index 100%
rename from test/fixtures/import-scoped.css
rename to test/fixtures/style-import-scoped.css
diff --git a/test/fixtures/import.css b/test/fixtures/style-import.css
similarity index 100%
rename from test/fixtures/import.css
rename to test/fixtures/style-import.css
diff --git a/test/fixtures/style-import.vue b/test/fixtures/style-import.vue
new file mode 100644
index 000000000..54b83bf89
--- /dev/null
+++ b/test/fixtures/style-import.vue
@@ -0,0 +1,2 @@
+<style src="./style-import.css"></style>
+<style src="./style-import-scoped.css" scoped></style>
diff --git a/test/fixtures/template-import.jade b/test/fixtures/template-import.jade
new file mode 100644
index 000000000..bc60abffa
--- /dev/null
+++ b/test/fixtures/template-import.jade
@@ -0,0 +1,2 @@
+div
+  h1 hello
diff --git a/test/fixtures/template-import.js b/test/fixtures/template-import.js
new file mode 100644
index 000000000..9f39ecaea
--- /dev/null
+++ b/test/fixtures/template-import.js
@@ -0,0 +1 @@
+window.testModule = require('./template-import.vue')
diff --git a/test/fixtures/template-import.vue b/test/fixtures/template-import.vue
new file mode 100644
index 000000000..ce534539b
--- /dev/null
+++ b/test/fixtures/template-import.vue
@@ -0,0 +1 @@
+<template lang="jade" src="./template-import.jade"></template>
diff --git a/test/test.js b/test/test.js
index e15e1d763..2e52cafda 100644
--- a/test/test.js
+++ b/test/test.js
@@ -110,17 +110,27 @@ describe('vue-loader', function () {
 
   it('style import', function (done) {
     test({
-      entry: './test/fixtures/import.vue'
+      entry: './test/fixtures/style-import.vue'
     }, function (window) {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red; }')
       // import with scoped
-      var id = '_v-' + hash(require.resolve('./fixtures/import.vue'))
+      var id = '_v-' + hash(require.resolve('./fixtures/style-import.vue'))
       expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green; }')
       done()
     })
   })
 
+  it('template import', function (done) {
+    test({
+      entry: './test/fixtures/template-import.js'
+    }, function (window) {
+      var module = window.testModule
+      expect(module.template).to.contain('<div><h1>hello</h1></div>')
+      done()
+    })
+  })
+
   it('source map', function (done) {
     var config = assign({}, globalConfig, {
       entry: './test/fixtures/basic.js',

From 80886c3e7dd961e2024e775e4c50450e0ca0ffa5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 19 Nov 2015 12:30:50 -0500
Subject: [PATCH 122/877] bump 7.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f5b051d05..912b2286d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.0.3",
+  "version": "7.1.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 5f4bb655b30350c8c3eda2add16b25ec30dfd418 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 19 Nov 2015 18:12:55 -0500
Subject: [PATCH 123/877] improve CSS source map handling

---
 lib/loader.js         | 10 +++++++---
 lib/style-rewriter.js |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 6eba9fe6e..3550b416d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -3,6 +3,7 @@ var assign = require('object-assign')
 var selectorPath = require.resolve('./selector')
 var parserPath = require.resolve('./parser')
 var hash = require('hash-sum')
+var path = require('path')
 
 var defaultLang = {
   template: 'html',
@@ -29,7 +30,9 @@ module.exports = function (content) {
   var output = ''
   var options = this.options.vue || {}
   var vueUrl = loaderUtils.getRemainingRequest(this)
-  var moduleId = '_v-' + hash(this.resourcePath)
+  var filePath = this.resourcePath
+  var fileName = path.basename(filePath)
+  var moduleId = '_v-' + hash(filePath)
 
   // respect user babel options
   if (this.options.babel) {
@@ -102,11 +105,12 @@ module.exports = function (content) {
   }
 
   function getRewriter (type, scoped) {
+    var meta = '?id=' + moduleId + '&file=' + fileName
     switch (type) {
     case 'template':
-      return scoped ? (rewriters.template + '?id=' + moduleId + '!') : ''
+      return scoped ? (rewriters.template + meta + '!') : ''
     case 'style':
-      return rewriters.style + '?id=' + moduleId + (scoped ? '&scoped=true!' : '!')
+      return rewriters.style + meta + (scoped ? '&scoped=true!' : '!')
     default:
       return ''
     }
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 2003ab49a..cc5c753ba 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -56,7 +56,7 @@ module.exports = function (css, map) {
   }
 
   // postcss options, for source maps
-  var file = loaderUtils.getRemainingRequest(this)
+  var file = this.resourcePath
   var opts
   opts = {
     from: file,
@@ -74,7 +74,11 @@ module.exports = function (css, map) {
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {
-      cb(null, result.css, result.map)
+      var map = JSON.parse(result.map.toString())
+      // ensure we give the style source a unique name
+      // so that Webpack doesn't get confused
+      map.sources[0] = query.file + '.style'
+      cb(null, result.css, map)
     })
     .catch(function (e) {
       console.log(e)

From 5da1730a70c39e3fc04c7cd9a839468620d7c781 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 19 Nov 2015 18:13:09 -0500
Subject: [PATCH 124/877] 7.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 912b2286d..8651c92ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 846c1eb4f33fac7cecabe499c8d1018d8145f845 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 21 Nov 2015 15:39:13 -0500
Subject: [PATCH 125/877] relax 0.x peer deps

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8651c92ca..dcd276fdf 100644
--- a/package.json
+++ b/package.json
@@ -33,8 +33,8 @@
   },
   "peerDependencies": {
     "vue-html-loader": "^1.0.0",
-    "css-loader": "^0.21.0",
-    "style-loader": "^0.13.0",
+    "css-loader": "*",
+    "style-loader": "*",
     "babel-loader": "^6.1.0",
     "babel-core": "^6.1.2",
     "babel-plugin-transform-runtime": "^6.1.2",

From caba1800f31c2cf5063bd9f9950893f429f2d304 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 23 Nov 2015 15:55:41 -0500
Subject: [PATCH 126/877] bump 7.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dcd276fdf..40d7b07b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 0ab820e6e9ef870519fbb880cd7b0ab7442aa271 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 Nov 2015 12:05:25 -0500
Subject: [PATCH 127/877] use full loader names

---
 lib/loader.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 3550b416d..51949be08 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -12,12 +12,12 @@ var defaultLang = {
 }
 
 var defaultLoaders = {
-  html: 'vue-html',
-  css: 'style!css',
-  js: 'babel?presets[]=es2015&plugins[]=transform-runtime'
+  html: 'vue-html-loader',
+  css: 'style-loader!css-loader',
+  js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime'
 }
 
-var rewriterInjectRE = /\b((css|(vue-)?html)(\?[^!]+)?!?)\b/
+var rewriterInjectRE = /\b((css|(vue-)?html)(-loader)?(\?[^!]+)?!?)\b/
 var rewriters = {
   template: require.resolve('./template-rewriter'),
   style: require.resolve('./style-rewriter')

From 40da7ad5773dcc6b5d0d1870097381678492538d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 Nov 2015 12:06:08 -0500
Subject: [PATCH 128/877] bump 7.1.3 [ci-skip]

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 40d7b07b6..ee168c119 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.2",
+  "version": "7.1.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b71a70a605ac228be839015cbb9ebd94a073656c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 Nov 2015 12:26:51 -0500
Subject: [PATCH 129/877] bump (just to overwrite latest tag because npm
 dist-tag is down) [ci-skip]

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ee168c119..e573c7b85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.3",
+  "version": "7.1.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9f702fe192aa47523c5c36b2237a5735e5a75a46 Mon Sep 17 00:00:00 2001
From: rhyzx <rhyzix@gmail.com>
Date: Sat, 28 Nov 2015 14:10:16 +0700
Subject: [PATCH 130/877] preserve scripts line number

---
 lib/parser.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 8302fb4fe..4f4774aa3 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -70,16 +70,38 @@ module.exports = function (content) {
 
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
+
+    var result
+    if (type === 'script') {
+      result = commentScript(content.slice(0, start)) +
+              content.slice(start, end) +
+              commentScript(content.slice(end))
+    } else {
+      result = content.slice(start, end).trim()
+    }
+
     output[type].push({
       lang: lang,
       scoped: scoped,
-      content: content.substring(start, end).trim()
+      content: result
     })
   })
 
   cb(null, 'module.exports = ' + JSON.stringify(output))
 }
 
+function commentScript (content) {
+  return content.split(/\n\r|\n|\r/g)
+  .map(function (line) {
+    if (line.trim() === '') {
+      return line
+    } else {
+      return '// ' + line
+    }
+  })
+  .join('\n')
+}
+
 function getAttribute (node, name) {
   if (node.attrs) {
     var i = node.attrs.length

From 6f3270dfdd31929ce0441d9cecea773cbdd7c8cb Mon Sep 17 00:00:00 2001
From: rhyzx <rhyzix@gmail.com>
Date: Sat, 28 Nov 2015 14:32:26 +0700
Subject: [PATCH 131/877] update script line number test

---
 test/test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 2e52cafda..781d35cee 100644
--- a/test/test.js
+++ b/test/test.js
@@ -141,6 +141,7 @@ describe('vue-loader', function () {
       getFile('test.build.js.map', function (map) {
         var smc = new SourceMapConsumer(JSON.parse(map))
         getFile('test.build.js', function (code) {
+          console.log(code)
           var line
           code.split('\n').some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {
@@ -153,7 +154,7 @@ describe('vue-loader', function () {
             column: 0
           })
           expect(pos.source.indexOf('webpack:///test/fixtures/basic.vue') > -1)
-          expect(pos.line).to.equal(4)
+          expect(pos.line).to.equal(15)
           done()
         })
       })

From 85179978295562b19e0f2104c003d8c8db55484e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 28 Nov 2015 14:24:53 -0500
Subject: [PATCH 132/877] formatting tweaks

---
 lib/parser.js | 26 ++++++++++++++------------
 test/test.js  |  1 -
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 4f4774aa3..7b8d3c050 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -73,9 +73,10 @@ module.exports = function (content) {
 
     var result
     if (type === 'script') {
-      result = commentScript(content.slice(0, start)) +
-              content.slice(start, end) +
-              commentScript(content.slice(end))
+      result =
+        commentScript(content.slice(0, start)) +
+        content.slice(start, end) +
+        commentScript(content.slice(end))
     } else {
       result = content.slice(start, end).trim()
     }
@@ -91,15 +92,16 @@ module.exports = function (content) {
 }
 
 function commentScript (content) {
-  return content.split(/\n\r|\n|\r/g)
-  .map(function (line) {
-    if (line.trim() === '') {
-      return line
-    } else {
-      return '// ' + line
-    }
-  })
-  .join('\n')
+  return content
+    .split(/\n\r|\n|\r/g)
+    .map(function (line) {
+      if (line.trim() === '') {
+        return line
+      } else {
+        return '// ' + line
+      }
+    })
+    .join('\n')
 }
 
 function getAttribute (node, name) {
diff --git a/test/test.js b/test/test.js
index 781d35cee..c581e3fcf 100644
--- a/test/test.js
+++ b/test/test.js
@@ -141,7 +141,6 @@ describe('vue-loader', function () {
       getFile('test.build.js.map', function (map) {
         var smc = new SourceMapConsumer(JSON.parse(map))
         getFile('test.build.js', function (code) {
-          console.log(code)
           var line
           code.split('\n').some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {

From 97c2ab252de4f25f17af24b269399863222ec2e3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 28 Nov 2015 14:25:06 -0500
Subject: [PATCH 133/877] bump 7.1.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e573c7b85..fa5bd329c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.4",
+  "version": "7.1.5",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 4b8e7f437618c30d47861358e16854e16ad1de7d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 29 Nov 2015 13:19:58 -0500
Subject: [PATCH 134/877] update dep

---
 circle.yml   | 2 +-
 package.json | 2 +-
 test/test.js | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index df960ce4c..fe4654099 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,3 @@
 machine:
   node:
-    version: 4.0.0
+    version: 4
diff --git a/package.json b/package.json
index fa5bd329c..5312de026 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "autoprefixer": "^6.0.3",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
-    "object-assign": "^3.0.0",
+    "object-assign": "^4.0.0",
     "parse5": "^1.5.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2"
diff --git a/test/test.js b/test/test.js
index c581e3fcf..81cfa799e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -3,7 +3,6 @@ var path = require('path')
 var webpack = require('webpack')
 var jsdom = require('jsdom')
 var expect = require('chai').expect
-var assign = require('object-assign')
 var rimraf = require('rimraf')
 var hash = require('hash-sum')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
@@ -41,7 +40,7 @@ describe('vue-loader', function () {
   }
 
   function test (options, assert) {
-    var config = assign({}, globalConfig, options)
+    var config = Object.assign({}, globalConfig, options)
     webpack(config, function (err) {
       if (err) throw err
       getFile('test.build.js', function (data) {
@@ -132,7 +131,7 @@ describe('vue-loader', function () {
   })
 
   it('source map', function (done) {
-    var config = assign({}, globalConfig, {
+    var config = Object.assign({}, globalConfig, {
       entry: './test/fixtures/basic.js',
       devtool: 'source-map'
     })

From d1c42246ed5e458305fe696719b1bb76e046e54a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 29 Nov 2015 19:47:11 -0500
Subject: [PATCH 135/877] update readme for src-import

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 10671e0ae..74a885172 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ export default {
 - [CSS Pre-Processors](#css-pre-processors)
 - [PostCSS](#postcss)
 - [Template Pre-Processors](#template-pre-processors)
-- [Style Imports](#style-imports)
+- [Src Imports](#src-imports)
 - [Asset URL Handling](#asset-url-handling)
 - [Scoped CSS](#scoped-css)
 - [Hot Reload](#hot-reload)
@@ -170,15 +170,16 @@ module.exports = {
 
 For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
 
-## Style Imports
+## Src Imports
 
-If you want, you can separate your styles into a separate file and import it using the `src` attribute:
+If you want, you can separate your template and styles into separate files and import them using the `src` attribute:
 
 ``` html
+<template src="./template.html"></template>
 <style src="./style.css"></style>
 ```
 
-Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from node modules: `<style src="todomvc-app-css/index.css">`.
+Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from installed NPM packages, e.g. `<style src="todomvc-app-css/index.css">`.
 
 ## Asset URL Handling
 

From 0af739b5252e87e5aab76df4339cc2ac5311a6e2 Mon Sep 17 00:00:00 2001
From: Taylor Zane Glaeser <tzglaeser@gmail.com>
Date: Mon, 30 Nov 2015 10:21:39 -0600
Subject: [PATCH 136/877] Fixing issue with coffeescript parsing.

---
 lib/parser.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 7b8d3c050..07ff0a081 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -74,9 +74,9 @@ module.exports = function (content) {
     var result
     if (type === 'script') {
       result =
-        commentScript(content.slice(0, start)) +
-        content.slice(start, end) +
-        commentScript(content.slice(end))
+        // commentScript(content.slice(0, start)) +
+        content.slice(start, end)// +
+        // commentScript(content.slice(end))
     } else {
       result = content.slice(start, end).trim()
     }

From 417b438359f993c966251e5349e75fce9a12be21 Mon Sep 17 00:00:00 2001
From: Taylor Zane Glaeser <tzglaeser@gmail.com>
Date: Mon, 30 Nov 2015 10:30:09 -0600
Subject: [PATCH 137/877] Resolved issue with CoffeeScript (and presumably
 other CS-like languages) not transpiling in a Vue component.

---
 lib/parser.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 07ff0a081..3b8b16a99 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -71,15 +71,7 @@ module.exports = function (content) {
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
 
-    var result
-    if (type === 'script') {
-      result =
-        // commentScript(content.slice(0, start)) +
-        content.slice(start, end)// +
-        // commentScript(content.slice(end))
-    } else {
-      result = content.slice(start, end).trim()
-    }
+    var result = content.slice(start, end).trim()
 
     output[type].push({
       lang: lang,

From cdac321a58fe822a07af79aa8d26618907566d6a Mon Sep 17 00:00:00 2001
From: Taylor Zane Glaeser <tzglaeser@gmail.com>
Date: Mon, 30 Nov 2015 12:40:30 -0600
Subject: [PATCH 138/877] Implemented more robust handling for commeting. This
 allows for the source map to maintain the original line numbers.

---
 lib/parser.js | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 3b8b16a99..edacb007c 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -71,7 +71,15 @@ module.exports = function (content) {
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
 
-    var result = content.slice(start, end).trim()
+    var result
+    if (type === 'script') {
+      result =
+        commentScript(content.slice(0, start), lang) +
+        content.slice(start, end) +
+        commentScript(content.slice(end), lang)
+    } else {
+      result = content.slice(start, end).trim()
+    }
 
     output[type].push({
       lang: lang,
@@ -83,14 +91,32 @@ module.exports = function (content) {
   cb(null, 'module.exports = ' + JSON.stringify(output))
 }
 
-function commentScript (content) {
+function commentScript (content, lang) {
   return content
     .split(/\n\r|\n|\r/g)
     .map(function (line) {
-      if (line.trim() === '') {
-        return line
-      } else {
-        return '// ' + line
+      switch (lang) {
+        case 'coffee':
+        case 'coffee-jsx':
+        case 'coffee-redux':
+          if (line.trim() === '') {
+            return line
+          } else {
+            return '# ' + line
+          }
+        case 'purs':
+        case 'ulmus':
+          if (line.trim() === '') {
+            return line
+          } else {
+            return '-- ' + line
+          }
+        default:
+          if (line.trim() === '') {
+            return line
+          } else {
+            return '// ' + line
+          }
       }
     })
     .join('\n')

From 9a47a3f3e34eeb893d3bf222d492334b30a70898 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Nov 2015 14:12:39 -0500
Subject: [PATCH 139/877] fix eslint switch case indent rule

---
 .eslintrc     | 21 ++-------------------
 lib/loader.js | 24 ++++++++++++------------
 lib/parser.js | 18 ++++++------------
 3 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 9a90c1d8e..fd0128479 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -4,7 +4,7 @@
     "node": true
   },
 
-  "rules": {
+ "rules": {
     "accessor-pairs": 2,
     "array-bracket-spacing": 0,
     "block-scoped-var": 0,
@@ -26,29 +26,21 @@
     "eqeqeq": [2, "allow-null"],
     "func-names": 0,
     "func-style": 0,
-    "generator-star": 0,
     "generator-star-spacing": [2, { "before": true, "after": true }],
-    "global-strict": 0,
     "guard-for-in": 0,
     "handle-callback-err": [2, "^(err|error)$" ],
-    "indent": [2, 2],
+    "indent": [2, 2, { "SwitchCase": 1 }],
     "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
     "linebreak-style": 0,
     "lines-around-comment": 0,
-    "max-depth": 0,
-    "max-len": 0,
     "max-nested-callbacks": 0,
-    "max-params": 0,
-    "max-statements": 0,
     "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
     "new-parens": 2,
     "newline-after-var": 0,
     "no-alert": 0,
     "no-array-constructor": 2,
-    "no-bitwise": 0,
     "no-caller": 2,
     "no-catch-shadow": 0,
-    "no-comma-dangle": 0,
     "no-cond-assign": 2,
     "no-console": 0,
     "no-constant-condition": 0,
@@ -63,7 +55,6 @@
     "no-else-return": 0,
     "no-empty": 0,
     "no-empty-character-class": 2,
-    "no-empty-class": 0,
     "no-empty-label": 2,
     "no-eq-null": 0,
     "no-eval": 2,
@@ -73,7 +64,6 @@
     "no-extra-boolean-cast": 2,
     "no-extra-parens": 0,
     "no-extra-semi": 0,
-    "no-extra-strict": 0,
     "no-fallthrough": 2,
     "no-floating-decimal": 2,
     "no-func-assign": 2,
@@ -106,13 +96,11 @@
     "no-octal-escape": 2,
     "no-param-reassign": 0,
     "no-path-concat": 0,
-    "no-plusplus": 0,
     "no-process-env": 0,
     "no-process-exit": 0,
     "no-proto": 0,
     "no-redeclare": 2,
     "no-regex-spaces": 2,
-    "no-reserved-keys": 0,
     "no-restricted-modules": 0,
     "no-return-assign": 2,
     "no-script-url": 0,
@@ -120,7 +108,6 @@
     "no-sequences": 2,
     "no-shadow": 0,
     "no-shadow-restricted-names": 2,
-    "no-space-before-semi": 0,
     "no-spaced-func": 2,
     "no-sparse-arrays": 2,
     "no-sync": 0,
@@ -155,18 +142,14 @@
     "semi": [2, "never"],
     "semi-spacing": 0,
     "sort-vars": 0,
-    "space-after-function-name": 0,
     "space-after-keywords": [2, "always"],
     "space-before-blocks": [2, "always"],
     "space-before-function-paren": [2, "always"],
-    "space-before-function-parentheses": 0,
-    "space-in-brackets": 0,
     "space-in-parens": [2, "never"],
     "space-infix-ops": 2,
     "space-return-throw-case": 2,
     "space-unary-ops": [2, { "words": true, "nonwords": false }],
     "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
-    "spaced-line-comment": 0,
     "strict": 0,
     "use-isnan": 2,
     "valid-jsdoc": 0,
diff --git a/lib/loader.js b/lib/loader.js
index 51949be08..478f1929e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -94,12 +94,12 @@ module.exports = function (content) {
     } else {
       // unknown lang, assume a loader for it is used
       switch (type) {
-      case 'template':
-        return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
-      case 'style':
-        return 'style!css!' + rewriter + lang + '!'
-      case 'script':
-        return lang + '!'
+        case 'template':
+          return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
+        case 'style':
+          return 'style!css!' + rewriter + lang + '!'
+        case 'script':
+          return lang + '!'
       }
     }
   }
@@ -107,12 +107,12 @@ module.exports = function (content) {
   function getRewriter (type, scoped) {
     var meta = '?id=' + moduleId + '&file=' + fileName
     switch (type) {
-    case 'template':
-      return scoped ? (rewriters.template + meta + '!') : ''
-    case 'style':
-      return rewriters.style + meta + (scoped ? '&scoped=true!' : '!')
-    default:
-      return ''
+      case 'template':
+        return scoped ? (rewriters.template + meta + '!') : ''
+      case 'style':
+        return rewriters.style + meta + (scoped ? '&scoped=true!' : '!')
+      default:
+        return ''
     }
   }
 
diff --git a/lib/parser.js b/lib/parser.js
index 7b8d3c050..390d24268 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -73,10 +73,10 @@ module.exports = function (content) {
 
     var result
     if (type === 'script') {
-      result =
-        commentScript(content.slice(0, start)) +
-        content.slice(start, end) +
-        commentScript(content.slice(end))
+      // Pad the source code with extra blank lines
+      // so the source-mapped line numbers corresponds to
+      // the original *.vue file.
+      result = padLines(content.slice(0, start)) + content.slice(start, end)
     } else {
       result = content.slice(start, end).trim()
     }
@@ -91,16 +91,10 @@ module.exports = function (content) {
   cb(null, 'module.exports = ' + JSON.stringify(output))
 }
 
-function commentScript (content) {
+function padLines (content) {
   return content
     .split(/\n\r|\n|\r/g)
-    .map(function (line) {
-      if (line.trim() === '') {
-        return line
-      } else {
-        return '// ' + line
-      }
-    })
+    .map(function (line) { return '' })
     .join('\n')
 }
 

From 0bd18dbba20923189f689d4c2d617a1e25236473 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Nov 2015 14:36:36 -0500
Subject: [PATCH 140/877] 7.1.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5312de026..de75a852f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From be4bafcdf1a60d9c9450c5b3b96c8bdf2576ce66 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Nov 2015 15:07:55 -0500
Subject: [PATCH 141/877] fix postcss plugin list growing over rebuilds

---
 lib/style-rewriter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index cc5c753ba..707d1d121 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -36,7 +36,9 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
-  var plugins = options.postcss || []
+  var plugins = options.postcss
+    ? options.postcss.slice() // make sure to copy it
+    : []
 
   // scoped css
   if (query.scoped) {

From 04af0d66965b272f0ab94b3c3c44d90b0f126d2b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Nov 2015 15:08:14 -0500
Subject: [PATCH 142/877] 7.1.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index de75a852f..9c7e4636f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.6",
+  "version": "7.1.7",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From a58a282c99a7f107c0e6fdb5709f050103419c0c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 1 Dec 2015 11:35:15 -0500
Subject: [PATCH 143/877] readme [ci-skip] (close #86)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74a885172..d0058e44d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 It allows you to write your components in this format:
 
 ``` html
-// app.vue
+<!-- app.vue -->
 <template>
   <h1 class="red">{{msg}}</h1>
 </template>

From 8b1f8aa98455214309749402a0467c5b2f1a5c0a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 6 Dec 2015 13:55:19 -0500
Subject: [PATCH 144/877] update tests and deps

---
 package.json | 1 +
 test/test.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9c7e4636f..92372e961 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "style-loader": "^0.13.0",
     "stylus-loader": "^1.4.0",
     "template-html-loader": "^0.0.3",
+    "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "webpack": "^1.12.2"
   }
diff --git a/test/test.js b/test/test.js
index 81cfa799e..2c5b5dd7a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -164,7 +164,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/autoprefix.js'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('body {\n  -webkit-transform: scale(1);\n      -ms-transform: scale(1);\n          transform: scale(1);\n}')
+      expect(style).to.contain('body {\n  -webkit-transform: scale(1);\n          transform: scale(1);\n}')
       done()
     })
   })

From 0192d646a02ac17c24d496b397d70655dabdfec3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 6 Dec 2015 15:04:13 -0500
Subject: [PATCH 145/877] downgrade babel-runtime for better dedupe

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 92372e961..ba99e74d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.7",
+  "version": "7.1.8",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -39,7 +39,7 @@
     "babel-core": "^6.1.2",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
-    "babel-runtime": "^6.0.14",
+    "babel-runtime": "^5.8.0",
     "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
@@ -47,7 +47,7 @@
     "babel-loader": "^6.1.0",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
-    "babel-runtime": "^6.0.14",
+    "babel-runtime": "^5.8.0",
     "chai": "^3.0.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",

From 95cf0b7e38992f78346a16e3cf31881a2ea6ef61 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 6 Dec 2015 15:26:37 -0500
Subject: [PATCH 146/877] use simpler hot-reload mechanism

---
 lib/loader.js | 45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 478f1929e..c0540e3d1 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -177,38 +177,21 @@ module.exports = function (content) {
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {
-      var scriptString = parts.script.length ? getRequireString('script', parts.script[0], 0) : ''
-      var templateString = template
-        ? template.src
-          ? getRequireForImportString('template', template, hasLocalStyles)
-          : getRequireString('template', template, 0, hasLocalStyles)
-        : ''
-      var accepted = []
-      if (scriptString) {
-        accepted.push(scriptString.slice(1, -1))
-      }
-      if (templateString) {
-        accepted.push(templateString.slice(1, -1))
-      }
       output +=
-        'if (module.hot) {\n' +
-          '(function () {\n' +
-            // shim the component directive so that it
-            // registers the instances
-            'var hotAPI = require("vue-hot-reload-api")\n' +
-            'hotAPI.install(require("vue"))\n' +
-            'if (!hotAPI.compatible) return\n' +
-            'var id = ' + (scriptString || templateString) + '\n' +
-            // create the record
-            'hotAPI.createRecord(id, module.exports)\n' +
-            'module.hot.accept(' + JSON.stringify(accepted) + ', function () {\n' +
-              'var newOptions = ' + (scriptString ? 'require(' + scriptString + ')\n' : 'null\n') +
-              'if (newOptions && newOptions.__esModule) newOptions = newOptions.default\n' +
-              'var newTemplate = ' + (templateString ? 'require(' + templateString + ')\n' : 'null\n') +
-              'hotAPI.update(id, newOptions, newTemplate)\n' +
-            '})\n' +
-          '})()\n' +
-        '}'
+        'if (module.hot) {(function () {' +
+        '  module.hot.accept()\n' +
+        '  var hotAPI = require("vue-hot-reload-api")\n' +
+        '  hotAPI.install(require("vue"), true)\n' +
+        '  if (!hotAPI.compatible) return\n' +
+        '  var id = ' + JSON.stringify(filePath) + '\n' +
+        '  if (!module.hot.data) {\n' +
+        // initial insert
+        '    hotAPI.createRecord(id, module.exports)\n' +
+        '  } else {\n' +
+        // update
+        '    hotAPI.update(id, module.exports, (typeof module.exports === "function" ? module.exports.options : module.exports).template)\n' +
+        '  }\n' +
+        '})()}'
     }
 
     // done

From 765d85dc45a44a41be355517ea6af1acbf8abd4a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 6 Dec 2015 15:26:48 -0500
Subject: [PATCH 147/877] 7.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ba99e74d0..572bba71b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.1.8",
+  "version": "7.2.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 483cb5086c98c1798e6439c258b09923dfc8390a Mon Sep 17 00:00:00 2001
From: Sergii Naumov <egonyans@gmail.com>
Date: Tue, 8 Dec 2015 20:52:05 +0100
Subject: [PATCH 148/877] Enable src attr for script tag

---
 lib/loader.js |  9 +++++++--
 lib/parser.js | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index c0540e3d1..4cdc2de66 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -153,10 +153,15 @@ module.exports = function (content) {
     })
 
     // add require for script
+    var script
     if (parts.script.length) {
+      script = parts.script[0]
       output +=
-        'module.exports = ' + getRequire('script', parts.script[0], 0) + '\n' +
-        'if (module.exports.__esModule) module.exports = module.exports.default\n'
+        'module.exports = ' + (
+          script.src
+            ? getRequireForImport('script', script, 0)
+            : getRequire('script', script, 0)
+        ) + '\nif (module.exports.__esModule) module.exports = module.exports.default\n'
     }
 
     // add require for template
diff --git a/lib/parser.js b/lib/parser.js
index e0e9a4243..29a185657 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -32,11 +32,6 @@ module.exports = function (content) {
 
     // handle src imports
     if (src) {
-      if (type !== 'style' && type !== 'template') {
-        return cb(new Error(
-          '[vue-loader] src import is only supported for <template> and <style> tags.'
-        ))
-      }
       if (type === 'style') {
         output.styleImports.push({
           src: src,
@@ -48,6 +43,11 @@ module.exports = function (content) {
           src: src,
           lang: lang
         })
+      } else if (type === 'script') {
+        output.script.push({
+          src: src,
+          lang: lang
+        })
       }
       return
     }

From a05c5cf79ea48003fb5ba3d82a3e7de0fae3f84c Mon Sep 17 00:00:00 2001
From: Sergii Naumov <sergii.naumov@1und1.com>
Date: Mon, 14 Dec 2015 17:12:25 +0100
Subject: [PATCH 149/877] Tests for the script import

---
 test/fixtures/script-import-entry.js |  1 +
 test/fixtures/script-import.js       |  7 +++++++
 test/fixtures/script-import.vue      |  1 +
 test/test.js                         | 10 ++++++++++
 4 files changed, 19 insertions(+)
 create mode 100644 test/fixtures/script-import-entry.js
 create mode 100644 test/fixtures/script-import.js
 create mode 100644 test/fixtures/script-import.vue

diff --git a/test/fixtures/script-import-entry.js b/test/fixtures/script-import-entry.js
new file mode 100644
index 000000000..5c1491e49
--- /dev/null
+++ b/test/fixtures/script-import-entry.js
@@ -0,0 +1 @@
+window.testModule = require('./script-import.vue')
diff --git a/test/fixtures/script-import.js b/test/fixtures/script-import.js
new file mode 100644
index 000000000..8ab20152a
--- /dev/null
+++ b/test/fixtures/script-import.js
@@ -0,0 +1,7 @@
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+};
\ No newline at end of file
diff --git a/test/fixtures/script-import.vue b/test/fixtures/script-import.vue
new file mode 100644
index 000000000..b45d1ec73
--- /dev/null
+++ b/test/fixtures/script-import.vue
@@ -0,0 +1 @@
+<script src="./script-import.js"></script>
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index 2c5b5dd7a..243e5555a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -130,6 +130,16 @@ describe('vue-loader', function () {
     })
   })
 
+  it('script import', function (done) {
+    test({
+      entry: './test/fixtures/script-import-entry.js'
+    }, function (window) {
+      var module = window.testModule
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      done()
+    })
+  })
+
   it('source map', function (done) {
     var config = Object.assign({}, globalConfig, {
       entry: './test/fixtures/basic.js',

From b385a1af11ab635840f5114487843f61ba245ff6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 16 Dec 2015 17:38:20 -0500
Subject: [PATCH 150/877] docs wip

---
 .gitignore                            |   5 +-
 README.md                             |  29 +----
 docs/README.md                        |  37 ++++++
 docs/SUMMARY.md                       |  16 +++
 docs/assets/CNAME                     |   1 +
 docs/assets/circle.yml                |   4 +
 docs/book.json                        |  19 +++
 docs/configurations/advanced.md       |  33 +++++
 docs/configurations/asset-url.md      |  38 ++++++
 docs/configurations/es2015.md         |  70 ++++++++++
 docs/configurations/extract-css.md    |  34 +++++
 docs/configurations/inline-loaders.md |  62 +++++++++
 docs/configurations/postcss.md        |  49 +++++++
 docs/deploy.sh                        |  10 ++
 docs/features/hot-reload.md           |   0
 docs/features/scoped-css.md           |   0
 docs/getting-started.md               | 176 ++++++++++++++++++++++++++
 docs/start/spec.md                    |  78 ++++++++++++
 docs/start/tutorial.md                | 175 +++++++++++++++++++++++++
 docs/workflow/linting.md              |   0
 docs/workflow/testing.md              |   0
 package.json                          |   8 +-
 22 files changed, 818 insertions(+), 26 deletions(-)
 create mode 100644 docs/README.md
 create mode 100644 docs/SUMMARY.md
 create mode 100644 docs/assets/CNAME
 create mode 100644 docs/assets/circle.yml
 create mode 100644 docs/book.json
 create mode 100644 docs/configurations/advanced.md
 create mode 100644 docs/configurations/asset-url.md
 create mode 100644 docs/configurations/es2015.md
 create mode 100644 docs/configurations/extract-css.md
 create mode 100644 docs/configurations/inline-loaders.md
 create mode 100644 docs/configurations/postcss.md
 create mode 100644 docs/deploy.sh
 create mode 100644 docs/features/hot-reload.md
 create mode 100644 docs/features/scoped-css.md
 create mode 100644 docs/getting-started.md
 create mode 100644 docs/start/spec.md
 create mode 100644 docs/start/tutorial.md
 create mode 100644 docs/workflow/linting.md
 create mode 100644 docs/workflow/testing.md

diff --git a/.gitignore b/.gitignore
index e698d7971..0374b0709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-/node_modules
-/npm-debug.log
+node_modules
+npm-debug.log
 test/output
+docs/_book
diff --git a/README.md b/README.md
index d0058e44d..59d9fd2fe 100644
--- a/README.md
+++ b/README.md
@@ -4,28 +4,7 @@
 
 It allows you to write your components in this format:
 
-``` html
-<!-- app.vue -->
-<template>
-  <h1 class="red">{{msg}}</h1>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      msg: 'Hello world!'
-    }
-  }
-}
-</script>
-
-<style>
-.red {
-  color: #f00;
-}
-</style>
-```
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 ## Table of Contents
 
@@ -39,6 +18,9 @@ export default {
 - [Asset URL Handling](#asset-url-handling)
 - [Scoped CSS](#scoped-css)
 - [Hot Reload](#hot-reload)
+- [Syntax Highlighting](#syntax-highlighting)
+- [Linting](#linting)
+- [Testing](#testing)
 - [Advanced Loader Configuration](#advanced-loader-configuration)
 - [Example Project](https://github.com/vuejs/vue-loader-example)
 
@@ -172,11 +154,12 @@ For template pre-processors, you should install `template-html-loader` plus the
 
 ## Src Imports
 
-If you want, you can separate your template and styles into separate files and import them using the `src` attribute:
+If you want, you can separate your templates, styles or scripts into separate files and import them using the `src` attribute:
 
 ``` html
 <template src="./template.html"></template>
 <style src="./style.css"></style>
+<script src="./script.js"></script>
 ```
 
 Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from installed NPM packages, e.g. `<style src="todomvc-app-css/index.css">`.
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 000000000..0b637ab50
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,37 @@
+# Introduction
+
+### What is Webpack?
+
+Before we talk about `vue-loader`, let's first introduce [Webpack](http://webpack.github.io/). If you are already familiar with Webpack, feel free to skip the following explanation. But for those of you who are new to Webpack, here's a quick intro:
+
+Webpack is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
+
+![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+
+For a basic example, imagine we have a bunch of CommonJS modules. They cannot run directly inside the browser, so we need to "bundle" them into a single file that can be included via a `<script>` tag. Webpack can follow the dependencies of the `require()` calls and do that for us.
+
+But Webpack can do more than that. With "loaders", we can teach Webpack to transform all types of files in anyway we want before outputting the final bundle. Some examples include:
+
+- Transpile ES2015, CoffeeScript or TypeScript modules into plain ES5 CommonJS modules;
+- Optionally you can pipe the source code through a linter before doing the compilation;
+- Transpile Jade templates into plain HTML and inline it as a JavaScript string;
+- Transpile SASS files into plain CSS, then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
+- Process an image file referenced in HTML or CSS, moved it to the desired destination based on the path configurations, and naming it using its md5 hash.
+
+Webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using Webpack with Vue.js and `vue-loader`.
+
+### What is `vue-loader`?
+
+`vue-loader` is a loader for Webpack that can transform Vue components written in the following format into a plain JavaScript module:
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+There are many cool features provided by `vue-loader`:
+
+- ES2015 enabled by default;
+- Allows using other Webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
+- Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with Webpack loaders;
+- Can simulate scoped CSS for each component;
+- Supports component hot-reloading during development.
+
+In a nutshell, the combination of Webpack and `vue-loader` gives you a modern, flexible and extremely powerful front-end workflow for authoring Vue.js applications.
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
new file mode 100644
index 000000000..7a8d95a6c
--- /dev/null
+++ b/docs/SUMMARY.md
@@ -0,0 +1,16 @@
+- Getting Started
+  - [Vue Component Spec](start/spec.md)
+  - [Basic Tutorial](start/tutorial.md)
+- Configurations
+  - [Inline Loaders](configurations/inline-loaders.md)
+  - [Asset URL Handling](configurations/asset-url.md)
+  - [Babel and ES2015](configurations/es2015.md)
+  - [PostCSS and Autoprefixer](configurations/postcss.md)
+  - [Advanced Loader Configuration](configurations/advanced.md)
+  - [Extracting CSS File](configurations/extract-css.md)
+- Features
+  - [Scoped CSS](features/scoped-css.md)
+  - [Hot Reload](features/hot-reload.md)
+- Workflow
+  - [Linting](workflow/linting.md)
+  - [Testing](workflow/testing.md)
diff --git a/docs/assets/CNAME b/docs/assets/CNAME
new file mode 100644
index 000000000..94a4a7ffa
--- /dev/null
+++ b/docs/assets/CNAME
@@ -0,0 +1 @@
+vue-loader.vuejs.org
diff --git a/docs/assets/circle.yml b/docs/assets/circle.yml
new file mode 100644
index 000000000..56ad41b2f
--- /dev/null
+++ b/docs/assets/circle.yml
@@ -0,0 +1,4 @@
+general:
+  branches:
+    ignore:
+      - gh-pages
diff --git a/docs/book.json b/docs/book.json
new file mode 100644
index 000000000..8b295f41f
--- /dev/null
+++ b/docs/book.json
@@ -0,0 +1,19 @@
+{
+  "gitbook": "2.x.x",
+  "plugins": ["edit-link", "github"],
+  "pluginsConfig": {
+    "edit-link": {
+      "base": "https://github.com/vuejs/vue-loader/tree/master/docs",
+      "label": "Edit This Page"
+    },
+    "github": {
+      "url": "https://github.com/vuejs/vue-loader/"
+    }
+  },
+  "links": {
+    "sharing": {
+      "facebook": false,
+      "twitter": false
+    }
+  }
+}
diff --git a/docs/configurations/advanced.md b/docs/configurations/advanced.md
new file mode 100644
index 000000000..71e7984a4
--- /dev/null
+++ b/docs/configurations/advanced.md
@@ -0,0 +1,33 @@
+# Advanced Loader Configuration
+
+Sometimes you may want to apply a custom loader string to a language instead of letting `vue-loader` infer it. Or you may simply want to overwrite the built-in loader configuration for the default languages. To do that, add a `vue` block in your Webpack config file, and specify the `loaders` option.
+
+Example:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // vue-loader configurations
+  vue: {
+    // ... other vue options
+    loaders: {
+      // load all <script> without "lang" attribute with coffee-loader
+      js: 'coffee',
+      // load <template> directly as HTML string, without piping it
+      // through vue-html-loader first
+      html: 'raw'
+    }
+  }
+}
+```
+
+A more practical usage of the advanced loader configuration is [extracting CSS inside components into a single file](./extract-css.md).
diff --git a/docs/configurations/asset-url.md b/docs/configurations/asset-url.md
new file mode 100644
index 000000000..8118ee0f7
--- /dev/null
+++ b/docs/configurations/asset-url.md
@@ -0,0 +1,38 @@
+# Asset URL Handling
+
+By default, `vue-loader` automatically processes your style and template files with [css-loader](https://github.com/webpack/css-loader) and [vue-html-loader](https://github.com/vuejs/vue-html-loader) (which is just a Vue-specific fork of [html-loader](https://github.com/webpack/html-loader)). What this means is that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+
+For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives us some very powerful benefits by managing static assets this way:
+
+1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes. The best part though, is that you can use relative URLs based on the folder structure of your source files, and Webpack will auto-rewrite them into different URLs in the bundled files based on the configuration.
+
+2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically fallbacks to `file-loader`.
+
+Here's an example Webpack config that handles `.png`, `jpg` and `.gif` files, and inlining any file smaller than 10kb as base64 data URL:
+
+``` bash
+npm install url-loader file-loader --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    loaders: [
+      // ... other loaders
+      {
+        test: /\.(png|jpg|gif)$/,
+        loader: 'url',
+        query: {
+          // limit for base64 inlining in bytes
+          limit: 10000,
+          // custom naming format if file is larger than
+          // the threshold
+          name: '[name].[ext]?[hash]'
+        }
+      }
+    ]
+  }
+}
+```
diff --git a/docs/configurations/es2015.md b/docs/configurations/es2015.md
new file mode 100644
index 000000000..ff4aef70e
--- /dev/null
+++ b/docs/configurations/es2015.md
@@ -0,0 +1,70 @@
+# Configuring JavaScript in Vue Components
+
+### ES2015 by Default
+
+`vue-loader` ships with ES2015 enabled by default in `<script>` tags. All scripts inside Vue components are compiled with [Babel](https://babeljs.io/) using `babel-loader`.
+
+> **Compatibility Note**: `vue-loader` 7.0+ uses Babel 6. If you need to use Babel 5 for transpiling your code, use vue-loader 6.x.
+
+### Using Custom Babel Configuration
+
+The default Babel options used for scripts inside Vue components are:
+
+``` json
+{
+  "presets": ["es2015"],
+  "plugins": ["transform-runtime"]
+}
+```
+
+If you want to use custom presets or plugins, for example enable stage-0 language features, install the preset/plugin and then add a `babel` field in your Webpack config:
+
+``` bash
+npm install babel-preset-stage-0 --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  babel: {
+    // enable stage 0 babel transforms.
+    presets: ['es2015', 'stage-0'],
+    plugins: ['transform-runtime']
+  }
+}
+```
+
+### Compiling `.js` Files with Babel
+
+Since we are already using Babel, most likely you'll want to compile your normal `.js` files too! Here's how to do it in your Webpack config:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options ...
+  module: {
+    loaders: [
+      {
+        // use vue-loader for *.vue files
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+      {
+        // use babel-loader for *.js files
+        test: /\.js$/,
+        loader: 'babel',
+        // important: exclude files in node_modules
+        // otherwise it's going to be really slow!
+        exclude: /node_modules/
+      }
+    ]
+  },
+  // if you are using babel-loader directly then
+  // the babel config block becomes required.
+  babel: {
+    presets: ['es2015'],
+    plugins: ['transform-runtime']
+  }
+}
+```
diff --git a/docs/configurations/extract-css.md b/docs/configurations/extract-css.md
new file mode 100644
index 000000000..453e666a5
--- /dev/null
+++ b/docs/configurations/extract-css.md
@@ -0,0 +1,34 @@
+# Extracting CSS into a Single File
+
+Example config to extract all the processed CSS in all Vue components into a single CSS file:
+
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // you can also include <style lang="less"> or other langauges
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
diff --git a/docs/configurations/inline-loaders.md b/docs/configurations/inline-loaders.md
new file mode 100644
index 000000000..f322dabeb
--- /dev/null
+++ b/docs/configurations/inline-loaders.md
@@ -0,0 +1,62 @@
+# Inline Loaders
+
+`vue-loader` allows you to use other Webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
+
+### CSS
+
+For example, let's compile our `<style>` tag with SASS:
+
+``` bash
+npm install sass-loader --save-dev
+```
+
+``` html
+<style lang="sass">
+  /* write sass here */
+</style>
+```
+
+Under the hood, the text content inside the `<style>` tag will be first compiled by `sass-loader` before being passed on for further processing.
+
+### JavaScript
+
+All JavaScript inside Vue components are processed by `babel-loader` by default. But you can of course change it:
+
+``` bash
+npm install coffee-loader --save-dev
+```
+
+``` html
+<script lang="coffee">
+  # Write coffeesciprt!
+</script>
+```
+
+We will talk more about Babel/ES2015 configurations in another section.
+
+### Templates
+
+Processing templates is a little different, because most Webpack template loaders such as `jade-loader` returns a template function instead of compiled HTML string. So instead of using `jade-loader`, we will use `template-html-loader` plus the raw `jade` compiler:
+
+``` bash
+npm install template-html-loader jade --save-dev
+```
+
+``` html
+<template lang="jade">
+div
+  h1 Hello world!
+</template>
+```
+
+### Inline Loader Requests
+
+You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) in the `lang` attribute:
+
+``` html
+<style lang="sass?outputStyle=expanded">
+  /* use sass here with expanded output */
+</style>
+```
+
+However, note this makes your Vue component Webpack-specific and not compatible with Browserify and [vueify](https://github.com/vuejs/vueify). **If you intend to ship your Vue component as a reusable 3rd-party component, avoid using this syntax.**
diff --git a/docs/configurations/postcss.md b/docs/configurations/postcss.md
new file mode 100644
index 000000000..e80fe68fb
--- /dev/null
+++ b/docs/configurations/postcss.md
@@ -0,0 +1,49 @@
+# PostCSS and Autoprefixer
+
+Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for [scoped CSS](../features/scoped-css.md) rewriting and aut-prefixed by default using [autoprefixer](https://github.com/postcss/autoprefixer).
+
+### Configuring Autoprefixer
+
+You can configure autoprefixer using the `autoprefixer` option under the `vue` section of your webpack config. See possible [autoprefixer options](https://github.com/postcss/autoprefixer#options). Also, you can pass in `false` to disable autoprefixing.
+
+Example:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // vue-loader configurations
+  vue: {
+    // configure autoprefixer
+    autoprefixer: {
+      browsers: ['last 2 versions']
+    }
+  }
+}
+```
+
+### Using Custom PostCSS Plugins
+
+To use custom PostCSS pugins, pass an array to the `postcss` option under the `vue` section. Example using [CSSNext](http://cssnext.io/):
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  vue: {
+    // use custom postcss plugins
+    postcss: [require('cssnext')()],
+    // disable vue-loader autoprefixing.
+    // this is a good idea since cssnext comes with it too.
+    autoprefixer: false
+  }
+}
+```
diff --git a/docs/deploy.sh b/docs/deploy.sh
new file mode 100644
index 000000000..1242aaf57
--- /dev/null
+++ b/docs/deploy.sh
@@ -0,0 +1,10 @@
+cd docs
+rm -rf _book
+gitbook build
+cp assets/circle.yml _book/circle.yml
+cp assets/CNAME _book/CNAME
+cd _book
+git init
+git add -A
+git commit -m 'update book'
+git push -f git@github.com:vuejs/vue-loader.git master:gh-pages
diff --git a/docs/features/hot-reload.md b/docs/features/hot-reload.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/features/scoped-css.md b/docs/features/scoped-css.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/getting-started.md b/docs/getting-started.md
new file mode 100644
index 000000000..beac721df
--- /dev/null
+++ b/docs/getting-started.md
@@ -0,0 +1,176 @@
+# Getting Started
+
+### Syntax Highlighting
+
+First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+
+### Project Structure
+
+We are going to walk through setting up a Webpack + `vue-loader` project from scratch. If you are interested in ready-to-run examples, check out [vue-loader-example](https://github.com/vuejs/vue-loader-example) and [vue-hackernews](https://github.com/vuejs/vue-hackernews). However, if you are not already a Webpack expert, I highly recommend going through the following tutorial to understand how the pieces fit together.
+
+A simple `vue-loader` based project structure looks like this:
+
+``` bash
+.
+├── index.html
+├── main.js
+├── components
+│   ├── App.vue
+│   ├── ComponentA.vue
+│   └── ComponentB.vue
+├── package.json
+└── webpack.config.js
+```
+
+### Installing Dependencies
+
+Before we write any code, we need to install the proper NPM dependencies. Let's run:
+
+``` bash
+# Create a package.json file.
+# fill in the questions as you desire.
+npm init
+
+# Install everything we need
+npm install\
+  webpack webpack-dev-server\
+  vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
+  babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
+  babel-runtime@5\
+  --save-dev
+```
+
+That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
+
+You may also notice that we are using `babel-runtime` version 5 instead of the latest 6.x - this is [intentional](https://github.com/vuejs/vue-loader/issues/96#issuecomment-162910917).
+
+After proper installation, your `package.json`'s `devDependencies` field should look like this:
+
+``` json
+...
+  "devDependencies": {
+    "babel-core": "^6.3.17",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-transform-runtime": "^6.3.13",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-runtime": "^5.8.34",
+    "css-loader": "^0.23.0",
+    "style-loader": "^0.13.0",
+    "vue-hot-reload-api": "^1.2.2",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^7.2.0",
+    "webpack": "^1.12.9",
+    "webpack-dev-server": "^1.14.0"
+  },
+...
+```
+
+### Configuring Webpack
+
+Here's the most basic Webpack configuration for `vue-loader`:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // entry point of our application
+  entry: './main.js',
+  // where to place the compiled bundle
+  output: {
+    path: __dirname,
+    filename: 'build.js'
+  },
+  module: {
+    // `loaders` is an array of loaders to use.
+    // here we are only configuring vue-loader
+    loaders: [
+      {
+        test: /\.vue$/, // a regex for matching all files that end in `.vue`
+        loader: 'vue'   // loader to use for matched files
+      }
+    ]
+  }
+}
+```
+
+With the above configuration, when you write the following in your JavaScript code:
+
+``` js
+var MyComponent = require('./my-component.vue')
+```
+
+Webpack knows it needs to pipe the contents of `./my-component.vue` through `vue-loader`, because the filename matches the regex we provided in the config.
+
+### Creating Other Files
+
+The app entry point, `main.js` typically looks like this:
+
+``` js
+// main.js
+var Vue = require('vue')
+// require a *.vue component
+var App = require('./components/App.vue')
+
+// mount a root Vue instance
+new Vue({
+  el: 'body',
+  components: {
+    // include the required component
+    // in the options
+    app: App
+  }
+})
+```
+
+Inside a `*.vue` component's `<script>` tag, you can also require other `*.vue` components. For example in `./components/App.vue` (we will talk about ES2015 later):
+
+``` html
+<template>
+  <div class="app">
+    <component-a></component-a>
+    <component-b></component-b>
+  </div>
+</template>
+
+<script>
+module.exports = {
+  components: {
+    'component-a': require('./ComponentA.vue'),
+    'component-b': require('./ComponentB.vue')
+  }
+}
+</script>
+```
+
+Next, let's create an `index.html` that simply uses the bundled file:
+
+``` html
+<!-- index.html -->
+<body>
+  <app></app>
+  <script src="build.js"></script>
+</body>
+```
+
+### Running It
+
+Finally, it's time to get it running! We will simply use [NPM scripts](https://docs.npmjs.com/misc/scripts) as our task runner, which is sufficient in most cases. Add the following to your `package.json`:
+
+``` json
+...
+"scripts": {
+  "dev": "webpack-dev-server --inline --hot"
+}
+...
+```
+
+Then run:
+
+``` bash
+npm run dev
+```
+
+And you should see your app working at `http://localhost:8080`, with hot-reloading enabled!
+
+---
+
+[^(1)] If you are using NPM version 2.x, when you do `npm install vue-loader --save-dev` it will install and save all the peer dependencies for you. However, if you are using NPM 3.x, these peer dependencies will no longer be automatically installed. You will have to install them explicitly like we did above. Another way to deal with it is to simply copy `vue-loader`'s peer dependencies into your `package.json`'s `devDependencies` field and then run `npm install`.
diff --git a/docs/start/spec.md b/docs/start/spec.md
new file mode 100644
index 000000000..a420ce17f
--- /dev/null
+++ b/docs/start/spec.md
@@ -0,0 +1,78 @@
+# Vue Component Spec
+
+A `*.vue` file is a custom file format that uses HTML-like syntax to describe a Vue component. Each `*.vue` file consists of three types of top-level language blocks: `<template>`, `<script>` and `<style>`:
+
+``` html
+<template>
+  <div class="example">{{ msg }}</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello world!'
+    }
+  }
+}
+</script>
+
+<style>
+.example {
+  color: red;
+}
+</style>
+```
+
+`vue-loader` will parse the file, extract each language block, pipe them through other loaders if necessary, and finally assemble them back into a CommonJS module whose `module.exports` is a Vue.js component options object.
+
+`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. The details are discussed in [Inline Loaders](../configurations/inline-loaders.md).
+
+Some more details on the language blocks:
+
+### `<template>`
+
+- Default language: `html`.
+
+- Each `*.vue` file can contain at most one `<template>` block at a time.
+
+- Contents will be extracted as a string and used as the `template` option for the compiled Vue component. 
+
+### `<script>`
+
+- Default language: `js` (ES2015 is supported by default via Babel).
+
+- Each `*.vue` file can contain at most one `<script>` block at a time.
+
+- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via Webpack), which means you can `require()` other dependencies. And because ES2015 is supported by default, you can also use ES2015 `import` and `export` syntax.
+
+- The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
+
+### `<style>`
+
+- Defalt Language: `css`.
+
+- Multiple `<style>` tags are supported in a single `*.vue` file.
+
+- By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
+
+### Src Imports
+
+If you prefer splitting up your `*.vue` components into multiple files, you can use the `src` attribute to import an external file for a language block:
+
+``` html
+<template src="./template.html"></template>
+<style src="./style.css"></style>
+<script src="./script.js"></script>
+```
+
+Beware that `src` imports follow the same path resolution rules to CommonJS `require()` calls, which means for relative paths you need to start with `./`, and you can import resources directly from installed NPM packages, e.g:
+
+``` html
+<!-- import a file from the installed "todomvc-app-css" npm package -->
+<style src="todomvc-app-css/index.css">
+```
+
+### Syntax Highlighting
+
+Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
new file mode 100644
index 000000000..0088e9daa
--- /dev/null
+++ b/docs/start/tutorial.md
@@ -0,0 +1,175 @@
+# Basic Tutorial
+
+We are going to walk through setting up a Webpack + `vue-loader` project from scratch. If you are interested in ready-to-run examples, check out [vue-loader-example](https://github.com/vuejs/vue-loader-example) and [vue-hackernews](https://github.com/vuejs/vue-hackernews). However, if you are not already a Webpack expert, I highly recommend going through the following tutorial to understand how the pieces fit together.
+
+### Project Structure
+
+A simple `vue-loader` based project structure looks like this:
+
+``` bash
+.
+├── index.html
+├── main.js
+├── components
+│   ├── App.vue
+│   ├── ComponentA.vue
+│   └── ComponentB.vue
+├── package.json
+└── webpack.config.js
+```
+
+### Installing Dependencies
+
+Before we write any code, we need to install the proper NPM dependencies. Let's run:
+
+``` bash
+# Create a package.json file.
+# fill in the questions as you desire.
+npm init
+
+# Install everything we need
+npm install\
+  webpack webpack-dev-server\
+  vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
+  babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
+  babel-runtime@5\
+  --save-dev
+```
+
+That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
+
+You may also notice that we are using `babel-runtime` version 5 instead of the latest 6.x - this is [intentional](https://github.com/vuejs/vue-loader/issues/96#issuecomment-162910917).
+
+After proper installation, your `package.json`'s `devDependencies` field should look like this:
+
+``` json
+...
+  "devDependencies": {
+    "babel-core": "^6.3.17",
+    "babel-loader": "^6.2.0",
+    "babel-plugin-transform-runtime": "^6.3.13",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-runtime": "^5.8.34",
+    "css-loader": "^0.23.0",
+    "style-loader": "^0.13.0",
+    "vue-hot-reload-api": "^1.2.2",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^7.2.0",
+    "webpack": "^1.12.9",
+    "webpack-dev-server": "^1.14.0"
+  },
+...
+```
+
+### Configuring Webpack
+
+Here's the most basic Webpack configuration for `vue-loader`:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // entry point of our application
+  entry: './main.js',
+  // where to place the compiled bundle
+  output: {
+    path: __dirname,
+    filename: 'build.js'
+  },
+  module: {
+    // `loaders` is an array of loaders to use.
+    // here we are only configuring vue-loader
+    loaders: [
+      {
+        test: /\.vue$/, // a regex for matching all files that end in `.vue`
+        loader: 'vue'   // loader to use for matched files
+      }
+    ]
+  }
+}
+```
+
+With the above configuration, when you write the following in your JavaScript code:
+
+``` js
+var MyComponent = require('./my-component.vue')
+```
+
+Webpack knows it needs to pipe the contents of `./my-component.vue` through `vue-loader`, because the filename matches the regex we provided in the config.
+
+### Creating Other Files
+
+The app entry point, `main.js` typically looks like this:
+
+``` js
+// main.js
+var Vue = require('vue')
+// require a *.vue component
+var App = require('./components/App.vue')
+
+// mount a root Vue instance
+new Vue({
+  el: 'body',
+  components: {
+    // include the required component
+    // in the options
+    app: App
+  }
+})
+```
+
+Inside a `*.vue` component's `<script>` tag, you can also require other `*.vue` components. For example in `./components/App.vue` (we are using ES2015 syntax):
+
+``` html
+<template>
+  <div class="app">
+    <component-a></component-a>
+    <component-b></component-b>
+  </div>
+</template>
+
+<script>
+import ComponentA from './ComponentA.vue'
+import ComponentB from './ComponentB.vue'
+
+export default {
+  components: {
+    ComponentA,
+    ComponentB
+  }
+}
+</script>
+```
+
+Next, let's create an `index.html` that simply uses the bundled file:
+
+``` html
+<!-- index.html -->
+<body>
+  <app></app>
+  <script src="build.js"></script>
+</body>
+```
+
+### Running It
+
+Finally, it's time to get it running! We will simply use [NPM scripts](https://docs.npmjs.com/misc/scripts) as our task runner, which is sufficient in most cases. Add the following to your `package.json`:
+
+``` json
+...
+"scripts": {
+  "dev": "webpack-dev-server --inline --hot"
+}
+...
+```
+
+Then run:
+
+``` bash
+npm run dev
+```
+
+And you should see your app working at `http://localhost:8080`, with hot-reloading enabled!
+
+---
+
+[^(1)] If you are using NPM version 2.x, when you do `npm install vue-loader --save-dev` it will install and save all the peer dependencies for you. However, if you are using NPM 3.x, these peer dependencies will no longer be automatically installed. You will have to install them explicitly like we did above. Another way to deal with it is to simply copy `vue-loader`'s peer dependencies into your `package.json`'s `devDependencies` field and then run `npm install`.
diff --git a/docs/workflow/linting.md b/docs/workflow/linting.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/workflow/testing.md b/docs/workflow/testing.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/package.json b/package.json
index 572bba71b..40741295c 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,10 @@
     "webpack",
     "loader"
   ],
+  "files": [
+    "index.js",
+    "lib"
+  ],
   "author": "Sjoerd Visscher",
   "license": "MIT",
   "bugs": {
@@ -20,7 +24,9 @@
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
     "lint": "eslint lib",
-    "test": "eslint lib && mocha test/test.js --slow 5000 --timeout 10000"
+    "test": "eslint lib && mocha test/test.js --slow 5000 --timeout 10000",
+    "docs": "cd docs && gitbook serve",
+    "deploy-docs": "bash ./docs/deploy.sh"
   },
   "dependencies": {
     "autoprefixer": "^6.0.3",

From c3bb03f777ddb255dbfa06aeb9f586b984d507fb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 16 Dec 2015 21:49:34 -0500
Subject: [PATCH 151/877] more docs

---
 docs/README.md                | 36 ++++++++++++-------------
 docs/SUMMARY.md               |  3 ++-
 docs/configurations/es2015.md | 28 +++++++++++++++++---
 docs/features/hot-reload.md   | 40 ++++++++++++++++++++++++++++
 docs/features/scoped-css.md   | 49 +++++++++++++++++++++++++++++++++++
 docs/start/spec.md            | 18 +++++++++----
 docs/workflow/production.md   |  0
 7 files changed, 146 insertions(+), 28 deletions(-)
 create mode 100644 docs/workflow/production.md

diff --git a/docs/README.md b/docs/README.md
index 0b637ab50..5831686d9 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,10 +1,26 @@
 # Introduction
 
+### What is `vue-loader`?
+
+`vue-loader` is a loader for Webpack that can transform Vue components written in the following format into a plain JavaScript module:
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+There are many cool features provided by `vue-loader`:
+
+- ES2015 enabled by default;
+- Allows using other Webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
+- Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with Webpack loaders;
+- Can simulate scoped CSS for each component;
+- Supports component hot-reloading during development.
+
+In a nutshell, the combination of Webpack and `vue-loader` gives you a modern, flexible and extremely powerful front-end workflow for authoring Vue.js applications.
+
 ### What is Webpack?
 
-Before we talk about `vue-loader`, let's first introduce [Webpack](http://webpack.github.io/). If you are already familiar with Webpack, feel free to skip the following explanation. But for those of you who are new to Webpack, here's a quick intro:
+If you are already familiar with Webpack, feel free to skip the following explanation. But for those of you who are new to Webpack, here's a quick intro:
 
-Webpack is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
+[Webpack](http://webpack.github.io/) is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
@@ -19,19 +35,3 @@ But Webpack can do more than that. With "loaders", we can teach Webpack to trans
 - Process an image file referenced in HTML or CSS, moved it to the desired destination based on the path configurations, and naming it using its md5 hash.
 
 Webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using Webpack with Vue.js and `vue-loader`.
-
-### What is `vue-loader`?
-
-`vue-loader` is a loader for Webpack that can transform Vue components written in the following format into a plain JavaScript module:
-
-![screenshot](http://blog.evanyou.me/images/vue-component.png)
-
-There are many cool features provided by `vue-loader`:
-
-- ES2015 enabled by default;
-- Allows using other Webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
-- Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with Webpack loaders;
-- Can simulate scoped CSS for each component;
-- Supports component hot-reloading during development.
-
-In a nutshell, the combination of Webpack and `vue-loader` gives you a modern, flexible and extremely powerful front-end workflow for authoring Vue.js applications.
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 7a8d95a6c..4946fecbb 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -4,7 +4,7 @@
 - Configurations
   - [Inline Loaders](configurations/inline-loaders.md)
   - [Asset URL Handling](configurations/asset-url.md)
-  - [Babel and ES2015](configurations/es2015.md)
+  - [ES2015 and Babel](configurations/es2015.md)
   - [PostCSS and Autoprefixer](configurations/postcss.md)
   - [Advanced Loader Configuration](configurations/advanced.md)
   - [Extracting CSS File](configurations/extract-css.md)
@@ -14,3 +14,4 @@
 - Workflow
   - [Linting](workflow/linting.md)
   - [Testing](workflow/testing.md)
+  - [Production Build](workflow/production.md)
diff --git a/docs/configurations/es2015.md b/docs/configurations/es2015.md
index ff4aef70e..d849356bf 100644
--- a/docs/configurations/es2015.md
+++ b/docs/configurations/es2015.md
@@ -1,13 +1,33 @@
-# Configuring JavaScript in Vue Components
+# ES2015 and Babel Configuration
 
-### ES2015 by Default
+`vue-loader` ships with ES2015 (aka ES6) enabled by default in `<script>` tags. All scripts inside Vue components are compiled with [Babel](https://babeljs.io/) using `babel-loader`. If you haven't picked up the new language features yet, you definitely should. Some good learning resources:
 
-`vue-loader` ships with ES2015 enabled by default in `<script>` tags. All scripts inside Vue components are compiled with [Babel](https://babeljs.io/) using `babel-loader`.
+- [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+- [ES6 Features](https://github.com/lukehoban/es6features)
+- [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
 
-> **Compatibility Note**: `vue-loader` 7.0+ uses Babel 6. If you need to use Babel 5 for transpiling your code, use vue-loader 6.x.
+Here's a typical pattern you will see when importing other Vue components:
+
+``` html
+<script>
+import ComponentA from './ComponentA.vue'
+import ComponentB from './ComponentB.vue'
+
+export default {
+  components: {
+    ComponentA,
+    ComponentB
+  }
+}
+</script>
+```
+
+We are using ES2015's Object literal shorthand here to define the child components. `{ ComponentA }` is simply shorthand for `{ ComponentA: ComponentA }`. Vue will automatically convert the key to `component-a`, so you can use the imported component in the template as `<component-a>`.
 
 ### Using Custom Babel Configuration
 
+> **Compatibility Note**: `vue-loader` 7.0+ uses Babel 6. If you need to use Babel 5 for transpiling your code, use vue-loader 6.x.
+
 The default Babel options used for scripts inside Vue components are:
 
 ``` json
diff --git a/docs/features/hot-reload.md b/docs/features/hot-reload.md
index e69de29bb..53e668b22 100644
--- a/docs/features/hot-reload.md
+++ b/docs/features/hot-reload.md
@@ -0,0 +1,40 @@
+# Hot Reload
+
+"Hot Reload" is not simply reloading the page when you edit a file. With hot reload enabled, when you edit a `*.vue` file, all instances of that component will be swapped in **without reloading the page**. It even preserves the current state of your app and these swapped components! This dramatically improves the development experience when you are tweaking the templates or styling of your components.
+
+![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
+
+### Enabling Hot Reload
+
+The easiest setup for enabling hot reload is what we outlined in the [basic tutorial](../start/tutorial.md):
+
+``` js
+// package.json
+"scripts": {
+  "dev": "webpack-dev-server --inline --hot"
+}
+```
+
+This is assuming that you are serving the same `index.html` from the root of your project. By default, Webpack dev server uses the current working directory as its content base and serves all static files in the directory.
+
+Run `npm run dev` and the static app will be served at `http://localhost:8080`.
+
+### Hot Reload Notes
+
+- When a component is hot-reloaded, its current state is preserved. However, the component itself is destroyed and recreated, so all of its lifecycle hooks will be called accordingly. Make sure to properly teardown any side effects in your lifecycle hooks.
+
+- Private state for child components of a hot-reloaded component is not guaranteed to be preserved across reloads.
+
+- A root Vue instance or a manually mounted instance cannot be hot-reloaded. It will always force a full reload.
+
+### Configuration Tips
+
+- You can use the `--port` option to serve at a different port.
+
+- If your file structure is different, you will have to configure `output.publicPath` in your Webpack config and the `--content-base` option of your webpack-dev-server command accordingly.
+
+- If you are using the HTML5 history API (for example with `vue-router`), you will also want to add the `--history-api-fallback` option.
+
+- Consult the [Webpack dev server documentation](https://webpack.github.io/docs/webpack-dev-server.html) for advanced topics such as combining the dev server with another backend server.
+
+- Finally, if you have an existing [Express](http://expressjs.com/en/index.html) based Node.js backend, you can just add the [Webpack dev middleware](https://webpack.github.io/docs/webpack-dev-middleware.html) to serve your webpack bundle.
diff --git a/docs/features/scoped-css.md b/docs/features/scoped-css.md
index e69de29bb..96bd72874 100644
--- a/docs/features/scoped-css.md
+++ b/docs/features/scoped-css.md
@@ -0,0 +1,49 @@
+# Scoped CSS
+
+When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM. It comes with some caveats, but doesn't require any polyfills. It is achieved by using PostCSS to transform the following:
+
+``` html
+<style scoped>
+.example {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+Into the following:
+
+``` html
+<style>
+.example[_v-f3f3eg9] {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example" _v-f3f3eg9>hi</div>
+</template>
+```
+
+#### Notes
+
+1. You can include both scoped and non-scoped styles in the same component:
+
+  ``` html
+  <style>
+  /* global styles */
+  </style>
+
+  <style scoped>
+  /* local styles */
+  </style>
+  ```
+
+2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
+
+3. Partials are not affected by scoped styles.
+
+4. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
diff --git a/docs/start/spec.md b/docs/start/spec.md
index a420ce17f..06b7d0082 100644
--- a/docs/start/spec.md
+++ b/docs/start/spec.md
@@ -26,11 +26,19 @@ export default {
 
 `vue-loader` will parse the file, extract each language block, pipe them through other loaders if necessary, and finally assemble them back into a CommonJS module whose `module.exports` is a Vue.js component options object.
 
-`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. The details are discussed in [Inline Loaders](../configurations/inline-loaders.md).
+`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. For example, you can use SASS for the style of your component like this:
 
-Some more details on the language blocks:
+``` html
+<style lang="sass">
+  /* write SASS! */
+</style>
+```
+
+More details can be found in [Inline Loaders](../configurations/inline-loaders.md).
+
+### Language Blocks
 
-### `<template>`
+#### `<template>`
 
 - Default language: `html`.
 
@@ -38,7 +46,7 @@ Some more details on the language blocks:
 
 - Contents will be extracted as a string and used as the `template` option for the compiled Vue component. 
 
-### `<script>`
+#### `<script>`
 
 - Default language: `js` (ES2015 is supported by default via Babel).
 
@@ -48,7 +56,7 @@ Some more details on the language blocks:
 
 - The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
 
-### `<style>`
+#### `<style>`
 
 - Defalt Language: `css`.
 
diff --git a/docs/workflow/production.md b/docs/workflow/production.md
new file mode 100644
index 000000000..e69de29bb

From dc8b13c56eb8a752625b1a3d27fe1b3a3eeb5d85 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 16 Dec 2015 22:46:12 -0500
Subject: [PATCH 152/877] almost done

---
 docs/SUMMARY.md             |  2 +-
 docs/features/hot-reload.md |  2 ++
 docs/start/tutorial.md      | 11 +++++++++--
 docs/workflow/linting.md    | 35 +++++++++++++++++++++++++++++++++
 docs/workflow/production.md | 39 +++++++++++++++++++++++++++++++++++++
 docs/workflow/testing.md    |  3 +++
 6 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 4946fecbb..34f82b6f6 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -12,6 +12,6 @@
   - [Scoped CSS](features/scoped-css.md)
   - [Hot Reload](features/hot-reload.md)
 - Workflow
+  - [Production Build](workflow/production.md)
   - [Linting](workflow/linting.md)
   - [Testing](workflow/testing.md)
-  - [Production Build](workflow/production.md)
diff --git a/docs/features/hot-reload.md b/docs/features/hot-reload.md
index 53e668b22..57672d606 100644
--- a/docs/features/hot-reload.md
+++ b/docs/features/hot-reload.md
@@ -10,9 +10,11 @@ The easiest setup for enabling hot reload is what we outlined in the [basic tuto
 
 ``` js
 // package.json
+...
 "scripts": {
   "dev": "webpack-dev-server --inline --hot"
 }
+...
 ```
 
 This is assuming that you are serving the same `index.html` from the root of your project. By default, Webpack dev server uses the current working directory as its content base and serves all static files in the directory.
diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index 0088e9daa..494d38e7e 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -157,7 +157,8 @@ Finally, it's time to get it running! We will simply use [NPM scripts](https://d
 ``` json
 ...
 "scripts": {
-  "dev": "webpack-dev-server --inline --hot"
+  "dev": "webpack-dev-server --inline --hot",
+  "build": "webpack -p"
 }
 ...
 ```
@@ -168,7 +169,13 @@ Then run:
 npm run dev
 ```
 
-And you should see your app working at `http://localhost:8080`, with hot-reloading enabled!
+And you should see your app working at `http://localhost:8080`, with hot-reloading enabled! To build, minify and write your bundle to disk, run:
+
+``` bash
+npm run build
+```
+
+Note that Webpack uses the `webpack.config.js` if it finds one. If you named your Webpack config file with a different name, you need to specify it using the `--config /path/to/your/file` command line option.
 
 ---
 
diff --git a/docs/workflow/linting.md b/docs/workflow/linting.md
index e69de29bb..97dba9e6c 100644
--- a/docs/workflow/linting.md
+++ b/docs/workflow/linting.md
@@ -0,0 +1,35 @@
+# Linting
+
+You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
+
+When using ESLint directly, you can use it with the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) with also supports extracting and linting the JavaScript inside `*.vue` files.
+
+Another option is using the [eslint-loader](https://github.com/MoOx/eslint-loader), and configure it to lint the JavaScript code in `*.vue` files directly:
+
+``` bash
+npm install eslint eslint-loader --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  vue: {
+    loaders: {
+      js: 'babel!eslint'
+    }
+  },
+  babel: {
+    presets: ['es2015'],
+    plugins: ['transform-runtime']
+  }
+}
+```
+
+Two things to note here:
+
+1. We are overwriting the default loader string for all JavaScript in `*.vue` files - if we still want ES2015, we need to explicitly apply `babel-loader` and related configurations.
+
+2. Webpack loader chains are applied right-first. Make sure to apply `eslint` before `babel` so we are linting the pre-compile source code.
+
+And don't forget to create your `.eslintrc` config. Now when you run `webpack-dev-server`, you'll get instant lint warnings as you save the file!
diff --git a/docs/workflow/production.md b/docs/workflow/production.md
index e69de29bb..1993406bf 100644
--- a/docs/workflow/production.md
+++ b/docs/workflow/production.md
@@ -0,0 +1,39 @@
+# Production Build
+
+There are two things to do when building our bundle for production:
+
+1. Minify our application code;
+2. Use the [setup described in the Vue.js guide](http://vuejs.org/guide/application.html#Deploying_for_Production) to strip all the warnings from Vue.js source code.
+
+Here's an example config:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  plugins: [
+    // short-circuits all Vue.js warning code
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    // minify with dead-code elimination
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    // optimize module ids by occurence count
+    new webpack.optimize.OccurenceOrderPlugin()
+  ]
+}
+```
+
+Obviously we don't want to use this config during development, so there are several ways to approach this:
+
+1. Dynamically build up the configuration object based on an environment variable, as shown in [vue-loader-example](https://github.com/vuejs/vue-loader-example/blob/master/webpack.config.js#L40-L56);
+
+2. Use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file.
+
+It's really up to you as long as it achieves the goal.
diff --git a/docs/workflow/testing.md b/docs/workflow/testing.md
index e69de29bb..02403d889 100644
--- a/docs/workflow/testing.md
+++ b/docs/workflow/testing.md
@@ -0,0 +1,3 @@
+# Testing
+
+### Karma + karma-webpack

From dcb164bc8387ebee76124f550acf5c5c425f4acc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 17 Dec 2015 18:33:48 -0500
Subject: [PATCH 153/877] restructure docs

---
 docs/SUMMARY.md                                      | 12 ++++++------
 .../{inline-loaders.md => pre-processors.md}         |  4 ++--
 docs/{configurations => features}/es2015.md          |  2 +-
 docs/{configurations => features}/postcss.md         |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename docs/configurations/{inline-loaders.md => pre-processors.md} (84%)
 rename docs/{configurations => features}/es2015.md (93%)
 rename docs/{configurations => features}/postcss.md (86%)

diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 34f82b6f6..7c675e154 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -1,16 +1,16 @@
 - Getting Started
   - [Vue Component Spec](start/spec.md)
   - [Basic Tutorial](start/tutorial.md)
+- Features
+  - [ES2015 and Babel](features/es2015.md)
+  - [Scoped CSS](features/scoped-css.md)
+  - [PostCSS and Autoprefixer](features/postcss.md)
+  - [Hot Reload](features/hot-reload.md)
 - Configurations
-  - [Inline Loaders](configurations/inline-loaders.md)
+  - [Pre-Processors](configurations/pre-processors.md)
   - [Asset URL Handling](configurations/asset-url.md)
-  - [ES2015 and Babel](configurations/es2015.md)
-  - [PostCSS and Autoprefixer](configurations/postcss.md)
   - [Advanced Loader Configuration](configurations/advanced.md)
   - [Extracting CSS File](configurations/extract-css.md)
-- Features
-  - [Scoped CSS](features/scoped-css.md)
-  - [Hot Reload](features/hot-reload.md)
 - Workflow
   - [Production Build](workflow/production.md)
   - [Linting](workflow/linting.md)
diff --git a/docs/configurations/inline-loaders.md b/docs/configurations/pre-processors.md
similarity index 84%
rename from docs/configurations/inline-loaders.md
rename to docs/configurations/pre-processors.md
index f322dabeb..6a128dae4 100644
--- a/docs/configurations/inline-loaders.md
+++ b/docs/configurations/pre-processors.md
@@ -1,6 +1,6 @@
-# Inline Loaders
+# Using Pre-Processors
 
-`vue-loader` allows you to use other Webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
+In Webpack, all pre-processors need to be applied with a corresponding loader. `vue-loader` allows you to use other Webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
 
 ### CSS
 
diff --git a/docs/configurations/es2015.md b/docs/features/es2015.md
similarity index 93%
rename from docs/configurations/es2015.md
rename to docs/features/es2015.md
index d849356bf..4862861aa 100644
--- a/docs/configurations/es2015.md
+++ b/docs/features/es2015.md
@@ -37,7 +37,7 @@ The default Babel options used for scripts inside Vue components are:
 }
 ```
 
-If you want to use custom presets or plugins, for example enable stage-0 language features, install the preset/plugin and then add a `babel` field in your Webpack config:
+If you want to use custom presets or plugins, for example, to enable stage-0 language features, install the preset/plugin and then add a `babel` field in your Webpack config:
 
 ``` bash
 npm install babel-preset-stage-0 --save-dev
diff --git a/docs/configurations/postcss.md b/docs/features/postcss.md
similarity index 86%
rename from docs/configurations/postcss.md
rename to docs/features/postcss.md
index e80fe68fb..ca45bd05e 100644
--- a/docs/configurations/postcss.md
+++ b/docs/features/postcss.md
@@ -1,6 +1,6 @@
 # PostCSS and Autoprefixer
 
-Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for [scoped CSS](../features/scoped-css.md) rewriting and aut-prefixed by default using [autoprefixer](https://github.com/postcss/autoprefixer).
+Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for scoped CSS rewriting and auto-prefixed by default using [autoprefixer](https://github.com/postcss/autoprefixer).
 
 ### Configuring Autoprefixer
 

From d9f50e08af7a9075bd7a3d29df98a3a59362140d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 17 Dec 2015 23:59:00 -0500
Subject: [PATCH 154/877] finish docs

---
 docs/workflow/production.md |  4 +-
 docs/workflow/testing.md    | 92 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/docs/workflow/production.md b/docs/workflow/production.md
index 1993406bf..fe25b559f 100644
--- a/docs/workflow/production.md
+++ b/docs/workflow/production.md
@@ -32,8 +32,8 @@ module.exports = {
 
 Obviously we don't want to use this config during development, so there are several ways to approach this:
 
-1. Dynamically build up the configuration object based on an environment variable, as shown in [vue-loader-example](https://github.com/vuejs/vue-loader-example/blob/master/webpack.config.js#L40-L56);
+1. Dynamically build up the configuration object based on an environment variable;
 
-2. Use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file.
+2. Or, use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-loader-example](https://github.com/vuejs/vue-loader-example/tree/master/build).
 
 It's really up to you as long as it achieves the goal.
diff --git a/docs/workflow/testing.md b/docs/workflow/testing.md
index 02403d889..4365abd98 100644
--- a/docs/workflow/testing.md
+++ b/docs/workflow/testing.md
@@ -1,3 +1,93 @@
 # Testing
 
-### Karma + karma-webpack
+When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+
+Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:
+
+``` bash
+npm install\
+  karma karma-webpack\
+  karma-jasmine jasmine-core\
+  karma-phantomjs-launcher phantomjs\
+  --save-dev
+```
+
+``` js
+// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    browsers: ['PhantomJS'],
+    frameworks: ['jasmine'],
+    // this is the entry file for all our tests.
+    files: ['test/index.js'],
+    // we will pass the entry file to webpack for bundling.
+    preprocessors: {
+      'test/index.js': ['webpack']
+    },
+    // we can just use the exact same webpack config by requiring it
+    webpack: require('./webpack.config.js'),
+    // avoid walls of useless text
+    webpackMiddleware: {
+      noInfo: true
+    },
+    singleRun: true
+  })
+}
+```
+
+And for the entry `test/index.js` file:
+
+``` js
+// test/index.js
+// require all test files using special Webpack feature
+// https://webpack.github.io/docs/context.html#require-context
+var testsContext = require.context('.', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+```
+
+This entry file simply requires all other files that ends in `.spec.js` in the same folder. Now we can actually write some tests:
+
+``` js
+// test/component-a.spec.js
+var Vue = require('vue')
+var ComponentA = require('../../src/components/a.vue')
+
+describe('a.vue', function () {
+
+  // asserting JavaScript options
+  it('should have correct message', function () {
+    expect(ComponentA.data().msg).toBe('Hello from Component A!')
+  })
+
+  // asserting rendered result by actually rendering the component
+  it('should render correct message', function () {
+    var vm = new Vue({
+      template: '<div><test></test></div>',
+      components: {
+        'test': ComponentA
+      }
+    }).$mount()
+    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
+  })
+})
+```
+
+To run the tests, add the following NPM script:
+
+``` js
+// package.json
+...
+"scripts": {
+  ...
+  "test": "karma start karma.conf.js"
+}
+...
+```
+
+Finally, run:
+
+``` bash
+npm test
+```
+
+Again, [vue-loader-example](https://github.com/vuejs/vue-loader-example) contains a fully working example with tests.

From 0d8ab8d2785285c28cef7db7b5190f0f57fdd34e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 18 Dec 2015 00:03:20 -0500
Subject: [PATCH 155/877] simplify readme

---
 README.md | 319 +-----------------------------------------------------
 1 file changed, 5 insertions(+), 314 deletions(-)

diff --git a/README.md b/README.md
index 59d9fd2fe..e6f0cf0ba 100644
--- a/README.md
+++ b/README.md
@@ -1,323 +1,14 @@
 # vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://badge.fury.io/js/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
 
-> Vue.js component loader for [Webpack](http://webpack.github.io), using Webpack loaders for the parts.
+> Vue.js component loader for [Webpack](http://webpack.github.io).
 
 It allows you to write your components in this format:
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
-## Table of Contents
+For detailed usage, checkout the [documentation](http://vuejs.github.io/vue-loader/).
 
+There are also some example projects:
 
-- [Basic Usage](#basic-usage)
-- [ES2015 by Default](#es2015-by-default)
-- [CSS Pre-Processors](#css-pre-processors)
-- [PostCSS](#postcss)
-- [Template Pre-Processors](#template-pre-processors)
-- [Src Imports](#src-imports)
-- [Asset URL Handling](#asset-url-handling)
-- [Scoped CSS](#scoped-css)
-- [Hot Reload](#hot-reload)
-- [Syntax Highlighting](#syntax-highlighting)
-- [Linting](#linting)
-- [Testing](#testing)
-- [Advanced Loader Configuration](#advanced-loader-configuration)
-- [Example Project](https://github.com/vuejs/vue-loader-example)
-
-## Basic Usage
-
-Config Webpack:
-
-``` js
-// webpack.config.js
-module.exports = {
-  entry: './main.js',
-  output: {
-    filename: 'build.js'
-  },
-  module: {
-    loaders: [
-      { test: /\.vue$/, loader: 'vue' },
-    ]
-  }
-}
-```
-
-And this is all you need to do in your main entry file:
-
-``` js
-// main.js
-var Vue = require('vue')
-var App = require('./app.vue')
-
-new Vue({
-  el: 'body',
-  components: {
-    app: App
-  }
-})
-```
-
-In your HTML:
-
-``` html
-<body>
-  <app></app>
-  <script src="build.js"></script>
-</body>
-```
-
-## ES2015 by Default
-
-`vue-loader` automatically applies Babel transforms to the JavaScript inside `*.vue` components. Write ES2015 today!
-
-**Compatibility Note:** vue-loader 7.0+ uses Babel 6. If you need to use Babel 5 for transpiling your code, use vue-loader 6.x.
-
-The default Babel options used for Vue.js components are:
-
-``` js
-{
-  presets: ['es2015'],
-  plugins: ['transform-runtime']
-}
-```
-
-If you wish to override this, you can add a `babel` field in your webpack config, which will be applied to all JavaScript processed by `babel-loader`. For example:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other configs...
-  babel: {
-    // enable stage 0 transforms.
-    // make sure to install babel-presets-stage-0
-    presets: ['es2015', 'stage-0'],
-    plugins: ['transform-runtime']
-  }
-}
-```
-
-## CSS Pre-Processors
-
-`vue-loader` allows you to use other Webpack loaders to pre-process the different parts inside your `*.vue` components. Just specify the loader to use with the `lang` attribute (you also need to install the loader, obviously):
-
-``` html
-<style lang="stylus">
-  /* use stylus here */
-</style>
-```
-
-You can also include Webpack loader queries in the `lang` attribute:
-
-``` html
-<style lang="sass?outputStyle=expanded">
-  /* use sass here with expanded output */
-</style>
-```
-
-## PostCSS
-
-Any CSS output via `vue-loader` 6.0+ is piped through [PostCSS](https://github.com/postcss/postcss) for [scoped CSS](#scoped-css) rewriting and aut-prefixed by default using [autoprefixer](https://github.com/postcss/autoprefixer). You can configure autoprefixer or provide your own PostCSS plugins in the `vue` section of your webpack config:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other configs...
-  vue: {
-    // configure autoprefixer
-    autoprefixer: {
-      browsers: ['last 2 versions']
-    }
-  }
-}
-```
-
-Using other PostCSS plugins:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other configs...
-  vue: {
-    // use custom postcss plugins
-    postcss: [require('cssnext')()],
-    // disable vue-loader autoprefixing.
-    // this is a good idea since cssnext comes with it too.
-    autoprefixer: false
-  }
-}
-```
-
-## Template Pre-Processors
-
-For template pre-processors, you should install `template-html-loader` plus the raw templating engine. For example to use `jade`, you will need to install both `template-html-loader` and `jade` instead of `jade-loader`.
-
-## Src Imports
-
-If you want, you can separate your templates, styles or scripts into separate files and import them using the `src` attribute:
-
-``` html
-<template src="./template.html"></template>
-<style src="./style.css"></style>
-<script src="./script.js"></script>
-```
-
-Beware that `src` imports follow similar rules to `require()` calls, which means for relative paths you need to start with `./`, and you can import resources from installed NPM packages, e.g. `<style src="todomvc-app-css/index.css">`.
-
-## Asset URL Handling
-
-By default, `vue-loader` automatically processes your style and template files with `css-loader` and `vue-html-loader` - this means that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
-
-For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives you some very powerful benefits in managing your static assets this way:
-
-1. `file-loader` allows you to customize where to copy and place the asset file (by specifying `publicPath` in your Webpack config), and how they should be named with version hashes.
-
-2. `url-loader` allows you to conditionally load a file as a inline Data URL if they are smaller than a given threshold.
-
-For more details, see the respective documentations for [vue-html-loader](https://github.com/vuejs/vue-html-loader) and [css-loader](https://github.com/webpack/css-loader).
-
-## Scoped CSS
-
-> Experimental
-
-When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM, but doesn't require any polyfills. It is achieved by using PostCSS to transform the following:
-
-``` html
-<style scoped>
-.example {
-  color: red;
-}
-</style>
-<template>
-  <div class="example">hi</div>
-</template>
-```
-
-Into the following:
-
-``` html
-<style>
-.example[_v-f3f3eg9] {
-  color: red;
-}
-</style>
-<template>
-  <div class="example" _v-f3f3eg9>hi</div>
-</template>
-```
-
-#### Notes
-
-1. You can include both scoped and non-scoped styles in the same component.
-
-2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
-
-3. If you are nesting a component inside itself, the styles may still leak down since they are considered the same component.
-
-4. Partials are not affected by scoped styles.
-
-## Hot Reload
-
-> Experimental
-
-When using `webpack-dev-server` in hot mode, `vue-loader` enables hot component reloading for Vue.js 1.0.0+. An example config:
-
-``` js
-// webpack.config.js
-module.exports = {
-  entry: './src/main.js',
-  output: {
-    publicPath: '/static/',
-    filename: 'build.js'
-  },
-  module: {
-    loaders: [
-      { test: /\.vue$/, loader: 'vue' },
-    ]
-  },
-  devtool: '#source-map'
-}
-```
-
-In `index.html`, include the bundle:
-
-``` html
-<script src="static/build.js"></script>
-```
-
-Then, run the dev server with:
-
-``` bash
-webpack-dev-server --inline --hot
-```
-
-Finally, visit `http://localhost:8080/` to see the app with hot reloading.
-
-For a complete example with hot reloading in action, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).
-
-### Hot Reload Notes
-
-- When a component is hot-reloaded, its current state is preserved. However, the component itself is destroyed and recreated, so all of its lifecycle hooks will be called accordingly. Make sure to properly teardown any side effects in your lifecycle hooks.
-
-- Private state for child components of a hot-reloaded component is not guaranteed to be preserved across reloads.
-
-- A root Vue instance or a manually mounted instance cannot be hot-reloaded. It will always force a full reload.
-
-## Advanced Loader configuration
-
-By default, `vue-loader` will try to use the loader with the same name as
-the `lang` attribute, but you can configure which loader should be used.
-
-#### Example: Use CoffeeScript for all `<script>` tags
-
-``` js
-module.exports = {
-  // entry, output...
-  module: {
-    loaders: [{
-      test: /\.vue$/, loader: 'vue'
-    }]
-  },
-  vue: {
-    loaders: {
-      js: 'coffee'
-    }
-  },
-  devtool: '#source-map'
-}
-```
-
-#### Example: Extracting CSS into a Single File
-
-To extract out the generated css into a separate file,
-use this Webpack config:
-
-``` js
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-
-module.exports = {
-  // entry, output...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/, loader: 'vue'
-      },
-    ]
-  },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      stylus: ExtractTextPlugin.extract("css!stylus")
-    }
-  },
-  plugins: [
-    new ExtractTextPlugin("[name].css")
-  ]
-}
-```
-
-## Example Project
-
-For a simple setup example, see [vue-loader-example](https://github.com/vuejs/vue-loader-example).
-
-For an actual project with dev setup with hot reloading and production setup with minification, see [vue-hackernews](https://github.com/vuejs/vue-hackernews).
+- [vue-loader-example](https://github.com/vuejs/vue-loader-example/)
+- [vue-hackernews](https://github.com/vuejs/vue-hackernews)

From 689e9f1964672d829fa21edcd132563e88136862 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 18 Dec 2015 10:31:56 -0500
Subject: [PATCH 156/877] fix link

---
 docs/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/start/spec.md b/docs/start/spec.md
index 06b7d0082..a29234813 100644
--- a/docs/start/spec.md
+++ b/docs/start/spec.md
@@ -34,7 +34,7 @@ export default {
 </style>
 ```
 
-More details can be found in [Inline Loaders](../configurations/inline-loaders.md).
+More details can be found in [Using Pre-Processors](../configurations/pre-processors.md).
 
 ### Language Blocks
 

From 137431bbf1b0f853730e495f8a2b72475140aa7d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 18 Dec 2015 10:35:33 -0500
Subject: [PATCH 157/877] edits

---
 docs/configurations/pre-processors.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/configurations/pre-processors.md b/docs/configurations/pre-processors.md
index 6a128dae4..395931838 100644
--- a/docs/configurations/pre-processors.md
+++ b/docs/configurations/pre-processors.md
@@ -32,8 +32,6 @@ npm install coffee-loader --save-dev
 </script>
 ```
 
-We will talk more about Babel/ES2015 configurations in another section.
-
 ### Templates
 
 Processing templates is a little different, because most Webpack template loaders such as `jade-loader` returns a template function instead of compiled HTML string. So instead of using `jade-loader`, we will use `template-html-loader` plus the raw `jade` compiler:

From fe37d75e630d610d8eacb69377142c2f37faa3ff Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 18 Dec 2015 12:41:29 -0500
Subject: [PATCH 158/877] update docs regarding babelrc

---
 docs/features/es2015.md | 2 ++
 lib/loader.js           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/features/es2015.md b/docs/features/es2015.md
index 4862861aa..dae2dd4f8 100644
--- a/docs/features/es2015.md
+++ b/docs/features/es2015.md
@@ -55,6 +55,8 @@ module.exports = {
 }
 ```
 
+Alternatively, you can add a `.babelrc` file at the root of your project.
+
 ### Compiling `.js` Files with Babel
 
 Since we are already using Babel, most likely you'll want to compile your normal `.js` files too! Here's how to do it in your Webpack config:
diff --git a/lib/loader.js b/lib/loader.js
index 4cdc2de66..265607873 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -36,7 +36,7 @@ module.exports = function (content) {
 
   // respect user babel options
   if (this.options.babel) {
-    defaultLoaders.js = 'babel'
+    defaultLoaders.js = 'babel-loader'
   }
 
   // check if there are custom loaders specified with

From 72c0ab4cf627437081291177d34a337f1f929d2a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 19 Dec 2015 11:26:56 -0500
Subject: [PATCH 159/877] add vscode syntax highlight

---
 docs/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/start/spec.md b/docs/start/spec.md
index a29234813..1671f67d4 100644
--- a/docs/start/spec.md
+++ b/docs/start/spec.md
@@ -83,4 +83,4 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 
 ### Syntax Highlighting
 
-Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue) and [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.

From 7b37fa9265fdb69c0150bc7d81d60fd7812cba54 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Dec 2015 17:39:05 -0500
Subject: [PATCH 160/877] add dependency injection feature

---
 lib/loader.js            | 71 +++++++++++++++++++++++++---------------
 package.json             |  1 +
 test/fixtures/inject.js  |  1 +
 test/fixtures/inject.vue | 15 +++++++++
 test/test.js             | 15 +++++++++
 5 files changed, 76 insertions(+), 27 deletions(-)
 create mode 100644 test/fixtures/inject.js
 create mode 100644 test/fixtures/inject.vue

diff --git a/lib/loader.js b/lib/loader.js
index 265607873..eddabdee1 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -27,8 +27,8 @@ module.exports = function (content) {
   var self = this
   this.cacheable()
   var cb = this.async()
-  var output = ''
   var options = this.options.vue || {}
+  var query = loaderUtils.parseQuery(this.query)
   var vueUrl = loaderUtils.getRemainingRequest(this)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
@@ -80,6 +80,7 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = getRewriter(type, scoped)
+    var injectString = (type === 'script' && query.inject) ? 'inject!' : ''
     if (loader !== undefined) {
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
@@ -90,7 +91,7 @@ module.exports = function (content) {
       } else {
         loader = ensureBang(loader) + rewriter
       }
-      return ensureBang(loader)
+      return injectString + ensureBang(loader)
     } else {
       // unknown lang, assume a loader for it is used
       switch (type) {
@@ -99,7 +100,7 @@ module.exports = function (content) {
         case 'style':
           return 'style!css!' + rewriter + lang + '!'
         case 'script':
-          return lang + '!'
+          return injectString + lang + '!'
       }
     }
   }
@@ -139,6 +140,7 @@ module.exports = function (content) {
     // which is an object that contains info about the vue file.
     var parts = self.exec(source, url)
     var hasLocalStyles = false
+    var output = 'var __vue_script__, __vue_template__\n'
 
     // add requires for src imports
     parts.styleImports.forEach(function (impt) {
@@ -157,46 +159,61 @@ module.exports = function (content) {
     if (parts.script.length) {
       script = parts.script[0]
       output +=
-        'module.exports = ' + (
+        '__vue_script__ = ' + (
           script.src
             ? getRequireForImport('script', script, 0)
             : getRequire('script', script, 0)
-        ) + '\nif (module.exports.__esModule) module.exports = module.exports.default\n'
+        )
     }
 
     // add require for template
     var template
     if (parts.template.length) {
       template = parts.template[0]
-      output += ';(typeof module.exports === "function" ' +
-        '? module.exports.options ' +
-        ': module.exports).template = ' + (
+      output += '__vue_template__ = ' + (
           template.src
             ? getRequireForImport('template', template, hasLocalStyles)
             : getRequire('template', template, 0, hasLocalStyles)
         )
     }
 
-    // hot reload
-    if (
-      process.env.NODE_ENV !== 'production' &&
-      (parts.script.length || parts.template.length)
-    ) {
+    if (!query.inject) {
+      // attach template
+      output +=
+        'module.exports = __vue_script__ || {}\n' +
+        'if (module.exports.__esModule) module.exports = module.exports.default\n' +
+        ';(typeof module.exports === "function" ? module.exports.options : module.exports).template = __vue_template__\n'
+      // hot reload
+      if (
+        process.env.NODE_ENV !== 'production' &&
+        (parts.script.length || parts.template.length)
+      ) {
+        output +=
+          'if (module.hot) {(function () {' +
+          '  module.hot.accept()\n' +
+          '  var hotAPI = require("vue-hot-reload-api")\n' +
+          '  hotAPI.install(require("vue"), true)\n' +
+          '  if (!hotAPI.compatible) return\n' +
+          '  var id = ' + JSON.stringify(filePath) + '\n' +
+          '  if (!module.hot.data) {\n' +
+          // initial insert
+          '    hotAPI.createRecord(id, module.exports)\n' +
+          '  } else {\n' +
+          // update
+          '    hotAPI.update(id, module.exports, __vue_template__)\n' +
+          '  }\n' +
+          '})()}'
+      }
+    } else {
       output +=
-        'if (module.hot) {(function () {' +
-        '  module.hot.accept()\n' +
-        '  var hotAPI = require("vue-hot-reload-api")\n' +
-        '  hotAPI.install(require("vue"), true)\n' +
-        '  if (!hotAPI.compatible) return\n' +
-        '  var id = ' + JSON.stringify(filePath) + '\n' +
-        '  if (!module.hot.data) {\n' +
-        // initial insert
-        '    hotAPI.createRecord(id, module.exports)\n' +
-        '  } else {\n' +
-        // update
-        '    hotAPI.update(id, module.exports, (typeof module.exports === "function" ? module.exports.options : module.exports).template)\n' +
-        '  }\n' +
-        '})()}'
+        'module.exports = function (injections) {\n' +
+        '  var mod = __vue_script__\n' +
+        '    ? __vue_script__(injections)\n' +
+        '    : {}\n' +
+        '  if (mod.__esModule) mod = mod.default\n' +
+        '  ;(typeof mod === "function" ? mod.options : mod).template = __vue_template__\n' +
+        '  return mod\n' +
+        '}'
     }
 
     // done
diff --git a/package.json b/package.json
index 40741295c..2bc8a403f 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",
     "extract-text-webpack-plugin": "^0.8.2",
+    "inject-loader": "^2.0.1",
     "jade": "^1.11.0",
     "jsdom": "^6.5.1",
     "mkdirp": "^0.5.1",
diff --git a/test/fixtures/inject.js b/test/fixtures/inject.js
new file mode 100644
index 000000000..5a984f1d1
--- /dev/null
+++ b/test/fixtures/inject.js
@@ -0,0 +1 @@
+window.injector = require('!!vue?inject!./inject.vue')
diff --git a/test/fixtures/inject.vue b/test/fixtures/inject.vue
new file mode 100644
index 000000000..9f740605e
--- /dev/null
+++ b/test/fixtures/inject.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+import SomeService from '../service'
+
+export default {
+  data () {
+    return {
+      msg: SomeService.msg
+    }
+  }
+}
+</script>
diff --git a/test/test.js b/test/test.js
index 243e5555a..68714e56c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -211,4 +211,19 @@ describe('vue-loader', function () {
     })
   })
 
+  it('dependency injection', function () {
+    test({
+      entry: './test/fixtures/inject.js'
+    }, function (window) {
+      var module = window.injector({
+        '../service': {
+          msg: 'Hello from mocked service!'
+        }
+      })
+      expect(module.template).to.contain('<div class="msg">{{ msg }}</div>')
+      expect(module.data().msg).to.contain('Hello from mocked service!')
+      done()
+    })
+  })
+
 })

From 358e0b76c439dc953db67aad4077158b0721c3b6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Dec 2015 17:44:27 -0500
Subject: [PATCH 161/877] tweak codegen

---
 lib/loader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index eddabdee1..0fd643990 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -182,7 +182,7 @@ module.exports = function (content) {
       output +=
         'module.exports = __vue_script__ || {}\n' +
         'if (module.exports.__esModule) module.exports = module.exports.default\n' +
-        ';(typeof module.exports === "function" ? module.exports.options : module.exports).template = __vue_template__\n'
+        'if (__vue_template__) { (typeof module.exports === "function" ? module.exports.options : module.exports).template = __vue_template__ }\n'
       // hot reload
       if (
         process.env.NODE_ENV !== 'production' &&
@@ -211,7 +211,7 @@ module.exports = function (content) {
         '    ? __vue_script__(injections)\n' +
         '    : {}\n' +
         '  if (mod.__esModule) mod = mod.default\n' +
-        '  ;(typeof mod === "function" ? mod.options : mod).template = __vue_template__\n' +
+        '  if (__vue_template__) { (typeof mod === "function" ? mod.options : mod).template = __vue_template__ }\n' +
         '  return mod\n' +
         '}'
     }

From 2faba5034372178ab012eea5a3af69d87ea20443 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Dec 2015 17:44:50 -0500
Subject: [PATCH 162/877] 7.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2bc8a403f..82ef59084 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 03a4edb15bcb775683234fbf7a533306307f37c3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Dec 2015 18:33:46 -0500
Subject: [PATCH 163/877] update docs for mocks

---
 docs/SUMMARY.md                     |  1 +
 docs/workflow/testing-with-mocks.md | 70 +++++++++++++++++++++++++++++
 docs/workflow/testing.md            | 10 ++++-
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 docs/workflow/testing-with-mocks.md

diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 7c675e154..14c8b0a10 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -15,3 +15,4 @@
   - [Production Build](workflow/production.md)
   - [Linting](workflow/linting.md)
   - [Testing](workflow/testing.md)
+  - [Testing with Mocks](workflow/testing-with-mocks.md)
diff --git a/docs/workflow/testing-with-mocks.md b/docs/workflow/testing-with-mocks.md
new file mode 100644
index 000000000..171809d31
--- /dev/null
+++ b/docs/workflow/testing-with-mocks.md
@@ -0,0 +1,70 @@
+# Testing with Mocks
+
+> This feature requires `vue-loader@^7.3.0`.
+
+In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
+
+`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instances of the module with the mocks injected.
+
+Suppose we have a component like this:
+
+``` html
+<!-- example.vue -->
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+// this dependency needs to be mocked
+import SomeService from '../service'
+
+export default {
+  data () {
+    return {
+      msg: SomeService.msg
+    }
+  }
+}
+</script>
+```
+
+Here's how to import it with mocks:
+
+``` bash
+npm install inject-loader --save-dev
+```
+
+``` js
+// example.spec.js
+const ExampleInjector = require('!!vue?inject!./example.vue')
+```
+
+Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
+
+- `!!` at the start means "disable all loaders from the global config";
+- `vue?inject!` means "use the `vue` loader, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
+
+The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
+
+``` js
+const ExampleWithMocks = ExampleInjector({
+  // mock it
+  '../service': {
+    msg: 'Hello from a mocked service!'
+  }
+})
+```
+
+Finally, we can test the component like usual:
+
+``` js
+it('should render', () => {
+  const vm = new Vue({
+    template: '<div><test></test></div>',
+    components: {
+      'test': ExampleWithMocks
+    }
+  }).$mount()
+  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
+})
+```
diff --git a/docs/workflow/testing.md b/docs/workflow/testing.md
index 4365abd98..515ef50d0 100644
--- a/docs/workflow/testing.md
+++ b/docs/workflow/testing.md
@@ -13,6 +13,12 @@ npm install\
 ```
 
 ``` js
+// we can just use the exact same webpack config by requiring it
+// however, remember to delete the original entry since we don't
+// need it during tests
+var webpackConfig = require('./webpack.config.js')
+delete webpackConfig.entry
+
 // karma.conf.js
 module.exports = function (config) {
   config.set({
@@ -24,8 +30,8 @@ module.exports = function (config) {
     preprocessors: {
       'test/index.js': ['webpack']
     },
-    // we can just use the exact same webpack config by requiring it
-    webpack: require('./webpack.config.js'),
+    // use the webpack config
+    webpack: webpackConfig,
     // avoid walls of useless text
     webpackMiddleware: {
       noInfo: true

From 626d56857ca5929177820bdd860b0b762629de6f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Dec 2015 18:37:35 -0500
Subject: [PATCH 164/877] typo

---
 docs/workflow/testing-with-mocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/workflow/testing-with-mocks.md b/docs/workflow/testing-with-mocks.md
index 171809d31..97f099fa2 100644
--- a/docs/workflow/testing-with-mocks.md
+++ b/docs/workflow/testing-with-mocks.md
@@ -4,7 +4,7 @@
 
 In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
 
-`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instances of the module with the mocks injected.
+`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
 
 Suppose we have a component like this:
 

From 10a77fd5f9d2be55bd6b2cd8877cba363278a4a4 Mon Sep 17 00:00:00 2001
From: Terence Zhong <305740424@qq.com>
Date: Tue, 22 Dec 2015 09:46:51 +0800
Subject: [PATCH 165/877] allow postcss options to be a function and close
 issue #106

---
 lib/style-rewriter.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 707d1d121..3896ee3cd 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -36,9 +36,13 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
+
+  // plugins
   var plugins = options.postcss
-    ? options.postcss.slice() // make sure to copy it
-    : []
+  if (typeof plugins === 'function') {
+    plugins = plugins.call(this, this)
+  }
+  plugins = plugins ? plugins.slice() : [] // make sure to copy it
 
   // scoped css
   if (query.scoped) {

From 6b3c0eeff073859ec99b0ece8f637e450ed9f8cc Mon Sep 17 00:00:00 2001
From: Terence Zhong <305740424@qq.com>
Date: Tue, 22 Dec 2015 09:59:22 +0800
Subject: [PATCH 166/877] instead of null, expect error not exist in tests

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 68714e56c..8cb736ce5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -34,7 +34,7 @@ describe('vue-loader', function () {
 
   function getFile (file, cb) {
     fs.readFile(path.resolve(outputDir, file), 'utf-8', function (err, data) {
-      expect(err).to.be.null
+      expect(err).to.be.not.exist
       cb(data)
     })
   }

From c2b4bc1d3bca49f9b86672bab0e64496fc8b474f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 26 Dec 2015 21:17:05 -0500
Subject: [PATCH 167/877] parser can be sync

---
 lib/parser.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 29a185657..7926e0600 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -3,7 +3,7 @@ var parser = new parse5.Parser(null, { locationInfo: true })
 
 module.exports = function (content) {
   this.cacheable()
-  var cb = this.async()
+
   var output = {
     template: [],
     style: [],
@@ -24,10 +24,10 @@ module.exports = function (content) {
       (type === 'script' || type === 'template') &&
       output[type].length > 0
     ) {
-      return cb(new Error(
+      throw new Error(
         '[vue-loader] Only one <script> or <template> tag is ' +
         'allowed inside a Vue component.'
-      ))
+      )
     }
 
     // handle src imports
@@ -88,7 +88,7 @@ module.exports = function (content) {
     })
   })
 
-  cb(null, 'module.exports = ' + JSON.stringify(output))
+  return 'module.exports = ' + JSON.stringify(output)
 }
 
 function commentScript (content, lang) {

From 7d6ca47097e0af1cbfac77f68a2ecfdc03431c3e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 26 Dec 2015 21:42:17 -0500
Subject: [PATCH 168/877] 7.4.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 82ef59084..bb81cabee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From c62e8469aafe75a4b71bbbf8f9a595dd65c26324 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2015 00:16:47 -0500
Subject: [PATCH 169/877] work around webpack eval-source-map bug

---
 lib/parser.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 7926e0600..d31fae6c2 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -76,7 +76,10 @@ module.exports = function (content) {
       result =
         commentScript(content.slice(0, start), lang) +
         content.slice(start, end) +
-        commentScript(content.slice(end), lang)
+        commentScript(content.slice(end), lang) +
+        // workaround for Webpack eval-source-map bug
+        // https://github.com/webpack/webpack/pull/1816
+        '\n/* generated by vue-loader */\n'
     } else {
       result = content.slice(start, end).trim()
     }

From e75c0f4c09b3f9aaa52ae7dc5da13b196acfc99d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2015 00:17:02 -0500
Subject: [PATCH 170/877] 7.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bb81cabee..33405bc4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From f8b931e3f85368ea87e87860fdb88402f52206af Mon Sep 17 00:00:00 2001
From: iugo <iugogogo@gmail.com>
Date: Tue, 29 Dec 2015 18:05:02 +0800
Subject: [PATCH 171/877] add vue npm depend

---
 docs/start/tutorial.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index 494d38e7e..d9128d853 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -30,7 +30,7 @@ npm init
 # Install everything we need
 npm install\
   webpack webpack-dev-server\
-  vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
+  vue vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
   babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
   babel-runtime@5\
   --save-dev
@@ -52,6 +52,7 @@ After proper installation, your `package.json`'s `devDependencies` field should
     "babel-runtime": "^5.8.34",
     "css-loader": "^0.23.0",
     "style-loader": "^0.13.0",
+    "vue": "^1.0.13",
     "vue-hot-reload-api": "^1.2.2",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^7.2.0",

From c75837ce3a87aaadc48d7ab744a48c3b427dd646 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2015 17:00:54 -0500
Subject: [PATCH 172/877] simplify parser

---
 lib/loader.js   | 165 +++++++++++++++++++++++-------------------------
 lib/parser.js   |  10 ++-
 lib/selector.js |  14 ++--
 package.json    |   1 +
 4 files changed, 90 insertions(+), 100 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 0fd643990..8a47f6f5b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,7 +1,7 @@
 var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
+var parse = require('./parser')
 var selectorPath = require.resolve('./selector')
-var parserPath = require.resolve('./parser')
 var hash = require('hash-sum')
 var path = require('path')
 
@@ -26,7 +26,6 @@ var rewriters = {
 module.exports = function (content) {
   var self = this
   this.cacheable()
-  var cb = this.async()
   var options = this.options.vue || {}
   var query = loaderUtils.parseQuery(this.query)
   var vueUrl = loaderUtils.getRemainingRequest(this)
@@ -39,8 +38,8 @@ module.exports = function (content) {
     defaultLoaders.js = 'babel-loader'
   }
 
-  // check if there are custom loaders specified with
-  // vueLoader.withLoaders(), otherwise use defaults
+  // check if there are custom loaders specified via
+  // webpack config, otherwise use defaults
   var loaders = assign({}, defaultLoaders, options.loaders)
 
   function getRequire (type, part, index, scoped) {
@@ -131,94 +130,86 @@ module.exports = function (content) {
     }
   }
 
-  var url = '!!' + parserPath + '!' + vueUrl
-  this.loadModule(url, function (err, source) {
-    if (err) return cb(err)
-
-    // up to this part, what we have done is basically executing
-    // parser.js on the raw vue file and get the parsing result
-    // which is an object that contains info about the vue file.
-    var parts = self.exec(source, url)
-    var hasLocalStyles = false
-    var output = 'var __vue_script__, __vue_template__\n'
-
-    // add requires for src imports
-    parts.styleImports.forEach(function (impt) {
-      if (impt.scoped) hasLocalStyles = true
-      output += getRequireForImport('style', impt, impt.scoped)
-    })
-
-    // add requires for styles
-    parts.style.forEach(function (style, i) {
-      if (style.scoped) hasLocalStyles = true
-      output += getRequire('style', style, i, style.scoped)
-    })
-
-    // add require for script
-    var script
-    if (parts.script.length) {
-      script = parts.script[0]
-      output +=
-        '__vue_script__ = ' + (
-          script.src
-            ? getRequireForImport('script', script, 0)
-            : getRequire('script', script, 0)
-        )
-    }
+  var parts = parse(content)
+  var hasLocalStyles = false
+  var output = 'var __vue_script__, __vue_template__\n'
 
-    // add require for template
-    var template
-    if (parts.template.length) {
-      template = parts.template[0]
-      output += '__vue_template__ = ' + (
-          template.src
-            ? getRequireForImport('template', template, hasLocalStyles)
-            : getRequire('template', template, 0, hasLocalStyles)
-        )
-    }
+  // add requires for src imports
+  parts.styleImports.forEach(function (impt) {
+    if (impt.scoped) hasLocalStyles = true
+    output += getRequireForImport('style', impt, impt.scoped)
+  })
 
-    if (!query.inject) {
-      // attach template
-      output +=
-        'module.exports = __vue_script__ || {}\n' +
-        'if (module.exports.__esModule) module.exports = module.exports.default\n' +
-        'if (__vue_template__) { (typeof module.exports === "function" ? module.exports.options : module.exports).template = __vue_template__ }\n'
-      // hot reload
-      if (
-        process.env.NODE_ENV !== 'production' &&
-        (parts.script.length || parts.template.length)
-      ) {
-        output +=
-          'if (module.hot) {(function () {' +
-          '  module.hot.accept()\n' +
-          '  var hotAPI = require("vue-hot-reload-api")\n' +
-          '  hotAPI.install(require("vue"), true)\n' +
-          '  if (!hotAPI.compatible) return\n' +
-          '  var id = ' + JSON.stringify(filePath) + '\n' +
-          '  if (!module.hot.data) {\n' +
-          // initial insert
-          '    hotAPI.createRecord(id, module.exports)\n' +
-          '  } else {\n' +
-          // update
-          '    hotAPI.update(id, module.exports, __vue_template__)\n' +
-          '  }\n' +
-          '})()}'
-      }
-    } else {
+  // add requires for styles
+  parts.style.forEach(function (style, i) {
+    if (style.scoped) hasLocalStyles = true
+    output += getRequire('style', style, i, style.scoped)
+  })
+
+  // add require for script
+  var script
+  if (parts.script.length) {
+    script = parts.script[0]
+    output +=
+      '__vue_script__ = ' + (
+        script.src
+          ? getRequireForImport('script', script, 0)
+          : getRequire('script', script, 0)
+      )
+  }
+
+  // add require for template
+  var template
+  if (parts.template.length) {
+    template = parts.template[0]
+    output += '__vue_template__ = ' + (
+        template.src
+          ? getRequireForImport('template', template, hasLocalStyles)
+          : getRequire('template', template, 0, hasLocalStyles)
+      )
+  }
+
+  if (!query.inject) {
+    // attach template
+    output +=
+      'module.exports = __vue_script__ || {}\n' +
+      'if (module.exports.__esModule) module.exports = module.exports.default\n' +
+      'if (__vue_template__) { (typeof module.exports === "function" ? module.exports.options : module.exports).template = __vue_template__ }\n'
+    // hot reload
+    if (
+      process.env.NODE_ENV !== 'production' &&
+      (parts.script.length || parts.template.length)
+    ) {
       output +=
-        'module.exports = function (injections) {\n' +
-        '  var mod = __vue_script__\n' +
-        '    ? __vue_script__(injections)\n' +
-        '    : {}\n' +
-        '  if (mod.__esModule) mod = mod.default\n' +
-        '  if (__vue_template__) { (typeof mod === "function" ? mod.options : mod).template = __vue_template__ }\n' +
-        '  return mod\n' +
-        '}'
+        'if (module.hot) {(function () {' +
+        '  module.hot.accept()\n' +
+        '  var hotAPI = require("vue-hot-reload-api")\n' +
+        '  hotAPI.install(require("vue"), true)\n' +
+        '  if (!hotAPI.compatible) return\n' +
+        '  var id = ' + JSON.stringify(filePath) + '\n' +
+        '  if (!module.hot.data) {\n' +
+        // initial insert
+        '    hotAPI.createRecord(id, module.exports)\n' +
+        '  } else {\n' +
+        // update
+        '    hotAPI.update(id, module.exports, __vue_template__)\n' +
+        '  }\n' +
+        '})()}'
     }
+  } else {
+    output +=
+      'module.exports = function (injections) {\n' +
+      '  var mod = __vue_script__\n' +
+      '    ? __vue_script__(injections)\n' +
+      '    : {}\n' +
+      '  if (mod.__esModule) mod = mod.default\n' +
+      '  if (__vue_template__) { (typeof mod === "function" ? mod.options : mod).template = __vue_template__ }\n' +
+      '  return mod\n' +
+      '}'
+  }
 
-    // done
-    cb(null, output)
-  })
+  // done
+  return output
 }
 
 module.exports.withLoaders = function () {
diff --git a/lib/parser.js b/lib/parser.js
index d31fae6c2..669559839 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,10 +1,13 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser(null, { locationInfo: true })
+var cache = require('lru-cache')(100)
 
 module.exports = function (content) {
-  this.cacheable()
 
-  var output = {
+  var output = cache.get(content)
+  if (output) return output
+
+  output = {
     template: [],
     style: [],
     script: [],
@@ -91,7 +94,8 @@ module.exports = function (content) {
     })
   })
 
-  return 'module.exports = ' + JSON.stringify(output)
+  cache.set(content, output)
+  return output
 }
 
 function commentScript (content, lang) {
diff --git a/lib/selector.js b/lib/selector.js
index 10edd69aa..ce143086a 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -1,15 +1,9 @@
+var parse = require('./parser')
 var loaderUtils = require('loader-utils')
 
-module.exports = function () {
+module.exports = function (content) {
   this.cacheable()
-  var cb = this.async()
   var query = loaderUtils.parseQuery(this.query)
-
-  var self = this
-  var url = '!!' + require.resolve('./parser.js') + '!' + this.resource
-  this.loadModule(url, function (err, source) {
-    if (err) return cb(err)
-    var parts = self.exec(source, url)
-    cb(null, parts[query.type][query.index].content)
-  })
+  var parts = parse(content)
+  return parts[query.type][query.index].content
 }
diff --git a/package.json b/package.json
index 33405bc4d..6f1f4ee5d 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "autoprefixer": "^6.0.3",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
+    "lru-cache": "^2.7.0",
     "object-assign": "^4.0.0",
     "parse5": "^1.5.0",
     "postcss": "^5.0.10",

From 23aee810e73c13e2d64bcbd7b9076551d4bc8c17 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2015 18:07:09 -0500
Subject: [PATCH 173/877] proper source map support

---
 lib/loader.js   |  2 +-
 lib/parser.js   | 67 ++++++++++++++++++++-----------------------------
 lib/selector.js |  7 ++++--
 package.json    |  3 ++-
 4 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 8a47f6f5b..a26db2384 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -130,7 +130,7 @@ module.exports = function (content) {
     }
   }
 
-  var parts = parse(content)
+  var parts = parse(content, fileName)
   var hasLocalStyles = false
   var output = 'var __vue_script__, __vue_template__\n'
 
diff --git a/lib/parser.js b/lib/parser.js
index 669559839..eed3bd146 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,10 +1,14 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
+var SourceNode = require('source-map').SourceNode
+var SourceMapGenerator = require('source-map').SourceMapGenerator
+var splitRE = /\n\r|\n|\r/g
 
-module.exports = function (content) {
+module.exports = function (content, filename) {
 
-  var output = cache.get(content)
+  var cacheKey = filename + 'XXX' + content
+  var output = cache.get(cacheKey)
   if (output) return output
 
   output = {
@@ -73,54 +77,37 @@ module.exports = function (content) {
 
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
-
-    var result
-    if (type === 'script') {
-      result =
-        commentScript(content.slice(0, start), lang) +
-        content.slice(start, end) +
-        commentScript(content.slice(end), lang) +
-        // workaround for Webpack eval-source-map bug
-        // https://github.com/webpack/webpack/pull/1816
-        '\n/* generated by vue-loader */\n'
-    } else {
-      result = content.slice(start, end).trim()
-    }
+    var result = content.slice(start, end)
+    var lineOffset = content.slice(0, start).split(splitRE).length - 1
+    var map = new SourceMapGenerator()
+    map.setSourceContent(filename, content)
+
+    result.split(splitRE).forEach(function (line, index) {
+      map.addMapping({
+        source: filename,
+        original: {
+          line: index + 1 + lineOffset,
+          column: 0
+        },
+        generated: {
+          line: index + 1,
+          column: 0
+        }
+      })
+    })
 
     output[type].push({
       lang: lang,
       scoped: scoped,
-      content: result
+      content: result,
+      map: map.toJSON()
     })
   })
 
-  cache.set(content, output)
+  cache.set(cacheKey, output)
   return output
 }
 
-function commentScript (content, lang) {
-  return content
-    .split(/\n\r|\n|\r/g)
-    .map(function (line) {
-      if (line.trim() === '') {
-        return line
-      }
-
-      switch (lang) {
-        case 'coffee':
-        case 'coffee-jsx':
-        case 'coffee-redux':
-          return '# ' + line
-        case 'purs':
-        case 'ulmus':
-          return '-- ' + line
-        default:
-          return '// ' + line
-      }
-    })
-    .join('\n')
-}
-
 function getAttribute (node, name) {
   if (node.attrs) {
     var i = node.attrs.length
diff --git a/lib/selector.js b/lib/selector.js
index ce143086a..9b5975471 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -1,9 +1,12 @@
+var path = require('path')
 var parse = require('./parser')
 var loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
-  var parts = parse(content)
-  return parts[query.type][query.index].content
+  var filename = path.basename(this.resourcePath)
+  var parts = parse(content, filename)
+  var part = parts[query.type][query.index]
+  this.callback(null, part.content, part.map)
 }
diff --git a/package.json b/package.json
index 6f1f4ee5d..422c403cb 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
     "object-assign": "^4.0.0",
     "parse5": "^1.5.0",
     "postcss": "^5.0.10",
-    "postcss-selector-parser": "^1.1.2"
+    "postcss-selector-parser": "^1.1.2",
+    "source-map": "^0.5.3"
   },
   "peerDependencies": {
     "vue-html-loader": "^1.0.0",

From 0993d7c6b61db131ae72ed06f426d3d3b8668082 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 29 Dec 2015 18:12:08 -0500
Subject: [PATCH 174/877] cache-bust source maps

---
 lib/parser.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index eed3bd146..027c5cf58 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -4,10 +4,13 @@ var cache = require('lru-cache')(100)
 var SourceNode = require('source-map').SourceNode
 var SourceMapGenerator = require('source-map').SourceMapGenerator
 var splitRE = /\n\r|\n|\r/g
+var hash = require('hash-sum')
 
 module.exports = function (content, filename) {
 
-  var cacheKey = filename + 'XXX' + content
+  var cacheKey = hash(filename + content)
+  // source-map cache busting for hot-reloadded modules
+  var filenameWithHash = filename + '?' + cacheKey
   var output = cache.get(cacheKey)
   if (output) return output
 
@@ -80,11 +83,11 @@ module.exports = function (content, filename) {
     var result = content.slice(start, end)
     var lineOffset = content.slice(0, start).split(splitRE).length - 1
     var map = new SourceMapGenerator()
-    map.setSourceContent(filename, content)
+    map.setSourceContent(filenameWithHash, content)
 
     result.split(splitRE).forEach(function (line, index) {
       map.addMapping({
-        source: filename,
+        source: filenameWithHash,
         original: {
           line: index + 1 + lineOffset,
           column: 0

From 31347c80fa197fc6a3b7bec0d13f65cad1d97f73 Mon Sep 17 00:00:00 2001
From: iugo <iugogogo@gmail.com>
Date: Wed, 30 Dec 2015 10:51:36 +0800
Subject: [PATCH 175/877] Update tutorial.md

---
 docs/start/tutorial.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index d9128d853..30feb7bba 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -30,10 +30,11 @@ npm init
 # Install everything we need
 npm install\
   webpack webpack-dev-server\
-  vue vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
+  vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
   babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
   babel-runtime@5\
   --save-dev
+npm install vue --save
 ```
 
 That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
@@ -52,13 +53,15 @@ After proper installation, your `package.json`'s `devDependencies` field should
     "babel-runtime": "^5.8.34",
     "css-loader": "^0.23.0",
     "style-loader": "^0.13.0",
-    "vue": "^1.0.13",
     "vue-hot-reload-api": "^1.2.2",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^7.2.0",
     "webpack": "^1.12.9",
     "webpack-dev-server": "^1.14.0"
   },
+  "dependencies": {
+    "vue": "^1.0.13"
+  },
 ...
 ```
 

From b1866d02d83671d4e5e35ea8e5f91ecc684c27be Mon Sep 17 00:00:00 2001
From: Benjamin Milde <benni@kobrakai.de>
Date: Wed, 30 Dec 2015 16:48:18 +0100
Subject: [PATCH 176/877] Fixed typo

---
 docs/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/start/spec.md b/docs/start/spec.md
index 1671f67d4..f22cd5e4c 100644
--- a/docs/start/spec.md
+++ b/docs/start/spec.md
@@ -58,7 +58,7 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 #### `<style>`
 
-- Defalt Language: `css`.
+- Default Language: `css`.
 
 - Multiple `<style>` tags are supported in a single `*.vue` file.
 

From c37f374ac5df5345117a93a026eb92c023b10534 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2015 16:47:08 -0500
Subject: [PATCH 177/877] fix tests

---
 lib/parser.js         |  1 -
 lib/style-rewriter.js |  2 +-
 package.json          |  1 -
 test/test.js          | 13 ++++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 027c5cf58..9ff03d5e8 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,7 +1,6 @@
 var parse5 = require('parse5')
 var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
-var SourceNode = require('source-map').SourceNode
 var SourceMapGenerator = require('source-map').SourceMapGenerator
 var splitRE = /\n\r|\n|\r/g
 var hash = require('hash-sum')
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 3896ee3cd..f3849d0a8 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -80,7 +80,7 @@ module.exports = function (css, map) {
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {
-      var map = JSON.parse(result.map.toString())
+      var map = result.map.toJSON()
       // ensure we give the style source a unique name
       // so that Webpack doesn't get confused
       map.sources[0] = query.file + '.style'
diff --git a/package.json b/package.json
index 422c403cb..3c7a31b97 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.3",
     "rimraf": "^2.4.0",
-    "source-map": "^0.5.1",
     "style-loader": "^0.13.0",
     "stylus-loader": "^1.4.0",
     "template-html-loader": "^0.0.3",
diff --git a/test/test.js b/test/test.js
index 8cb736ce5..a1ca21d11 100644
--- a/test/test.js
+++ b/test/test.js
@@ -151,17 +151,20 @@ describe('vue-loader', function () {
         var smc = new SourceMapConsumer(JSON.parse(map))
         getFile('test.build.js', function (code) {
           var line
-          code.split('\n').some(function (l, i) {
+          var col
+          var lines = code.split('\n')
+          lines.some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {
-              line = i + 1
+              line = i
+              col = lines[i - 1].length
               return true
             }
           })
           var pos = smc.originalPositionFor({
             line: line,
-            column: 0
+            column: col
           })
-          expect(pos.source.indexOf('webpack:///test/fixtures/basic.vue') > -1)
+          expect(pos.source.indexOf('basic.vue') > -1)
           expect(pos.line).to.equal(15)
           done()
         })
@@ -205,7 +208,7 @@ describe('vue-loader', function () {
     }), function (err) {
       expect(err).to.be.null
       getFile('test.output.css', function (data) {
-        expect(data).to.contain('h1 {\n  color: #f00;\n}\nh2 {\n  color: green;\n}')
+        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
         done()
       })
     })

From 3f02988d9a4f13cb26f7076c4c51bc1741043527 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2015 16:58:46 -0500
Subject: [PATCH 178/877] trim selected parts

---
 lib/parser.js | 8 +++++---
 test/test.js  | 9 ++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 9ff03d5e8..20ea8d4e2 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -80,11 +80,13 @@ module.exports = function (content, filename) {
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     var result = content.slice(start, end)
-    var lineOffset = content.slice(0, start).split(splitRE).length - 1
+    var trimmedResult = result.trim() + '\n'
+    var trimmed = trimmedResult.length - result.length
+    var lineOffset = content.slice(0, start + trimmed).split(splitRE).length
     var map = new SourceMapGenerator()
     map.setSourceContent(filenameWithHash, content)
 
-    result.split(splitRE).forEach(function (line, index) {
+    trimmedResult.split(splitRE).forEach(function (line, index) {
       map.addMapping({
         source: filenameWithHash,
         original: {
@@ -101,7 +103,7 @@ module.exports = function (content, filename) {
     output[type].push({
       lang: lang,
       scoped: scoped,
-      content: result,
+      content: trimmedResult,
       map: map.toJSON()
     })
   })
diff --git a/test/test.js b/test/test.js
index a1ca21d11..3cab4d8bc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -152,11 +152,10 @@ describe('vue-loader', function () {
         getFile('test.build.js', function (code) {
           var line
           var col
-          var lines = code.split('\n')
-          lines.some(function (l, i) {
+          code.split('\n').some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {
-              line = i
-              col = lines[i - 1].length
+              line = i + 1
+              col = l.length
               return true
             }
           })
@@ -208,7 +207,7 @@ describe('vue-loader', function () {
     }), function (err) {
       expect(err).to.be.null
       getFile('test.output.css', function (data) {
-        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+        expect(data).to.contain('h1 {\n  color: #f00;\n}\nh2 {\n  color: green;\n}')
         done()
       })
     })

From d79282d55e08de9142ac871de332813b5de6427c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2015 17:10:20 -0500
Subject: [PATCH 179/877] fix split and trim regex

---
 lib/parser.js | 5 +++--
 test/test.js  | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 20ea8d4e2..0de775e6b 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -2,7 +2,8 @@ var parse5 = require('parse5')
 var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
-var splitRE = /\n\r|\n|\r/g
+var splitRE = /\r?\n/g
+var trimRE = /^(\s|\r?\n)+/
 var hash = require('hash-sum')
 
 module.exports = function (content, filename) {
@@ -80,7 +81,7 @@ module.exports = function (content, filename) {
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     var result = content.slice(start, end)
-    var trimmedResult = result.trim() + '\n'
+    var trimmedResult = result.replace(trimRE, '')
     var trimmed = trimmedResult.length - result.length
     var lineOffset = content.slice(0, start + trimmed).split(splitRE).length
     var map = new SourceMapGenerator()
diff --git a/test/test.js b/test/test.js
index 3cab4d8bc..76258eea6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -152,10 +152,11 @@ describe('vue-loader', function () {
         getFile('test.build.js', function (code) {
           var line
           var col
-          code.split('\n').some(function (l, i) {
+          var lines = code.split(/\r?\n/g)
+          lines.some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {
-              line = i + 1
-              col = l.length
+              line = i
+              col = lines[i - 1].length
               return true
             }
           })

From e6f67c66b1bbe55b43bd0d57765976537a7a78aa Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2015 17:17:34 -0500
Subject: [PATCH 180/877] 7.4.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c7a31b97..48df5f262 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.4.1",
+  "version": "7.4.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 361438a69b3c0d64bbf76eb8555bd8d166229c8d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2015 17:41:07 -0500
Subject: [PATCH 181/877] enable css source mapping if devtool option is set

---
 lib/loader.js         | 11 ++++++++---
 lib/style-rewriter.js | 10 ++++++----
 test/test.js          |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index a26db2384..356ba5bdb 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -38,6 +38,11 @@ module.exports = function (content) {
     defaultLoaders.js = 'babel-loader'
   }
 
+  // enable css source map if needed
+  if (this.sourceMap) {
+    defaultLoaders.css = 'style-loader!css-loader?sourceMap'
+  }
+
   // check if there are custom loaders specified via
   // webpack config, otherwise use defaults
   var loaders = assign({}, defaultLoaders, options.loaders)
@@ -92,12 +97,12 @@ module.exports = function (content) {
       }
       return injectString + ensureBang(loader)
     } else {
-      // unknown lang, assume a loader for it is used
+      // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + rewriter + 'template-html-loader?raw&engine=' + lang + '!'
         case 'style':
-          return 'style!css!' + rewriter + lang + '!'
+          return defaultLoaders.css + '!' + rewriter + lang + '!'
         case 'script':
           return injectString + lang + '!'
       }
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index f3849d0a8..cd58016d4 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -67,12 +67,12 @@ module.exports = function (css, map) {
   opts = {
     from: file,
     to: file,
-    map: {
+    map: this.sourceMap && {
       inline: false,
       annotation: false
     }
   }
-  if (map) {
+  if (map && opts.map) {
     opts.map.prev = map
   }
 
@@ -80,10 +80,12 @@ module.exports = function (css, map) {
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {
-      var map = result.map.toJSON()
+      var map = result.map && result.map.toJSON()
       // ensure we give the style source a unique name
       // so that Webpack doesn't get confused
-      map.sources[0] = query.file + '.style'
+      if (map) {
+        map.sources[0] = query.file + '.style'
+      }
       cb(null, result.css, map)
     })
     .catch(function (e) {
diff --git a/test/test.js b/test/test.js
index 76258eea6..e24d7f906 100644
--- a/test/test.js
+++ b/test/test.js
@@ -153,8 +153,9 @@ describe('vue-loader', function () {
           var line
           var col
           var lines = code.split(/\r?\n/g)
+          var targetRE = /^\s+msg: 'Hello from Component A!'/
           lines.some(function (l, i) {
-            if (l.indexOf('Hello from Component A') > -1) {
+            if (targetRE.test(l)) {
               line = i
               col = lines[i - 1].length
               return true

From b2681d81e8643d59b6389961a3aba4b4334046be Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 30 Dec 2015 17:42:03 -0500
Subject: [PATCH 182/877] 7.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 48df5f262..13d43c3b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.4.2",
+  "version": "7.5.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From a45a49782f91f9a8c046ddb952bfae7a259be9d3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 31 Dec 2015 09:46:00 -0500
Subject: [PATCH 183/877] add brackets syntax highlight

---
 docs/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/start/spec.md b/docs/start/spec.md
index f22cd5e4c..4636343f0 100644
--- a/docs/start/spec.md
+++ b/docs/start/spec.md
@@ -83,4 +83,4 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 
 ### Syntax Highlighting
 
-Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue) and [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue) and [Brackets](https://github.com/pandao/brackets-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.

From 5c0d4919bcd3b1a276a8b7093d439512c469288c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2016 23:54:20 -0500
Subject: [PATCH 184/877] fix script line numbers for babel/eslint and eslint
 indentation warning

---
 lib/deindent.js | 41 +++++++++++++++++++++++++++++++++
 lib/parser.js   | 61 +++++++++++++++++++++++++++++++++++++++++--------
 test/test.js    |  2 +-
 3 files changed, 94 insertions(+), 10 deletions(-)
 create mode 100644 lib/deindent.js

diff --git a/lib/deindent.js b/lib/deindent.js
new file mode 100644
index 000000000..fec85889f
--- /dev/null
+++ b/lib/deindent.js
@@ -0,0 +1,41 @@
+// For some reason, if a script code block has a base indent
+// level, the eval-source-map gets messed up. So we have to
+// manually deindent script code blocks here.
+
+var splitRE = /\r?\n/g
+var emptyRE = /^\s*$/
+
+module.exports = function deindent (str) {
+  var lines = str.split(splitRE)
+  var min = Infinity
+  var type, cur, c
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i]
+    if (!emptyRE.test(line)) {
+      if (!type) {
+        c = line.charAt(0)
+        if (c === ' ' || c === '\t') {
+          type = c
+        } else {
+          return str
+        }
+      } else {
+        cur = count(line, type)
+        if (cur < min) {
+          min = cur
+        }
+      }
+    }
+  }
+  return lines.map(function (line) {
+    return line.slice(min)
+  }).join('\n')
+}
+
+function count (line, type) {
+  var i = 0
+  while (line.charAt(i) === type) {
+    i++
+  }
+  return i
+}
diff --git a/lib/parser.js b/lib/parser.js
index 0de775e6b..0cd481a10 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -2,9 +2,10 @@ var parse5 = require('parse5')
 var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
-var splitRE = /\r?\n/g
-var trimRE = /^(\s|\r?\n)+/
 var hash = require('hash-sum')
+var deindent = require('./deindent')
+var splitRE = /\r?\n/g
+var emptyRE = /^\s*$/
 
 module.exports = function (content, filename) {
 
@@ -78,16 +79,28 @@ module.exports = function (content, filename) {
       }
     }
 
+    // extract part
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
-    var result = content.slice(start, end)
-    var trimmedResult = result.replace(trimRE, '')
-    var trimmed = trimmedResult.length - result.length
-    var lineOffset = content.slice(0, start + trimmed).split(splitRE).length
+    var result
+    var lineOffset
+    if (type === 'script') {
+      lineOffset = 0
+      // preserve other parts as commenets so that linters
+      // and babel can output correct line numbers in warnings
+      result =
+        commentScript(content.slice(0, start), lang) +
+        deindent(content.slice(start, end)) +
+        commentScript(content.slice(end), lang)
+    } else {
+      lineOffset = content.slice(0, start).split(splitRE).length - 1
+      result = content.slice(start, end)
+    }
+
+    // generate source map
     var map = new SourceMapGenerator()
     map.setSourceContent(filenameWithHash, content)
-
-    trimmedResult.split(splitRE).forEach(function (line, index) {
+    result.split(splitRE).forEach(function (line, index) {
       map.addMapping({
         source: filenameWithHash,
         original: {
@@ -101,10 +114,18 @@ module.exports = function (content, filename) {
       })
     })
 
+    // workaround for Webpack eval-source-map bug
+    // https://github.com/webpack/webpack/pull/1816
+    // in case the script was piped through another loader
+    // that doesn't pass down the source map properly.
+    if (type === 'script') {
+      result += '\n/* generated by vue-loader */\n'
+    }
+
     output[type].push({
       lang: lang,
       scoped: scoped,
-      content: trimmedResult,
+      content: result,
       map: map.toJSON()
     })
   })
@@ -113,6 +134,28 @@ module.exports = function (content, filename) {
   return output
 }
 
+function commentScript (content, lang) {
+  return content
+    .split(splitRE)
+    .map(function (line) {
+      if (emptyRE.test(line)) {
+        return line
+      }
+      switch (lang) {
+        case 'coffee':
+        case 'coffee-jsx':
+        case 'coffee-redux':
+          return '# ' + line
+        case 'purs':
+        case 'ulmus':
+          return '-- ' + line
+        default:
+          return '// ' + line
+      }
+    })
+    .join('\n')
+}
+
 function getAttribute (node, name) {
   if (node.attrs) {
     var i = node.attrs.length
diff --git a/test/test.js b/test/test.js
index e24d7f906..97fa04b5f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -209,7 +209,7 @@ describe('vue-loader', function () {
     }), function (err) {
       expect(err).to.be.null
       getFile('test.output.css', function (data) {
-        expect(data).to.contain('h1 {\n  color: #f00;\n}\nh2 {\n  color: green;\n}')
+        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
         done()
       })
     })

From c9bb288362f32e45e81d18ca97e2973953c695ea Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 1 Jan 2016 23:54:45 -0500
Subject: [PATCH 185/877] 7.5.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 13d43c3b9..4d1c849eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From afe1115e6b2d0039e8bee496d5472fce20d38263 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 2 Jan 2016 10:41:08 -0500
Subject: [PATCH 186/877] only append eval-source-map fix for default script
 type, add tests for coffee-loader (fix #118)

---
 lib/parser.js         |  2 +-
 package.json          |  2 ++
 test/fixtures/pre.vue | 12 ++++--------
 test/test.js          |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 0cd481a10..393afc731 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -118,7 +118,7 @@ module.exports = function (content, filename) {
     // https://github.com/webpack/webpack/pull/1816
     // in case the script was piped through another loader
     // that doesn't pass down the source map properly.
-    if (type === 'script') {
+    if (type === 'script' && !lang) {
       result += '\n/* generated by vue-loader */\n'
     }
 
diff --git a/package.json b/package.json
index 4d1c849eb..ef0102476 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,8 @@
     "babel-preset-es2015": "^6.1.2",
     "babel-runtime": "^5.8.0",
     "chai": "^3.0.0",
+    "coffee-loader": "^0.7.2",
+    "coffee-script": "^1.10.0",
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",
     "extract-text-webpack-plugin": "^0.8.2",
diff --git a/test/fixtures/pre.vue b/test/fixtures/pre.vue
index 3b0d578a1..2eafdb4fd 100644
--- a/test/fixtures/pre.vue
+++ b/test/fixtures/pre.vue
@@ -12,12 +12,8 @@ comp-a
 comp-b
 </template>
 
-<script>
-export default {
-  data () {
-    return {
-      msg: 'Hello from babel!'
-    }
-  }
-}
+<script lang="coffee">
+module.exports =
+  data: ->
+    msg: 'Hello from coffee!'
 </script>
diff --git a/test/test.js b/test/test.js
index 97fa04b5f..a548469ff 100644
--- a/test/test.js
+++ b/test/test.js
@@ -82,7 +82,7 @@ describe('vue-loader', function () {
         '<comp-a></comp-a>' +
         '<comp-b></comp-b>'
       )
-      expect(module.data().msg).to.contain('Hello from babel!')
+      expect(module.data().msg).to.contain('Hello from coffee!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
       done()

From db7737e981b3cd748144543bf3dd7abf102c085c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 2 Jan 2016 10:41:39 -0500
Subject: [PATCH 187/877] 7.5.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ef0102476..2865691a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.5.1",
+  "version": "7.5.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 32e5aa8ef7f0f7fd67898bea20725db0479af351 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2016 14:40:19 -0500
Subject: [PATCH 188/877] use de-indent as a dep

---
 .gitignore      |  1 +
 lib/deindent.js | 41 -----------------------------------------
 lib/parser.js   |  2 +-
 package.json    |  1 +
 4 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 lib/deindent.js

diff --git a/.gitignore b/.gitignore
index 0374b0709..6c2848eb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 npm-debug.log
 test/output
 docs/_book
+.DS_Store
diff --git a/lib/deindent.js b/lib/deindent.js
deleted file mode 100644
index fec85889f..000000000
--- a/lib/deindent.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// For some reason, if a script code block has a base indent
-// level, the eval-source-map gets messed up. So we have to
-// manually deindent script code blocks here.
-
-var splitRE = /\r?\n/g
-var emptyRE = /^\s*$/
-
-module.exports = function deindent (str) {
-  var lines = str.split(splitRE)
-  var min = Infinity
-  var type, cur, c
-  for (var i = 0; i < lines.length; i++) {
-    var line = lines[i]
-    if (!emptyRE.test(line)) {
-      if (!type) {
-        c = line.charAt(0)
-        if (c === ' ' || c === '\t') {
-          type = c
-        } else {
-          return str
-        }
-      } else {
-        cur = count(line, type)
-        if (cur < min) {
-          min = cur
-        }
-      }
-    }
-  }
-  return lines.map(function (line) {
-    return line.slice(min)
-  }).join('\n')
-}
-
-function count (line, type) {
-  var i = 0
-  while (line.charAt(i) === type) {
-    i++
-  }
-  return i
-}
diff --git a/lib/parser.js b/lib/parser.js
index 393afc731..546a663ac 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -3,7 +3,7 @@ var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
 var hash = require('hash-sum')
-var deindent = require('./deindent')
+var deindent = require('de-indent')
 var splitRE = /\r?\n/g
 var emptyRE = /^\s*$/
 
diff --git a/package.json b/package.json
index 2865691a1..82f04b26c 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "autoprefixer": "^6.0.3",
+    "de-indent": "^1.0.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
     "lru-cache": "^2.7.0",

From 7dab1602112015867aeb1af0a21a9a53d0e65cef Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2016 17:12:10 -0500
Subject: [PATCH 189/877] upgrade to parse5 2.0

---
 lib/parser.js            | 29 ++++++++++++++---------------
 lib/template-rewriter.js |  6 ++----
 package.json             |  2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 546a663ac..f08d2ce42 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,5 +1,4 @@
 var parse5 = require('parse5')
-var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
 var hash = require('hash-sum')
@@ -22,7 +21,9 @@ module.exports = function (content, filename) {
     styleImports: []
   }
 
-  var fragment = parser.parseFragment(content)
+  var fragment = parse5.parseFragment(content, {
+    locationInfo: true
+  })
 
   fragment.childNodes.forEach(function (node) {
     var type = node.tagName
@@ -30,6 +31,10 @@ module.exports = function (content, filename) {
     var src = getAttribute(node, 'src')
     var scoped = getAttribute(node, 'scoped') != null
 
+    if (!output[type]) {
+      return
+    }
+
     // node count check
     if (
       (type === 'script' || type === 'template') &&
@@ -63,25 +68,19 @@ module.exports = function (content, filename) {
       return
     }
 
-    if (!node.childNodes || !node.childNodes.length) {
+    // skip empty script/style tags
+    if (type !== 'template' && (!node.childNodes || !node.childNodes.length)) {
       return
     }
 
-    if (!output[type]) {
-      return
-    }
-
-    // Work around changes in parse5 >= 1.2.0
-    if (node.childNodes[0].nodeName === '#document-fragment') {
-      node = node.childNodes[0]
-      if (!node.childNodes.length) {
-        return
-      }
+    // template content is nested inside the content fragment
+    if (type === 'template') {
+      node = node.content
     }
 
     // extract part
-    var start = node.childNodes[0].__location.start
-    var end = node.childNodes[node.childNodes.length - 1].__location.end
+    var start = node.childNodes[0].__location.startOffset
+    var end = node.childNodes[node.childNodes.length - 1].__location.endOffset
     var result
     var lineOffset
     if (type === 'script') {
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
index ba7b9b6ef..2a0e9f5d6 100644
--- a/lib/template-rewriter.js
+++ b/lib/template-rewriter.js
@@ -1,13 +1,11 @@
 var parse5 = require('parse5')
-var parser = new parse5.Parser()
-var serializer = new parse5.Serializer()
 var loaderUtils = require('loader-utils')
 
 module.exports = function (html) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var id = query.id
-  var tree = parser.parseFragment(html)
+  var tree = parse5.parseFragment(html)
   walk(tree, function (node) {
     if (node.attrs) {
       node.attrs.push({
@@ -16,7 +14,7 @@ module.exports = function (html) {
       })
     }
   })
-  return serializer.serialize(tree)
+  return parse5.serialize(tree)
 }
 
 function walk (tree, fn) {
diff --git a/package.json b/package.json
index 82f04b26c..5e39fadba 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "loader-utils": "^0.2.10",
     "lru-cache": "^2.7.0",
     "object-assign": "^4.0.0",
-    "parse5": "^1.5.0",
+    "parse5": "^2.0.2",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
     "source-map": "^0.5.3"

From f623eeeb3197e528a26ed99665bf45e699bac38c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2016 17:23:01 -0500
Subject: [PATCH 190/877] validate template

---
 lib/loader.js   | 2 +-
 lib/parser.js   | 6 +++++-
 lib/selector.js | 2 +-
 package.json    | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 356ba5bdb..e5724bbed 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -135,7 +135,7 @@ module.exports = function (content) {
     }
   }
 
-  var parts = parse(content, fileName)
+  var parts = parse(content, fileName, this.emitWarning)
   var hasLocalStyles = false
   var output = 'var __vue_script__, __vue_template__\n'
 
diff --git a/lib/parser.js b/lib/parser.js
index f08d2ce42..5636699dc 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,4 +1,5 @@
 var parse5 = require('parse5')
+var validateTemplate = require('vue-template-validator')
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
 var hash = require('hash-sum')
@@ -6,7 +7,7 @@ var deindent = require('de-indent')
 var splitRE = /\r?\n/g
 var emptyRE = /^\s*$/
 
-module.exports = function (content, filename) {
+module.exports = function (content, filename, warn) {
 
   var cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
@@ -76,6 +77,9 @@ module.exports = function (content, filename) {
     // template content is nested inside the content fragment
     if (type === 'template') {
       node = node.content
+      if (!lang) {
+        validateTemplate(node, content, warn)
+      }
     }
 
     // extract part
diff --git a/lib/selector.js b/lib/selector.js
index 9b5975471..990bd1917 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -6,7 +6,7 @@ module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var filename = path.basename(this.resourcePath)
-  var parts = parse(content, filename)
+  var parts = parse(content, filename, this.emitWarning)
   var part = parts[query.type][query.index]
   this.callback(null, part.content, part.map)
 }
diff --git a/package.json b/package.json
index 5e39fadba..8db79e379 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
     "parse5": "^2.0.2",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
-    "source-map": "^0.5.3"
+    "source-map": "^0.5.3",
+    "vue-template-validator": "^1.0.0"
   },
   "peerDependencies": {
     "vue-html-loader": "^1.0.0",

From be92a6a264a64866501791034ce6df406adb83e4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2016 17:58:04 -0500
Subject: [PATCH 191/877] use emitError for template syntax errors

---
 lib/loader.js   | 2 +-
 lib/selector.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index e5724bbed..6b98f06fe 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -135,7 +135,7 @@ module.exports = function (content) {
     }
   }
 
-  var parts = parse(content, fileName, this.emitWarning)
+  var parts = parse(content, fileName, this.emitError)
   var hasLocalStyles = false
   var output = 'var __vue_script__, __vue_template__\n'
 
diff --git a/lib/selector.js b/lib/selector.js
index 990bd1917..1dd697861 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -6,7 +6,7 @@ module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var filename = path.basename(this.resourcePath)
-  var parts = parse(content, filename, this.emitWarning)
+  var parts = parse(content, filename, this.emitError)
   var part = parts[query.type][query.index]
   this.callback(null, part.content, part.map)
 }

From ceae62033d3a04e4b749391b4242c7ce8d487780 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2016 20:01:27 -0500
Subject: [PATCH 192/877] raise warnings in the main loader only

---
 lib/loader.js   | 8 +++++++-
 lib/parser.js   | 8 +++++---
 lib/selector.js | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 6b98f06fe..60d129f4c 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -135,10 +135,16 @@ module.exports = function (content) {
     }
   }
 
-  var parts = parse(content, fileName, this.emitError)
+  var parts = parse(content, fileName)
   var hasLocalStyles = false
   var output = 'var __vue_script__, __vue_template__\n'
 
+  // check if there are any template syntax errors
+  var templateWarnings = parts.template.length && parts.template[0].warnings
+  if (templateWarnings) {
+    templateWarnings.forEach(this.emitError)
+  }
+
   // add requires for src imports
   parts.styleImports.forEach(function (impt) {
     if (impt.scoped) hasLocalStyles = true
diff --git a/lib/parser.js b/lib/parser.js
index 5636699dc..34038a788 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -7,7 +7,7 @@ var deindent = require('de-indent')
 var splitRE = /\r?\n/g
 var emptyRE = /^\s*$/
 
-module.exports = function (content, filename, warn) {
+module.exports = function (content, filename) {
 
   var cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
@@ -31,6 +31,7 @@ module.exports = function (content, filename, warn) {
     var lang = getAttribute(node, 'lang')
     var src = getAttribute(node, 'src')
     var scoped = getAttribute(node, 'scoped') != null
+    var warnings = null
 
     if (!output[type]) {
       return
@@ -78,7 +79,7 @@ module.exports = function (content, filename, warn) {
     if (type === 'template') {
       node = node.content
       if (!lang) {
-        validateTemplate(node, content, warn)
+        warnings = validateTemplate(node, content)
       }
     }
 
@@ -129,7 +130,8 @@ module.exports = function (content, filename, warn) {
       lang: lang,
       scoped: scoped,
       content: result,
-      map: map.toJSON()
+      map: map.toJSON(),
+      warnings: warnings
     })
   })
 
diff --git a/lib/selector.js b/lib/selector.js
index 1dd697861..9b5975471 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -6,7 +6,7 @@ module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var filename = path.basename(this.resourcePath)
-  var parts = parse(content, filename, this.emitError)
+  var parts = parse(content, filename)
   var part = parts[query.type][query.index]
   this.callback(null, part.content, part.map)
 }

From 8bb87febea364319fa52cbd63bd06cd71d8c04c5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 4 Jan 2016 22:37:24 -0500
Subject: [PATCH 193/877] upgrade jsdom

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8db79e379..a6135b5e5 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "extract-text-webpack-plugin": "^0.8.2",
     "inject-loader": "^2.0.1",
     "jade": "^1.11.0",
-    "jsdom": "^6.5.1",
+    "jsdom": "^7.2.2",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.3",

From 16004cec6811ac97fd8192c618b4545c4549619b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 11:08:49 -0500
Subject: [PATCH 194/877] also deindent style/template content

---
 lib/parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 34038a788..09390d7dd 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -98,7 +98,7 @@ module.exports = function (content, filename) {
         commentScript(content.slice(end), lang)
     } else {
       lineOffset = content.slice(0, start).split(splitRE).length - 1
-      result = content.slice(start, end)
+      result = deindent(content.slice(start, end))
     }
 
     // generate source map

From 60356c270165d2631c95bc3de863029ac89154ec Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 11:58:36 -0500
Subject: [PATCH 195/877] only generate sourcemap if needed

---
 lib/loader.js   |  2 +-
 lib/parser.js   | 50 +++++++++++++++++++++++++------------------------
 lib/selector.js |  2 +-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 60d129f4c..8b2945aae 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -135,7 +135,7 @@ module.exports = function (content) {
     }
   }
 
-  var parts = parse(content, fileName)
+  var parts = parse(content, fileName, this.sourceMap)
   var hasLocalStyles = false
   var output = 'var __vue_script__, __vue_template__\n'
 
diff --git a/lib/parser.js b/lib/parser.js
index 09390d7dd..4c384b78a 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -7,7 +7,7 @@ var deindent = require('de-indent')
 var splitRE = /\r?\n/g
 var emptyRE = /^\s*$/
 
-module.exports = function (content, filename) {
+module.exports = function (content, filename, needMap) {
 
   var cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
@@ -32,6 +32,7 @@ module.exports = function (content, filename) {
     var src = getAttribute(node, 'src')
     var scoped = getAttribute(node, 'scoped') != null
     var warnings = null
+    var map = null
 
     if (!output[type]) {
       return
@@ -101,36 +102,37 @@ module.exports = function (content, filename) {
       result = deindent(content.slice(start, end))
     }
 
-    // generate source map
-    var map = new SourceMapGenerator()
-    map.setSourceContent(filenameWithHash, content)
-    result.split(splitRE).forEach(function (line, index) {
-      map.addMapping({
-        source: filenameWithHash,
-        original: {
-          line: index + 1 + lineOffset,
-          column: 0
-        },
-        generated: {
-          line: index + 1,
-          column: 0
-        }
+    if (needMap) {
+      // generate source map
+      map = new SourceMapGenerator()
+      map.setSourceContent(filenameWithHash, content)
+      result.split(splitRE).forEach(function (line, index) {
+        map.addMapping({
+          source: filenameWithHash,
+          original: {
+            line: index + 1 + lineOffset,
+            column: 0
+          },
+          generated: {
+            line: index + 1,
+            column: 0
+          }
+        })
       })
-    })
-
-    // workaround for Webpack eval-source-map bug
-    // https://github.com/webpack/webpack/pull/1816
-    // in case the script was piped through another loader
-    // that doesn't pass down the source map properly.
-    if (type === 'script' && !lang) {
-      result += '\n/* generated by vue-loader */\n'
+      // workaround for Webpack eval-source-map bug
+      // https://github.com/webpack/webpack/pull/1816
+      // in case the script was piped through another loader
+      // that doesn't pass down the source map properly.
+      if (type === 'script' && !lang) {
+        result += '\n/* generated by vue-loader */\n'
+      }
     }
 
     output[type].push({
       lang: lang,
       scoped: scoped,
       content: result,
-      map: map.toJSON(),
+      map: map && map.toJSON(),
       warnings: warnings
     })
   })
diff --git a/lib/selector.js b/lib/selector.js
index 9b5975471..11dc029ff 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -6,7 +6,7 @@ module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var filename = path.basename(this.resourcePath)
-  var parts = parse(content, filename)
+  var parts = parse(content, filename, this.sourceMap)
   var part = parts[query.type][query.index]
   this.callback(null, part.content, part.map)
 }

From 96f64929dd77eb16985b1bc6502d8bf8c448d4e3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 12:03:25 -0500
Subject: [PATCH 196/877] fix source map test

---
 test/test.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/test.js b/test/test.js
index a548469ff..63f2433d7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -152,12 +152,11 @@ describe('vue-loader', function () {
         getFile('test.build.js', function (code) {
           var line
           var col
-          var lines = code.split(/\r?\n/g)
           var targetRE = /^\s+msg: 'Hello from Component A!'/
-          lines.some(function (l, i) {
+          code.split(/\r?\n/g).some(function (l, i) {
             if (targetRE.test(l)) {
-              line = i
-              col = lines[i - 1].length
+              line = i + 1
+              col = l.length
               return true
             }
           })

From 577a547231055d8ee4178d3ea964d382abaf11b1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 13:28:01 -0500
Subject: [PATCH 197/877] use parse5 2.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a6135b5e5..0be3dd265 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "loader-utils": "^0.2.10",
     "lru-cache": "^2.7.0",
     "object-assign": "^4.0.0",
-    "parse5": "^2.0.2",
+    "parse5": "^2.1.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
     "source-map": "^0.5.3",

From ce9337f4264a42e12000276c12b80840b9b8f4ba Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 13:35:34 -0500
Subject: [PATCH 198/877] no need to modify source url in style-rewriter now we
 have cache busting

---
 lib/style-rewriter.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index cd58016d4..f66af3da5 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -81,11 +81,6 @@ module.exports = function (css, map) {
     .process(css, opts)
     .then(function (result) {
       var map = result.map && result.map.toJSON()
-      // ensure we give the style source a unique name
-      // so that Webpack doesn't get confused
-      if (map) {
-        map.sources[0] = query.file + '.style'
-      }
       cb(null, result.css, map)
     })
     .catch(function (e) {

From bfccd14d782d0dcf23dd6a7ac25f0edc6b6da7fb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 14:22:10 -0500
Subject: [PATCH 199/877] use vue-style-loader instead of style-loader

---
 docs/start/tutorial.md | 4 ++--
 lib/loader.js          | 4 ++--
 package.json           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index 30feb7bba..67833fafe 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -30,7 +30,7 @@ npm init
 # Install everything we need
 npm install\
   webpack webpack-dev-server\
-  vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
+  vue-loader vue-html-loader css-loader vue-style-loader vue-hot-reload-api\
   babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
   babel-runtime@5\
   --save-dev
@@ -52,9 +52,9 @@ After proper installation, your `package.json`'s `devDependencies` field should
     "babel-preset-es2015": "^6.3.13",
     "babel-runtime": "^5.8.34",
     "css-loader": "^0.23.0",
-    "style-loader": "^0.13.0",
     "vue-hot-reload-api": "^1.2.2",
     "vue-html-loader": "^1.0.0",
+    "vue-style-loader": "^1.0.0",
     "vue-loader": "^7.2.0",
     "webpack": "^1.12.9",
     "webpack-dev-server": "^1.14.0"
diff --git a/lib/loader.js b/lib/loader.js
index 8b2945aae..acf37d06a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -13,7 +13,7 @@ var defaultLang = {
 
 var defaultLoaders = {
   html: 'vue-html-loader',
-  css: 'style-loader!css-loader',
+  css: 'vue-style-loader!css-loader',
   js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime'
 }
 
@@ -40,7 +40,7 @@ module.exports = function (content) {
 
   // enable css source map if needed
   if (this.sourceMap) {
-    defaultLoaders.css = 'style-loader!css-loader?sourceMap'
+    defaultLoaders.css = 'vue-style-loader!css-loader?sourceMap'
   }
 
   // check if there are custom loaders specified via
diff --git a/package.json b/package.json
index 0be3dd265..69ed8e68c 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   "peerDependencies": {
     "vue-html-loader": "^1.0.0",
     "css-loader": "*",
-    "style-loader": "*",
+    "vue-style-loader": "^1.0.0",
     "babel-loader": "^6.1.0",
     "babel-core": "^6.1.2",
     "babel-plugin-transform-runtime": "^6.1.2",
@@ -71,7 +71,7 @@
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.3",
     "rimraf": "^2.4.0",
-    "style-loader": "^0.13.0",
+    "vue-style-loader": "^1.0.0",
     "stylus-loader": "^1.4.0",
     "template-html-loader": "^0.0.3",
     "vue-hot-reload-api": "^1.2.0",

From fd3ce5ab8629b6e8cc2d7a3f0a1a48321818e2d9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Jan 2016 14:26:18 -0500
Subject: [PATCH 200/877] 8.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 69ed8e68c..7949d8871 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "7.5.2",
+  "version": "8.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9639ace8a25cce2e66c83fab0c9f9acfd573a63e Mon Sep 17 00:00:00 2001
From: Zhangdroid <contrary.zhuo@gmail.com>
Date: Thu, 7 Jan 2016 00:05:13 +0800
Subject: [PATCH 201/877] change "cssnext" to "postcss-cssnext"

---
 docs/features/postcss.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/postcss.md b/docs/features/postcss.md
index ca45bd05e..487b9e71f 100644
--- a/docs/features/postcss.md
+++ b/docs/features/postcss.md
@@ -40,7 +40,7 @@ module.exports = {
   // other configs...
   vue: {
     // use custom postcss plugins
-    postcss: [require('cssnext')()],
+    postcss: [require('postcss-cssnext')()],
     // disable vue-loader autoprefixing.
     // this is a good idea since cssnext comes with it too.
     autoprefixer: false

From fa03c63106395e5b1c3acc2b06f7677a9562d082 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 6 Jan 2016 18:26:33 -0500
Subject: [PATCH 202/877] do not add mappings for empty/comment lines (fix
 module.exports source map bug)

---
 lib/loader.js           |  2 +-
 lib/parser.js           | 41 ++++++++++++++++++++++++-----------------
 test/fixtures/basic.vue | 14 +++++++-------
 test/test.js            |  2 +-
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index acf37d06a..efd8e168a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -14,7 +14,7 @@ var defaultLang = {
 var defaultLoaders = {
   html: 'vue-html-loader',
   css: 'vue-style-loader!css-loader',
-  js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime'
+  js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
 }
 
 var rewriterInjectRE = /\b((css|(vue-)?html)(-loader)?(\?[^!]+)?!?)\b/
diff --git a/lib/parser.js b/lib/parser.js
index 4c384b78a..b490b64a8 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -106,18 +106,27 @@ module.exports = function (content, filename, needMap) {
       // generate source map
       map = new SourceMapGenerator()
       map.setSourceContent(filenameWithHash, content)
+
+      // do not add mappings for comment lines - babel's source map
+      // somehow gets messed up because of it
+      var isCommentLine = function (line) {
+        return type === 'script' && !lang && line.indexOf('//') === 0
+      }
+
       result.split(splitRE).forEach(function (line, index) {
-        map.addMapping({
-          source: filenameWithHash,
-          original: {
-            line: index + 1 + lineOffset,
-            column: 0
-          },
-          generated: {
-            line: index + 1,
-            column: 0
-          }
-        })
+        if (!emptyRE.test(line) && !isCommentLine(line)) {
+          map.addMapping({
+            source: filenameWithHash,
+            original: {
+              line: index + 1 + lineOffset,
+              column: 0
+            },
+            generated: {
+              line: index + 1,
+              column: 0
+            }
+          })
+        }
       })
       // workaround for Webpack eval-source-map bug
       // https://github.com/webpack/webpack/pull/1816
@@ -145,19 +154,17 @@ function commentScript (content, lang) {
   return content
     .split(splitRE)
     .map(function (line) {
-      if (emptyRE.test(line)) {
-        return line
-      }
+      line = emptyRE.test(line) ? '' : ' ' + line
       switch (lang) {
         case 'coffee':
         case 'coffee-jsx':
         case 'coffee-redux':
-          return '# ' + line
+          return '#' + line
         case 'purs':
         case 'ulmus':
-          return '-- ' + line
+          return '--' + line
         default:
-          return '// ' + line
+          return '//' + line
       }
     })
     .join('\n')
diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
index 47a9344d8..5035c8304 100644
--- a/test/fixtures/basic.vue
+++ b/test/fixtures/basic.vue
@@ -1,15 +1,9 @@
-<style>
-comp-a h2 {
-  color: #f00;
-}
-</style>
-
 <template>
   <h2 class="red">{{msg}}</h2>
 </template>
 
 <script>
-export default {
+module.exports = {
   data () {
     return {
       msg: 'Hello from Component A!'
@@ -17,3 +11,9 @@ export default {
   }
 }
 </script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
diff --git a/test/test.js b/test/test.js
index 63f2433d7..7c5bf77ff 100644
--- a/test/test.js
+++ b/test/test.js
@@ -165,7 +165,7 @@ describe('vue-loader', function () {
             column: col
           })
           expect(pos.source.indexOf('basic.vue') > -1)
-          expect(pos.line).to.equal(15)
+          expect(pos.line).to.equal(9)
           done()
         })
       })

From d249aa4a8838817061ed39de497980b264995989 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 6 Jan 2016 18:36:44 -0500
Subject: [PATCH 203/877] also skip comment line source maps for other langs

---
 lib/parser.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index b490b64a8..0c6223c4a 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -6,6 +6,13 @@ var hash = require('hash-sum')
 var deindent = require('de-indent')
 var splitRE = /\r?\n/g
 var emptyRE = /^\s*$/
+var commentSymbols = {
+  'coffee': '#',
+  'coffee-jsx': '#',
+  'coffee-redux': '#',
+  'purs': '--',
+  'ulmus': '--'
+}
 
 module.exports = function (content, filename, needMap) {
 
@@ -110,7 +117,8 @@ module.exports = function (content, filename, needMap) {
       // do not add mappings for comment lines - babel's source map
       // somehow gets messed up because of it
       var isCommentLine = function (line) {
-        return type === 'script' && !lang && line.indexOf('//') === 0
+        return type === 'script' &&
+          line.indexOf(getCommentSymbol(lang)) === 0
       }
 
       result.split(splitRE).forEach(function (line, index) {
@@ -151,25 +159,19 @@ module.exports = function (content, filename, needMap) {
 }
 
 function commentScript (content, lang) {
+  var symbol = getCommentSymbol(lang)
   return content
     .split(splitRE)
     .map(function (line) {
-      line = emptyRE.test(line) ? '' : ' ' + line
-      switch (lang) {
-        case 'coffee':
-        case 'coffee-jsx':
-        case 'coffee-redux':
-          return '#' + line
-        case 'purs':
-        case 'ulmus':
-          return '--' + line
-        default:
-          return '//' + line
-      }
+      return symbol + (emptyRE.test(line) ? '' : ' ' + line)
     })
     .join('\n')
 }
 
+function getCommentSymbol (lang) {
+  return commentSymbols[lang] || '//'
+}
+
 function getAttribute (node, name) {
   if (node.attrs) {
     var i = node.attrs.length

From 34bf82c7835ca2a3b1c6faa578f6e01fd1422bce Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 6 Jan 2016 18:37:05 -0500
Subject: [PATCH 204/877] 8.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7949d8871..335fada40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b79e048c651178cda4fc56a3317439652778ff97 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 7 Jan 2016 09:14:33 -0500
Subject: [PATCH 205/877] preserve EOL when creating comment scripts

---
 lib/parser.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 0c6223c4a..be4a40981 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -160,12 +160,16 @@ module.exports = function (content, filename, needMap) {
 
 function commentScript (content, lang) {
   var symbol = getCommentSymbol(lang)
-  return content
-    .split(splitRE)
-    .map(function (line) {
+  var lines = content.split(splitRE)
+  return lines.map(function (line, index) {
+    // preserve EOL
+    if (index === lines.length - 1 && emptyRE.test(line)) {
+      return ''
+    } else {
       return symbol + (emptyRE.test(line) ? '' : ' ' + line)
-    })
-    .join('\n')
+    }
+  })
+  .join('\n')
 }
 
 function getCommentSymbol (lang) {

From baad51ac0efc2ee93dac2aa0bd259c2f405b347d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 7 Jan 2016 09:14:53 -0500
Subject: [PATCH 206/877] 8.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 335fada40..f2d77cd64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From cf7ae96b87528857e596f969dc1ea2e0f59b1b94 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 13 Jan 2016 00:53:38 -0500
Subject: [PATCH 207/877] add warning for ignored named exports

---
 lib/loader.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/loader.js b/lib/loader.js
index efd8e168a..805650a48 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -167,6 +167,16 @@ module.exports = function (content) {
           ? getRequireForImport('script', script, 0)
           : getRequire('script', script, 0)
       )
+    // check and warn named exports
+    if (!this.minimize) {
+      output +=
+        'if (__vue_script__ &&\n' +
+        '    __vue_script__.__esModule &&\n' +
+        '    Object.keys(__vue_script__).length > 1) {\n' +
+        '  console.warn("[vue-loader] ' + path.relative(process.cwd(), filePath) +
+          ': named exports in *.vue files are ignored.")' +
+        '}\n'
+    }
   }
 
   // add require for template

From b36eb07ab67f29aace1954e3462c1ba75c51dde2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 22 Jan 2016 11:22:47 -0500
Subject: [PATCH 208/877] Avoid style import duplication when extracted (fix
 #139)

Ensure non-scoped style imports have the same identifier by only
adding style-rewriter query parameters when the style is scoped,
becuase extract-text-webpack-plugin relies on the module
identifier for dedupe.
---
 lib/loader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 805650a48..8f898ac80 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -110,12 +110,12 @@ module.exports = function (content) {
   }
 
   function getRewriter (type, scoped) {
-    var meta = '?id=' + moduleId + '&file=' + fileName
+    var meta = '?id=' + moduleId
     switch (type) {
       case 'template':
         return scoped ? (rewriters.template + meta + '!') : ''
       case 'style':
-        return rewriters.style + meta + (scoped ? '&scoped=true!' : '!')
+        return rewriters.style + (scoped ? meta + '&scoped=true!' : '!')
       default:
         return ''
     }

From 416b26379fd9e3c2231047a2894a167356b9c0a0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 24 Jan 2016 11:45:48 -0500
Subject: [PATCH 209/877] fix scoped CSS rewrite for <template> due to parse5
 upgrade (fix #141)

---
 lib/template-rewriter.js     | 8 ++++++--
 test/fixtures/scoped-css.vue | 1 +
 test/test.js                 | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
index 2a0e9f5d6..e57c66287 100644
--- a/lib/template-rewriter.js
+++ b/lib/template-rewriter.js
@@ -20,8 +20,12 @@ module.exports = function (html) {
 function walk (tree, fn) {
   if (tree.childNodes) {
     tree.childNodes.forEach(function (node) {
-      fn(node)
-      walk(node, fn)
+      if (node.tagName === 'template') {
+        walk(node.content, fn)
+      } else {
+        fn(node)
+        walk(node, fn)
+      }
     })
   }
 }
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 580745de0..c6b2d4c64 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -13,4 +13,5 @@ h1 {
 <template>
 <div><h1>hi</h1></div>
 <p class="abc def">hi</p>
+<template v-if="ok"><p class="test">yo</p></template>
 </template>
diff --git a/test/test.js b/test/test.js
index 7c5bf77ff..d8e53d9b0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -97,7 +97,8 @@ describe('vue-loader', function () {
       var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
       expect(module.template).to.contain(
         '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
-        '<p class="abc def" ' + id + '="">hi</p>'
+        '<p class="abc def" ' + id + '="">hi</p>\n' +
+        '<template v-if="ok"><p class="test" ' + id + '="">yo</p></template>'
       )
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')

From e88ebcb4bc3fb9758b70aafcecf27563a417216f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 24 Jan 2016 11:45:55 -0500
Subject: [PATCH 210/877] 8.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f2d77cd64..d127cf48d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From eee6bddbe7158782134a13868f889bdaebceaa48 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 24 Jan 2016 11:50:46 -0500
Subject: [PATCH 211/877] handle exporting non-constructor function (close
 #137)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 8f898ac80..ee25d8a81 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -195,7 +195,7 @@ module.exports = function (content) {
     output +=
       'module.exports = __vue_script__ || {}\n' +
       'if (module.exports.__esModule) module.exports = module.exports.default\n' +
-      'if (__vue_template__) { (typeof module.exports === "function" ? module.exports.options : module.exports).template = __vue_template__ }\n'
+      'if (__vue_template__) { (typeof module.exports === "function" ? (module.exports.options || {}) : module.exports).template = __vue_template__ }\n'
     // hot reload
     if (
       process.env.NODE_ENV !== 'production' &&

From 3e1849feb1d47dfe12852271a7d7388f75252450 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 25 Jan 2016 11:22:37 -0500
Subject: [PATCH 212/877] fix warning breaking on windows path (fix #145)

---
 lib/loader.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index ee25d8a81..2e37b80ea 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -173,8 +173,10 @@ module.exports = function (content) {
         'if (__vue_script__ &&\n' +
         '    __vue_script__.__esModule &&\n' +
         '    Object.keys(__vue_script__).length > 1) {\n' +
-        '  console.warn("[vue-loader] ' + path.relative(process.cwd(), filePath) +
-          ': named exports in *.vue files are ignored.")' +
+        '  console.warn(' + JSON.stringify(
+            '[vue-loader] ' + path.relative(process.cwd(), filePath) +
+            ': named exports in *.vue files are ignored.'
+          ) + ')' +
         '}\n'
     }
   }

From a9b34913df6f2c7b6c9348563a4ddd358dc11677 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 25 Jan 2016 11:22:41 -0500
Subject: [PATCH 213/877] 8.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d127cf48d..4cfc7005b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.0.3",
+  "version": "8.0.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 664e0d774f785344c12d9a55b9f59574d24fef31 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 25 Jan 2016 11:26:51 -0500
Subject: [PATCH 214/877] fix template rewriter when dealing with templates
 inside <svg>

---
 lib/template-rewriter.js     | 7 +++++--
 test/fixtures/scoped-css.vue | 1 +
 test/test.js                 | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
index e57c66287..debdb71c2 100644
--- a/lib/template-rewriter.js
+++ b/lib/template-rewriter.js
@@ -20,10 +20,13 @@ module.exports = function (html) {
 function walk (tree, fn) {
   if (tree.childNodes) {
     tree.childNodes.forEach(function (node) {
-      if (node.tagName === 'template') {
+      var isTemplate = node.tagName === 'template'
+      if (!isTemplate) {
+        fn(node)
+      }
+      if (isTemplate && node.content) {
         walk(node.content, fn)
       } else {
-        fn(node)
         walk(node, fn)
       }
     })
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index c6b2d4c64..9c9ec3059 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -14,4 +14,5 @@ h1 {
 <div><h1>hi</h1></div>
 <p class="abc def">hi</p>
 <template v-if="ok"><p class="test">yo</p></template>
+<svg><template><p></p></template></svg>
 </template>
diff --git a/test/test.js b/test/test.js
index d8e53d9b0..4ab7d04bd 100644
--- a/test/test.js
+++ b/test/test.js
@@ -98,7 +98,8 @@ describe('vue-loader', function () {
       expect(module.template).to.contain(
         '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
         '<p class="abc def" ' + id + '="">hi</p>\n' +
-        '<template v-if="ok"><p class="test" ' + id + '="">yo</p></template>'
+        '<template v-if="ok"><p class="test" ' + id + '="">yo</p></template>\n' +
+        '<svg ' + id + '=""><template><p ' + id + '=""></p></template></svg>'
       )
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')

From 35f837f6e780354ece194c299759f962f53592e0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 25 Jan 2016 11:26:54 -0500
Subject: [PATCH 215/877] 8.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4cfc7005b..200e83961 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.0.4",
+  "version": "8.0.5",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From dafc50825f44a2c6e2412ee2bb2680fd993d161b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jan 2016 12:11:21 -0800
Subject: [PATCH 216/877] actually fix #137

---
 lib/loader.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 2e37b80ea..ad9810d94 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -197,7 +197,11 @@ module.exports = function (content) {
     output +=
       'module.exports = __vue_script__ || {}\n' +
       'if (module.exports.__esModule) module.exports = module.exports.default\n' +
-      'if (__vue_template__) { (typeof module.exports === "function" ? (module.exports.options || {}) : module.exports).template = __vue_template__ }\n'
+      'if (__vue_template__) {\n' +
+        '(typeof module.exports === "function" ' +
+          '? (module.exports.options || (module.exports.options = {})) ' +
+          ': module.exports).template = __vue_template__\n' +
+      '}\n'
     // hot reload
     if (
       process.env.NODE_ENV !== 'production' &&

From d6bd8e3678d4bd9d9cedb7b293c1aba2edc53e2b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jan 2016 12:30:06 -0800
Subject: [PATCH 217/877] allow disabling css source maps

---
 lib/loader.js         |  2 +-
 lib/style-rewriter.js | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index ad9810d94..ceff3be17 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -39,7 +39,7 @@ module.exports = function (content) {
   }
 
   // enable css source map if needed
-  if (this.sourceMap) {
+  if (this.sourceMap && options.cssSourceMap !== false) {
     defaultLoaders.css = 'vue-style-loader!css-loader?sourceMap'
   }
 
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index f66af3da5..92ddd7457 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -67,14 +67,15 @@ module.exports = function (css, map) {
   opts = {
     from: file,
     to: file,
-    map: this.sourceMap && {
+    map: false
+  }
+  if (this.sourceMap && options.cssSourceMap !== false) {
+    opts.map = {
       inline: false,
-      annotation: false
+      annotation: false,
+      prev: map
     }
   }
-  if (map && opts.map) {
-    opts.map.prev = map
-  }
 
   currentId = query.id
   postcss(plugins)

From edc52389950a0ac3d342110c3e2247154bdaadb2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jan 2016 12:43:33 -0800
Subject: [PATCH 218/877] update docs for options

---
 docs/SUMMARY.md |  1 +
 docs/options.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 docs/options.md

diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 14c8b0a10..1c4d10f64 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -16,3 +16,4 @@
   - [Linting](workflow/linting.md)
   - [Testing](workflow/testing.md)
   - [Testing with Mocks](workflow/testing-with-mocks.md)
+- [Options Reference](options.md)
diff --git a/docs/options.md b/docs/options.md
new file mode 100644
index 000000000..5b51f0d28
--- /dev/null
+++ b/docs/options.md
@@ -0,0 +1,56 @@
+# Options Reference
+
+### loaders
+
+- type: `Object`
+
+  An object specifying Webpack loaders to use for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+
+  - `<template>`: `html`
+  - `<script>`: `js`
+  - `<style>`: `css`
+
+  For example, to use `babel-loader` and `eslint-loader` to process all `<script>` blocks:
+
+  ``` js
+  // ...
+  vue: {
+    loaders: {
+      js: 'babel!eslint'
+    }
+  }
+  ```
+
+### autoprefixer
+
+- type: `Boolean`
+- default: `true`
+
+  Whether to enable autoprefixer for CSS inside `*.vue` files.
+
+### postcss
+
+- type: `Array` or `Function`
+
+  Specify custom PostCSS plugins to be applied to CSS inside `*.vue` files. If using a function, the function will called using the same loader context and should return an Array of plugins.
+
+  ``` js
+  // ...
+  vue: {
+    // note: do not nest the `postcss` option under `loaders`
+    postcss: [require('postcss-cssnext')()],
+    autoprefixer: false,
+    loaders: {
+      // ...
+    }
+  }
+  ```
+
+### cssSourceMap
+
+- type: `Boolean`
+- default: `true`
+
+  Whether to enable source maps for CSS. Disabling this can avoid some relative path related bugs in `css-loader` and make the build a bit faster.
+
+  Note this is automatically set to `false` if the `devtool` option is not present in the main Webpack config.

From 44f8de5f3ebdb0045d5715c48d0a7ae7011b1d7e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jan 2016 12:43:42 -0800
Subject: [PATCH 219/877] 8.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 200e83961..e3b82ecbb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.0.5",
+  "version": "8.1.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9c1135b00a5f46e9ed9ece95823abec181204398 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 29 Jan 2016 22:18:56 -0800
Subject: [PATCH 220/877] only append hot reload code when not minimizing

---
 lib/loader.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index ceff3be17..8fc431e89 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -24,8 +24,8 @@ var rewriters = {
 }
 
 module.exports = function (content) {
-  var self = this
   this.cacheable()
+  var loaderContext = this
   var options = this.options.vue || {}
   var query = loaderUtils.parseQuery(this.query)
   var vueUrl = loaderUtils.getRemainingRequest(this)
@@ -54,7 +54,7 @@ module.exports = function (content) {
   }
 
   function getRequireString (type, part, index, scoped) {
-    return loaderUtils.stringifyRequest(self,
+    return loaderUtils.stringifyRequest(loaderContext,
       // disable system loaders (except post loaders)
       '-!' +
       // get loader string for pre-processors
@@ -73,7 +73,7 @@ module.exports = function (content) {
   }
 
   function getRequireForImportString (type, impt, scoped) {
-    return loaderUtils.stringifyRequest(self,
+    return loaderUtils.stringifyRequest(loaderContext,
       '-!' +
       getLoaderString(type, impt, scoped) +
       impt.src
@@ -204,6 +204,7 @@ module.exports = function (content) {
       '}\n'
     // hot reload
     if (
+      !this.minimize &&
       process.env.NODE_ENV !== 'production' &&
       (parts.script.length || parts.template.length)
     ) {

From ada24f2e50fee00b664db184e8bb4059e91f1ddd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 2 Feb 2016 18:11:26 -0500
Subject: [PATCH 221/877] disable css sourcemap if minimizing or in production
 mode

---
 lib/loader.js         | 7 ++++++-
 lib/style-rewriter.js | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 8fc431e89..ae21586e7 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -39,7 +39,12 @@ module.exports = function (content) {
   }
 
   // enable css source map if needed
-  if (this.sourceMap && options.cssSourceMap !== false) {
+  if (
+    this.sourceMap &&
+    !this.minimize &&
+    options.cssSourceMap !== false &&
+    process.env.NODE_ENV !== 'production'
+  ) {
     defaultLoaders.css = 'vue-style-loader!css-loader?sourceMap'
   }
 
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 92ddd7457..23064b00b 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -69,7 +69,12 @@ module.exports = function (css, map) {
     to: file,
     map: false
   }
-  if (this.sourceMap && options.cssSourceMap !== false) {
+  if (
+    this.sourceMap &&
+    !this.minimize &&
+    options.cssSourceMap !== false &&
+    process.env.NODE_ENV !== 'production'
+  ) {
     opts.map = {
       inline: false,
       annotation: false,

From 41cd9a0238c01f0621694b8d507f89ccf76377dd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 2 Feb 2016 18:11:35 -0500
Subject: [PATCH 222/877] 8.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3b82ecbb..9eaf85b07 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 3019f3258be560035429002be46a84bd9e1613ce Mon Sep 17 00:00:00 2001
From: Scott Bedard <scottbedard@users.noreply.github.com>
Date: Sat, 13 Feb 2016 03:22:41 -0700
Subject: [PATCH 223/877] Typo

---
 docs/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configurations/pre-processors.md b/docs/configurations/pre-processors.md
index 395931838..a328119f8 100644
--- a/docs/configurations/pre-processors.md
+++ b/docs/configurations/pre-processors.md
@@ -28,7 +28,7 @@ npm install coffee-loader --save-dev
 
 ``` html
 <script lang="coffee">
-  # Write coffeesciprt!
+  # Write coffeescript!
 </script>
 ```
 

From 29192febd8e65eb413f6442be0b6edef6a2853dd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Feb 2016 15:28:11 -0500
Subject: [PATCH 224/877] use raw file path when selecting parts

---
 lib/loader.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index ae21586e7..b80e6cd19 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -28,7 +28,6 @@ module.exports = function (content) {
   var loaderContext = this
   var options = this.options.vue || {}
   var query = loaderUtils.parseQuery(this.query)
-  var vueUrl = loaderUtils.getRemainingRequest(this)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = '_v-' + hash(filePath)
@@ -67,7 +66,7 @@ module.exports = function (content) {
       // select the corresponding part from the vue file
       getSelectorString(type, index || 0) +
       // the url to the actual vuefile
-      vueUrl
+      filePath
     )
   }
 

From e7479443735e051e5db65dd85a47fb35a898a007 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Feb 2016 15:28:28 -0500
Subject: [PATCH 225/877] 8.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9eaf85b07..c34ca24f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.1.1",
+  "version": "8.1.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b92b1e417b67306f17681c4b6e7fabc5c0079ad2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Feb 2016 15:40:50 -0500
Subject: [PATCH 226/877] disable all configuration loaders when selecting
 parts

---
 lib/loader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index b80e6cd19..1449ea7d8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -59,8 +59,8 @@ module.exports = function (content) {
 
   function getRequireString (type, part, index, scoped) {
     return loaderUtils.stringifyRequest(loaderContext,
-      // disable system loaders (except post loaders)
-      '-!' +
+      // disable all configuration loaders
+      '!!' +
       // get loader string for pre-processors
       getLoaderString(type, part, scoped) +
       // select the corresponding part from the vue file

From 3ac4d6b2e9258e1d5f89892c8cab4004e323c146 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Feb 2016 15:40:57 -0500
Subject: [PATCH 227/877] 8.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c34ca24f8..13402843a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.1.2",
+  "version": "8.1.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 5e23e5591b404299a3f73a648bdc91578d2fbd32 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 15 Feb 2016 15:58:52 -0500
Subject: [PATCH 228/877] update lint docs

---
 docs/workflow/linting.md | 63 ++++++++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/docs/workflow/linting.md b/docs/workflow/linting.md
index 97dba9e6c..417d5b75a 100644
--- a/docs/workflow/linting.md
+++ b/docs/workflow/linting.md
@@ -2,9 +2,23 @@
 
 You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
 
-When using ESLint directly, you can use it with the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) with also supports extracting and linting the JavaScript inside `*.vue` files.
+You will also need the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) with supports extracting and linting the JavaScript inside `*.vue` files.
 
-Another option is using the [eslint-loader](https://github.com/MoOx/eslint-loader), and configure it to lint the JavaScript code in `*.vue` files directly:
+Make sure to include the plugin in your ESLint config:
+
+``` json
+"plugins": [
+  "html"
+]
+```
+
+Then from the command line:
+
+``` bash
+eslint --ext js,vue MyComponent.vue
+```
+
+Another option is using [eslint-loader](https://github.com/MoOx/eslint-loader) so that your `*.vue` files are automatically linted on save during development:
 
 ``` bash
 npm install eslint eslint-loader --save-dev
@@ -14,22 +28,41 @@ npm install eslint eslint-loader --save-dev
 // webpack.config.js
 module.exports = {
   // ... other options
-  vue: {
-    loaders: {
-      js: 'babel!eslint'
-    }
-  },
-  babel: {
-    presets: ['es2015'],
-    plugins: ['transform-runtime']
+  module: {
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue!eslint'
+      }
+    ]
   }
 }
 ```
 
-Two things to note here:
-
-1. We are overwriting the default loader string for all JavaScript in `*.vue` files - if we still want ES2015, we need to explicitly apply `babel-loader` and related configurations.
+Note that Webpack loader chains are applied **right-first**. Make sure to apply `eslint` before `vue` so we are linting the pre-compile source code.
 
-2. Webpack loader chains are applied right-first. Make sure to apply `eslint` before `babel` so we are linting the pre-compile source code.
+One thing we need to consider is using third party `*.vue` components shipped in NPM packages. In such case, we want to use `vue-loader` to process the third party component, but do not want to lint it. We can separate the linting into Webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order):
 
-And don't forget to create your `.eslintrc` config. Now when you run `webpack-dev-server`, you'll get instant lint warnings as you save the file!
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    // only lint local *.vue files
+    preLoaders: [
+      {
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      }
+    ],
+    // but use vue-loader for all *.vue files
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```

From 654c338629a8519d83323d4f3ca346856c73ccf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E6=A0=91?= <tiehang.lth@taobao.com>
Date: Wed, 17 Feb 2016 12:17:37 +0800
Subject: [PATCH 229/877] move `defaultLoaders` to module.exports to prevent
 that in mutiple webpack build situations, previous `defaultLoaders`
 configuration will be cached and apply to following builds, which would
 ignore following `webpack.vue` options such as `cssSourceMap: false`

---
 lib/loader.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 1449ea7d8..e1b455442 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -11,12 +11,6 @@ var defaultLang = {
   script: 'js'
 }
 
-var defaultLoaders = {
-  html: 'vue-html-loader',
-  css: 'vue-style-loader!css-loader',
-  js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
-}
-
 var rewriterInjectRE = /\b((css|(vue-)?html)(-loader)?(\?[^!]+)?!?)\b/
 var rewriters = {
   template: require.resolve('./template-rewriter'),
@@ -24,6 +18,13 @@ var rewriters = {
 }
 
 module.exports = function (content) {
+
+  var defaultLoaders = {
+    html: 'vue-html-loader',
+    css: 'vue-style-loader!css-loader',
+    js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
+  }
+  
   this.cacheable()
   var loaderContext = this
   var options = this.options.vue || {}

From 6ef4f84f86c67398f30e3d3c4d04a2e42d787a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E6=A0=91?= <tiehang.lth@taobao.com>
Date: Wed, 17 Feb 2016 15:11:48 +0800
Subject: [PATCH 230/877] fix eslint no-trailing-spaces

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index e1b455442..fa950944e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -24,7 +24,7 @@ module.exports = function (content) {
     css: 'vue-style-loader!css-loader',
     js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
   }
-  
+
   this.cacheable()
   var loaderContext = this
   var options = this.options.vue || {}

From 509618729dc3331c1cdd2f57b744b062f3b4a92d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 19 Feb 2016 11:58:54 -0500
Subject: [PATCH 231/877] also disable all loaders for imports

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index fa950944e..2f56d07f3 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -79,7 +79,7 @@ module.exports = function (content) {
 
   function getRequireForImportString (type, impt, scoped) {
     return loaderUtils.stringifyRequest(loaderContext,
-      '-!' +
+      '!!' +
       getLoaderString(type, impt, scoped) +
       impt.src
     )

From fadb53b3b7876a18f0b782f69fc354287e21660b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 19 Feb 2016 14:21:26 -0500
Subject: [PATCH 232/877] 8.1.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 13402843a..10a91f6b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.1.3",
+  "version": "8.1.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 4a87168ae0f11e4bed8927473c1b2cd08816ca8d Mon Sep 17 00:00:00 2001
From: J Bruni <joaohbruni@yahoo.com.br>
Date: Sat, 20 Feb 2016 12:19:24 -0200
Subject: [PATCH 233/877] Comments section in the Vue Component Spec doc

Closes https://github.com/vuejs/vue-loader/issues/159
---
 docs/start/spec.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/start/spec.md b/docs/start/spec.md
index 4636343f0..25827545a 100644
--- a/docs/start/spec.md
+++ b/docs/start/spec.md
@@ -84,3 +84,7 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 ### Syntax Highlighting
 
 Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue) and [Brackets](https://github.com/pandao/brackets-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+
+### Comments
+
+Inside each block you shall use the comment syntax of the language being used (HTML, CSS, JavaScript, Jade, etc). For top-level comments, use HTML comment syntax: `<!-- comment contents here -->`

From 117314b4466f43cae2b17ca97b1126c20ce5a15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Jasio=C5=82ek?= <pawel.jasiolek@gmail.com>
Date: Thu, 25 Feb 2016 14:14:41 +0100
Subject: [PATCH 234/877] node-sass dependency

node-sass is not beeing installed with sass-loader, so it has to be
added to the command
---
 docs/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/configurations/pre-processors.md b/docs/configurations/pre-processors.md
index a328119f8..0a799b312 100644
--- a/docs/configurations/pre-processors.md
+++ b/docs/configurations/pre-processors.md
@@ -7,7 +7,7 @@ In Webpack, all pre-processors need to be applied with a corresponding loader. `
 For example, let's compile our `<style>` tag with SASS:
 
 ``` bash
-npm install sass-loader --save-dev
+npm install sass-loader node-sass --save-dev
 ```
 
 ``` html

From 90b04d1140ffb0b60fa97cd92c2ba6517cfc9a4e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 Feb 2016 15:22:10 -0500
Subject: [PATCH 235/877] folder template-html-loader into vue-loader

---
 lib/loader.js          |  4 +++-
 lib/template-loader.js | 39 +++++++++++++++++++++++++++++++++++++++
 package.json           |  2 +-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 lib/template-loader.js

diff --git a/lib/loader.js b/lib/loader.js
index 2f56d07f3..e69de3a84 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -17,6 +17,8 @@ var rewriters = {
   style: require.resolve('./style-rewriter')
 }
 
+var templateLoader = require.resolve('./template-loader')
+
 module.exports = function (content) {
 
   var defaultLoaders = {
@@ -105,7 +107,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + rewriter + 'template-html-loader?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + rewriter + templateLoader + '?raw&engine=' + lang + '!'
         case 'style':
           return defaultLoaders.css + '!' + rewriter + lang + '!'
         case 'script':
diff --git a/lib/template-loader.js b/lib/template-loader.js
new file mode 100644
index 000000000..575ea0c5b
--- /dev/null
+++ b/lib/template-loader.js
@@ -0,0 +1,39 @@
+var cons = require('consolidate')
+var loaderUtils = require('loader-utils')
+var extname = require('path').extname
+
+module.exports = function (content) {
+  this.cacheable && this.cacheable()
+  var callback = this.async()
+  var opt = loaderUtils.parseQuery(this.query)
+
+  function exportContent (content) {
+    if (opt.raw) {
+      callback(null, content)
+    } else {
+      callback(null, 'module.exports = ' + JSON.stringify(content))
+    }
+  }
+
+  // with no engine given, use the file extension as engine
+  if (!opt.engine) {
+    opt.engine = extname(this.request).substr(1).toLowerCase()
+  }
+
+  if (!cons[opt.engine]) {
+    throw new Error(
+      'Template engine \'' + opt.engine + '\' ' +
+      'isn\'t available in Consolidate.js'
+    )
+  }
+
+  // for relative includes
+  opt.filename = this.resourcePath
+
+  cons[opt.engine].render(content, opt, function (err, html) {
+    if (err) {
+      throw err
+    }
+    exportContent(html)
+  })
+}
diff --git a/package.json b/package.json
index 10a91f6b9..2e6d78005 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "autoprefixer": "^6.0.3",
+    "consolidate": "^0.14.0",
     "de-indent": "^1.0.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
@@ -73,7 +74,6 @@
     "rimraf": "^2.4.0",
     "vue-style-loader": "^1.0.0",
     "stylus-loader": "^1.4.0",
-    "template-html-loader": "^0.0.3",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "webpack": "^1.12.2"

From 2be7b208e8e7e317c1e2fea46046de9d790f5b79 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 Feb 2016 15:26:30 -0500
Subject: [PATCH 236/877] update docs about template loader

---
 docs/configurations/pre-processors.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/configurations/pre-processors.md b/docs/configurations/pre-processors.md
index 0a799b312..792332a8f 100644
--- a/docs/configurations/pre-processors.md
+++ b/docs/configurations/pre-processors.md
@@ -34,10 +34,10 @@ npm install coffee-loader --save-dev
 
 ### Templates
 
-Processing templates is a little different, because most Webpack template loaders such as `jade-loader` returns a template function instead of compiled HTML string. So instead of using `jade-loader`, we will use `template-html-loader` plus the raw `jade` compiler:
+Processing templates is a little different, because most Webpack template loaders such as `jade-loader` returns a template function instead of compiled HTML string. Instead of using `jade-loader`, we can just install the original `jade`:
 
 ``` bash
-npm install template-html-loader jade --save-dev
+npm install jade --save-dev
 ```
 
 ``` html
@@ -47,6 +47,8 @@ div
 </template>
 ```
 
+> **Important:** If you are using `vue-loader@<8.2.0`, you also need to install `template-html-loader`.
+
 ### Inline Loader Requests
 
 You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) in the `lang` attribute:

From 5a4f5dcdc0cb6b3b5d46816b4b4c241a0b507eac Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 Feb 2016 15:27:02 -0500
Subject: [PATCH 237/877] 8.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2e6d78005..c7da2b82f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.1.4",
+  "version": "8.2.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 6926a3389ac12e25bdd3ca13fa1bd9f836fb2d4d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 17 Mar 2016 01:12:23 -0400
Subject: [PATCH 238/877] remove babel-runtime peerDep

---
 package.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package.json b/package.json
index c7da2b82f..faa2c43dd 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "babel-core": "^6.1.2",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
-    "babel-runtime": "^5.8.0",
     "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
@@ -58,7 +57,6 @@
     "babel-loader": "^6.1.0",
     "babel-plugin-transform-runtime": "^6.1.2",
     "babel-preset-es2015": "^6.1.2",
-    "babel-runtime": "^5.8.0",
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",

From 6f985982084ec305e82ed1c789f5050d6caadd9e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 17 Mar 2016 01:13:07 -0400
Subject: [PATCH 239/877] remove babel-runtime ref in docs

---
 docs/start/tutorial.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index 67833fafe..cabc39484 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -32,15 +32,12 @@ npm install\
   webpack webpack-dev-server\
   vue-loader vue-html-loader css-loader vue-style-loader vue-hot-reload-api\
   babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
-  babel-runtime@5\
   --save-dev
 npm install vue --save
 ```
 
 That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
 
-You may also notice that we are using `babel-runtime` version 5 instead of the latest 6.x - this is [intentional](https://github.com/vuejs/vue-loader/issues/96#issuecomment-162910917).
-
 After proper installation, your `package.json`'s `devDependencies` field should look like this:
 
 ``` json
@@ -50,7 +47,6 @@ After proper installation, your `package.json`'s `devDependencies` field should
     "babel-loader": "^6.2.0",
     "babel-plugin-transform-runtime": "^6.3.13",
     "babel-preset-es2015": "^6.3.13",
-    "babel-runtime": "^5.8.34",
     "css-loader": "^0.23.0",
     "vue-hot-reload-api": "^1.2.2",
     "vue-html-loader": "^1.0.0",

From 3b42f4f74bc65f2afb8504dc74fdc52cec46c0f8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 17 Mar 2016 01:13:10 -0400
Subject: [PATCH 240/877] 8.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index faa2c43dd..fdd774371 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 20e212e7d4827892e30a3f409a5fc017aa0434b0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 24 Mar 2016 00:03:42 -0400
Subject: [PATCH 241/877] still need babel-runtime as a peerDep for npm2

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index fdd774371..7094da526 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "babel-loader": "^6.1.0",
     "babel-core": "^6.1.2",
     "babel-plugin-transform-runtime": "^6.1.2",
+    "babel-runtime": "^5.8.0",
     "babel-preset-es2015": "^6.1.2",
     "vue-hot-reload-api": "^1.2.0"
   },

From 5b0623806a905b06cc90d18cee307e06eb7e2620 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 24 Mar 2016 00:03:47 -0400
Subject: [PATCH 242/877] 8.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7094da526..248c0bff3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.2.1",
+  "version": "8.2.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From d9e27e89b2872b2d865f845fc5c8fa2324bd792b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 24 Mar 2016 00:04:52 -0400
Subject: [PATCH 243/877] Revert "remove babel-runtime ref in docs"

This reverts commit 6f985982084ec305e82ed1c789f5050d6caadd9e.
---
 docs/start/tutorial.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index cabc39484..67833fafe 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -32,12 +32,15 @@ npm install\
   webpack webpack-dev-server\
   vue-loader vue-html-loader css-loader vue-style-loader vue-hot-reload-api\
   babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
+  babel-runtime@5\
   --save-dev
 npm install vue --save
 ```
 
 That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
 
+You may also notice that we are using `babel-runtime` version 5 instead of the latest 6.x - this is [intentional](https://github.com/vuejs/vue-loader/issues/96#issuecomment-162910917).
+
 After proper installation, your `package.json`'s `devDependencies` field should look like this:
 
 ``` json
@@ -47,6 +50,7 @@ After proper installation, your `package.json`'s `devDependencies` field should
     "babel-loader": "^6.2.0",
     "babel-plugin-transform-runtime": "^6.3.13",
     "babel-preset-es2015": "^6.3.13",
+    "babel-runtime": "^5.8.34",
     "css-loader": "^0.23.0",
     "vue-hot-reload-api": "^1.2.2",
     "vue-html-loader": "^1.0.0",

From bd9dfb800246e7bc319c062f57291577bf0ec848 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 5 Apr 2016 22:12:56 -0400
Subject: [PATCH 244/877] mention vue-cli

---
 docs/start/tutorial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/start/tutorial.md b/docs/start/tutorial.md
index 67833fafe..dd038285d 100644
--- a/docs/start/tutorial.md
+++ b/docs/start/tutorial.md
@@ -1,6 +1,6 @@
 # Basic Tutorial
 
-We are going to walk through setting up a Webpack + `vue-loader` project from scratch. If you are interested in ready-to-run examples, check out [vue-loader-example](https://github.com/vuejs/vue-loader-example) and [vue-hackernews](https://github.com/vuejs/vue-hackernews). However, if you are not already a Webpack expert, I highly recommend going through the following tutorial to understand how the pieces fit together.
+We are going to walk through setting up a Webpack + `vue-loader` project from scratch. If you are interested in ready-to-run examples, check out [vue-cli](https://github.com/vuejs/vue-cli) to quickly scaffold new projects. However, if you are not already a Webpack expert, I highly recommend going through the following tutorial to understand how the pieces fit together.
 
 ### Project Structure
 

From 94cfeba2a03d24c1198f8126679a1096353dc7e8 Mon Sep 17 00:00:00 2001
From: vird <virdvip@gmail.com>
Date: Wed, 6 Apr 2016 14:46:30 +0300
Subject: [PATCH 245/877] iced coffee script loader support

---
 lib/parser.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/parser.js b/lib/parser.js
index be4a40981..7a63229b0 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -7,6 +7,9 @@ var deindent = require('de-indent')
 var splitRE = /\r?\n/g
 var emptyRE = /^\s*$/
 var commentSymbols = {
+  'iced': '#',
+  'iced-jsx': '#',
+  'iced-redux': '#',
   'coffee': '#',
   'coffee-jsx': '#',
   'coffee-redux': '#',

From bf7d225624d061b86e7e89cc5d399006d4000c00 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 6 Apr 2016 14:50:43 -0400
Subject: [PATCH 246/877] add test for URL resolving

---
 package.json              |   3 ++-
 test/fixtures/logo.png    | Bin 0 -> 12772 bytes
 test/fixtures/resolve.js  |   1 +
 test/fixtures/resolve.vue |   9 +++++++++
 test/test.js              |  25 ++++++++++++++++++++++++-
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/logo.png
 create mode 100644 test/fixtures/resolve.js
 create mode 100644 test/fixtures/resolve.vue

diff --git a/package.json b/package.json
index 248c0bff3..28790e936 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "css-loader": "^0.21.0",
     "eslint": "^1.6.0",
     "extract-text-webpack-plugin": "^0.8.2",
+    "file-loader": "^0.8.5",
     "inject-loader": "^2.0.1",
     "jade": "^1.11.0",
     "jsdom": "^7.2.2",
@@ -71,10 +72,10 @@
     "mocha": "^2.2.5",
     "node-libs-browser": "^0.5.3",
     "rimraf": "^2.4.0",
-    "vue-style-loader": "^1.0.0",
     "stylus-loader": "^1.4.0",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
+    "vue-style-loader": "^1.0.0",
     "webpack": "^1.12.2"
   }
 }
diff --git a/test/fixtures/logo.png b/test/fixtures/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b3356a746b8bb5510aaee51f7df5aea4378ee8d
GIT binary patch
literal 12772
zcmch82T)Ym)-H$&N*olL90vnANET3%3IdXIY@%ek$x$T;2*MyJ*+y~(p$Scr3=&#V
zauARp&>%U(zmMb0?|pUet@~cpyH;6pHhZnL_ln<I=NSG#^$zJpx{G*tc%=94%4^`^
zoza8-5}gMt4c4#5!9TP}1wEvuvo+Gw+|3H_wxzR$70W$Ga~mrSD|1V4*DkA@cz6Wt
zc3OH!J(c?saA!web7&8*m!k`y#>2ZQ<K<!wx3@yFSXkNEIZ3gtVH(+3>@20&bcI#;
zRb1q(Z0+v)xLIlXsA|D|?BU{;Y%<a;H@zeP14k>QIg6L0gA+o+ON#9WUkUItw9LoG
z@?#6qUW)C{L+PnJV3BinvtkkE73P8S3*2B473UQY7PuiMz|A7aFCfInFT^Jx#3LXm
z!7nZ$Ak6af4;zr?W@#;<A+PvT7I>0kvqd6ZB>4C|Jw16ng?OFaZ1@Dk#l`vf1^EO8
zdB6@HgtrsY+>6Hv!TuKqc`F3m&CUgB=j_A+aWuDZc1KFFfs_7u1xFVZmA@G~A$}?f
zsEp6c+=Wkom!Hqk5xUop-3X+H)&CyjpYBFzdAnHgX;>kg-QD289@gxC5d+=*dqL1f
za2g4DXSlngl@s!wyc8Q);kC50l(;P_D#|Y+&o3r=TUJ0oK}c4VUtU3hUkF;26A%>o
zi}s!q0%`69xB83L?r&N-#eYjHA?Idgj&yd@a&~t3%X$xNosrH6TW1#*IXRYVD&}xI
zC+PV)q}!iIwQ{rbu(DKib9Q9;p&SXje{uj3VUgPcf}-N0BI1J3;l%~S#Kq*r`DGQw
z<P>g*im?5pwfrX+|4DoMU()h{!|*|t{l(IMEdlp|e*D{S!NcF4Z{-Bs-3|CP!Zr*9
z8L#d=`P*7vqbn1>&n!RtU;S=qT#~jM$vQmzE;@a9c-rnezm%%pNUCL4Z?Ol5^T|`4
zavjWJM`*UqD*=L#ruSwfkpg`dg+WwAgBG)AJMJnzGINiKeO4G0eE->l82<PC6ixi0
z-u*~VoOqk-(c}DYn#Z{v3+#-H$=`}=cRl;Xx9dM^?<OSmTI1t29nq?v!NbER#=F&Y
z29Kf?@5kS>+&`B7#WJ+>uienjpS%Cf@_)wnS8@Lt-(ODwuJ9`ZNaR1c#{VzAzli%c
zdieFczi910Q_uf9Ump#H3qJ49?XDdJEVgU0^-nuX>)vnly30Cxol4=jV*B(2W#5Q=
zZoyqw)~|Z99vkShEvcZ%Gul9NJXmfqlB33(l=X+jS8v;gb!7^)K4G4vKK&sm{RpAY
zXa|RLM59D+?B_$C1m;mhzR|W9s)a8;N9a~BS?g4pNK%w~aZQtaEyGUaQzjA|;I=b%
zPAV^cc(<iSUNTkZK0_C;r&rcqHpuy5y7gMmh?r-WhrJK(R#V24_j0}}v>RIern)a4
zhI(|wR30|9!CyKW7Euzj4~l&9N>-|XEj&zlYZ+NWMQTM+Dn>Sa|7#Z3UzI};wxS)M
z5iocG$XR&=j~^L|KB-jVe&BB^c~JCVHeabiS7tMKFok0*ep-0e3Ze}V4cW;Q{F;|i
zS$nM{@47r;N7}?`S6OPDO>XN^gfMC4@e4?t?VN*ih6ihdqMrioS?+n3lvoDhiA<%h
z#p78S=zV$jMN1#_jm?eU)+~D8>Zr&$YG>4s?$aA0;vM3?Ri43*6b~&tl=Uo8va~MT
z<>ks>Gs>e#6&&0ooD@PIXPo9!ZnA&c5Gu>&{9rQ2$Q7}1n7}39u$DbUbe3Dtk+hdq
zDSK)7{F|d{*}-@89lT@N8WW)f4_Y3)=PQt3&`leqPLEq@F54On3Q{O`3Ek*NVbnPU
z3HRC!)K5#DyF3No?si6u5Okc#a@1b3r+N6zae!<l<ryN*K{RwIH0Q<brVL+<tnWRb
zbeRS;jsCo$5~JMUDnU9e2Dv<@#imwhT!>OadVQefsha<N#6+p&0+Ak)D<!XvsWz1}
z)=s}BH?Sw2T_REHhLj*?cd<&FP3U##Xd7L=yze$b6b)#2??E&@abt46TC^K4WNOQE
z9cZ+ll4Yll1x^lg#5I;sB7}BEy3~4tNAu*vylLjmQX(yVf3IlNIFBFceYsE1ns_&9
z$s+S*#OSc1`{HZy0d8xPo5&ocp57kium)QDJHFdugm;V*P{fzMRpJ2}GJP4MR9NHq
zyMS(6^<zeu@QUR@o7`2$Ns)E^crocRoib~n?i62FvOjQrTXaD|ZD&S)8@+ASDfPs}
z^fFaTLtLU1p^T`<h)78&V=G;oL7qIJd0*u`Qw>>mB{P0x2xXtyPVg#Sd}jsP;8~gz
zYK^AUM8?3mAz<qiTpXon`n*yjob0MdBL*eB+qtt}vBPdw*3>{VD%2h0EqGie+}5cS
z>3_AuW9^jOkayxhI^GLWCW2BtRp*eX>kO{Zk+g}I{px$AXrD-ryTauP;u;cGAfLT-
zSD?0wa8lBaDV0a%bnCmP)=Y2PXe(WwysvAq@G|dvY)E8FQlK92Q))iT3C3DNZ8pT0
z^xBNvl&{jZjB>4M1k9s#@C})~){+R}@JjXYof(EmM3e)0b|n*jq=LwAqt8G<_*=l$
zy-rc})-+~(40YP90onyuio3BUUB~A!jMgE_o8VAUF4miGu-@zM8IP`hju<5zye^-k
zeG=bdFRG?$R6^-YRJk`*b_GQE*?9u{$k?j=qd=I`1^c7fZWgmLBpnK;9ohqXv^hkb
zm1KwQ+FCun1mc|jpv1JDF4(}xQXT}J7S8V~pYc=sgE@#MxS6((3x$#85G*RZy#4l=
z_D$T#lY#h=bjIUB>=5fGmcizywk5(jI-HuY;=A^eXQ-7|3Q$rg5^qkMVqV3;15L#r
z`WA&tUhStHJSIO3&?$Tri=9^B=*bex>D-yE$OcCG)STFdTs#_K)2-3^B#Lp6yEE{%
zttT?<)JM-#X610Il@4oS&l~UWn@J4I5@y7YWV)bF9=ysF-`S(Lrmv$F=$j>r?AAMV
z`~IQ~2Rq(1A6u*LH=mlaIty;}AVt{{bG2}8N)veY<Xhp2H{CH;1G4JA_F&$?eaR;I
zJx0)|{UDX`q3Zr<KVR3?YHm5*=xkvI{792aeST?Vsj$c6u&1P-Gdz-<rQHP&-?G0?
zK78))sJA1!vdrU}&bUu@^_ux=tGGOx{v%y<kizo=KU=<Qa%tT)_K_b2tF}S1+C7n(
z@cT9xN9ZpzD;?^8%opty78l2FlfO`VLk~8S<X<UBq_<V-a=wBODXGnN8j=xEOkU?H
z=<8*jxxW<K$hdV(a=3@9E{XQ?EfSw?&7^-BT<O~g5j9B49-@E)1t6`|rQZ>{ON#G|
zpCH<$CHM1gPc&9Ln={MI->rfzD5VHlM%r%=#e?)i9xR0NdRcKHzH@*(KBAU<*+aze
z@&F$b-7qY4u%U)i?v875tGFCGyuzB@?88-7t~9C%6lLP2+0-`*xO)4`8BY>llBHIA
zFSj;Le1vbJ!xhIx?^M@|-I+0B9W%|Uq{EMtz9bVlw|0=2pF9N1%D?`xYb%W)s_Z?Q
zw5Muirs2MfXOsUIiKmDb;NInp-@WzmBTp{(Jxk;B6XG~MXQ`5vo8EAnRpQlzXQ9a9
z!3Rk~>%iuQR)06kG5g-AN+{?GTIg`}Q)j6CSCmmTXr=6K@q)-$Z4-Hk!~l=eM*6Xu
zZMowHW>@B!2C)oA6S3x$r-&yGYB`m(_>loreKFC&PRUA^`O%lRRiq;Z?rjb`*v;pJ
zt*!1J6CHjRbv0%9u(Ombf}TG=g3g9$q{;QCE~FkBT5$%tc&mFKUJO|@JJ=^+9tWYV
zcHn;4f)12eX~~PW^mXNZA!93zoPJb#1>;;8)P`4cE$uaz+&t~!@CAiw|EQfL^B}3f
zF9jg>mND)ePKe>1#%q514fPsH#9t%qzh?rglEk>QZ_Q#S3MmsyxInBQ<TVI<UjID%
zncY6($-uFvOiyWVkz>wrxZ*1USKb)hd<8YTnSfa_5l-8xQ*+|7iP4f1;m58I6Nje@
z!&YMl^N!J_Ma#1yl5UKug3ZIv5kU?mnZh*qk+(1PrR;<j1LNwvi2U&O*gG?B{@u5Y
zl}Yx%0lqPM^!Au*GGon-0X#57(0zKN;ye)Z+KCkB3dD#bwAD>?b)S+&<0enT%apJ5
zFK^?Xjd`uq9H+aqjz+>8{MtD~I$=ZOhM?wI1ceCYe#08)QhFz`XJtsE)mbGH?Wl$L
z7*BNiovp{)?b03AGKJ^gH_UwqA#NF6R#rSiEk{w#L^3hK87po#Sznl&R;~ej;^gI%
zH3rOHhRpJ3T;v#a)rZ)Je9_xt^IaaE28iEEX(-3!BnwHr9~!E<C<Zb_<HTKXKnI*s
zu;OMBl`uy{umlmjPGsIg9pt%{Hjw88<eO<ftI6&v#CK{MnDQvfl$!uC{<y{R`388^
z?x;tbW737Oc_MeQSU_3v&Wg6y#b3`pT^(eUX@rWc?+aG7?K)uvJ8uP62{E+qX}UuL
za`}3Fxs<En4Cs#-RoR+{i_;fAngNN+Fi06hAwmTNs4)~!#<rV)PZ|jJ!hzVt*m<ry
zCuke=RR`tqD|fQ%#n8#chl5d!c2NpV7I*#GE5hPg)#fUw6!zr<?Uud{rybio^Y_@8
z;@$QLcHDbY%@cjscP{F^0X*43=B_>08R{0!6!W&V+>ZAmd&NGX)_GdboJJO<LsEOF
z+qQ_qoJ^N`iN?O`x*FQPx!l-VRwj(@GNg_W<$Z6aLRCspPWL=`RV2RCPfDW3<kRHx
zTh7#;qb=-(<SLV`nk=7_y>VB122jrQcpF>VkQf(3Jxylq^JlpORzG5QuFIt@&2KB@
zJ(O@4thYJs1F_F@pwK#lXkYL+E0Mw-EWpqqII@#fdHF2&Bt>7f3CV;uXY77+MXkoC
zK4krCRqI{Gg1!citzw11$)V@~A?Yf1tjX~+(xS5a=+pQ?4T{n|DpNAtb>N9o_U`H?
zxTM>u_tz#*!{9HSq#VoA_@s5c`eZcrcV>o*QtAy@H`*#U`{VKPBc~|(>Y_uP3Y5NH
zDU8hsXm~Gz{CHEuFv<Jd_bS-({tTjRL2G~KA&CBV{*fyKbQjN1JJXdn(AOSnu_0vZ
z1HIM7M~22E69cB34%^YDTRFtXH`m2y5P4p{u007drADk96R^QPUr1K8jm5g~1KN#G
zv;G%*3;zuL?_3bPE>&vli0+?0^Lwi4IRkjY%4SG~_2VD~-|71+UD%0CN^hmBgAt=)
zewPa366^2i2$M4ymby|i9rn*6a*<(|9%~L&wsVi1s2K>|ZknlXU8bsse4g3V@Y%E4
z-n$)|rxS!HW5DlKQ`S17p3^cN2Ijhi!Gib|3z7kDXm~kbaN!Jf$JLbBV{RlV09AEH
zpZeBqUaDG?tGu)^O+6*A>*#p)yr`K`_3R9daq)d)+u+I#VXIqB7R3$JqwwyS9Jhn~
zjJipxGN|G_+U(#>92Ycw4rAt$&hAFTI;<JqSo(4o#e(n>o$leDtaOy+aI?|P%Z*CS
zB}?tO5t#@h?;VSBwK0+Kv+=t>TF_A@KC?t+T+I*B#8Q<vFxNWg$<JfXuF>)2uX(Ju
zt7e<t+}bIN<XbvO)>{|IKArp0#W`xSZCnr$%P-R9p{qyFtO4Awwo<A>4xEpA4X3lN
zdb=ZLd;C%Vb7M5mp|;G4lOIX^%4^CgeRsng-quQ&FhLfx50x(2I}VG*n&CIIwm)Z_
z{KjXS+EW*Rtf*NVcC2Y+4iuFRRRUMCV2HEC@D_!GEAbVRI#z+In~JHW(Vtc*ii7vB
z9&RNlS2fraH^KrICe}T*OIsc@x0^9UT8^a-%2JfRVxE4+)4<bU%&~D}c`hR$4ftK*
zz=x5KJzRI@{YFB+OHPG17Cgqa3D9(~ji7TXDM06=eN>7e_ps(nN0;Xw4GM-Vei=p_
z%18j{E+aje{#=GW@Xj2_v?UwnyIm{Ia;!!ZStJ1XV@j)A*BVUqF0Za86rimDv`o*c
z=dZOk5!-v&aX4F)F3dK@RWGoU#PNhLPzyaMO;M^>8bifb>{*~>sajn%6ghf0#3@fW
zAR|>5usIlRFL7*il(_enbC7j7OaRuwG~%RU&kP`G?t3|e@6-FAH;1UQlJbTGEOFAM
zjw|Jk&immjd(P`NTKV;2gEOz#$L#HT2>^(v>icTKIsWCw={aX@P~+za)>3<z#B@?Y
zvNdg-YYYpFlzF3p``mvMB|P8hVP&uh{7rrQ@@O37Z-Yx2b=lbzj10aWrvO)~rmZiZ
zN}W{gIdgt8VSvZKH3r>?Yt&%`Flm`>GwnnfRwZA4mCH0QH?>inQ6e#or?<}UtLS9g
z!{aKumsX3J!tLGNpF+AS1|J2rW&F}I^6>p1Eo1-D(P_si<7sktg|2r;#2^j(SiN1;
z6YebQf!*XT&v(a|N#@$Xi@i4Hf;|m>6=Hk6r?8VSg9_3&%S(iuYX+YW42QOa4o%WW
zd|S_@N~B2eo%ZKkW~V=<mC*DXT54f6lghe`6d+|a)eAZiM~ddl&z~jX3)&{fbl<uv
z@SvATYzJ0$K{vHcfWydrPI3Ao0H>u~H>S$Fw2t>iEi6CblqEt7CkUl4B`YEIKDFpY
zz#|;^vV=*`awq7B4fskysB)m(O<iUPv@%fRND12dAv)#vXLop4?%UG=AQ}9R%_31P
z{T*|XwlaD2osS0R&rsL1rmVL;x5Mb_?%e05suWnW_>k(uAjb}2vG9t7M?nf|A%)Dr
ztE%yxDbI4AQGcFtRlmE@T6U>}Vr2EcJq?hM$%taq3ca~qwymHpz?1lf-`W5kW<)qJ
zdJeF^o`S!6VL}-6w~m!GQWL}+2$FfImGkKIP%*%OK}C+gK!pvcv~zI#h}d`&Zt*^a
zo6q7$#S1R8nHm)o>w?JlF%i3T^KxyZHk+n<Ce6fGf;EP8F`XoLVC&{K^InNU5F1;{
zowbrka-iYXo9+tg;$8k<ZTX^O#dJD%%nS;EoRa&&B5yz{O&`{~+~C@8cme(fJ$Kf<
zQ#5Yy8b#?M-*nISJ1C4chv3zPdzBeGkK8Z5OD6nIUdW?3siXVUuPRgc;#uwk4fcxq
z?wEZxpOeuHEg_YCZP)vs`d|$hilNN+P+@4G>Z35dFhK?GYXt%U*MI9MfAAF%{E35Z
zX5|IIU{qJmR~C#2`izX96>jISe9T~Mmu0wQ>C0Ah52UQA=END~BCkgH{W%Twsg-il
zI+QSVcf&Dcj4QyMZv__;%6dNkF#+M`%5SXKU=1~5AaLc5!KIZ_`>WAXl+xTVl#|RS
z@t)D$P@b%zF<2kQ{Mq_|G01skF@&E4QZ!e7o_Hnnp}J(RXh*1sSs0wT18>CXt~~|7
zsG0p?JCC7R4hDUV2VwXEMLab9O1Gu#>KL&d4qWlw<vy0(5T_iauZ`Hj{_RJ*<^vM*
zkKILi@7a?B@``_KTvEdnZVs-$isLC3Hic|?-b5_UfqE4`p-7*T%AMJRiEdr51Fi~s
zl6f#Yco1CZrQ;n2lGV6pG<D@}vHDYd*mKvLgO(WfB4LoAwPtL}cDVk+AQ#E=y&NW-
zOSxPfYviG;OHB7{>|>3KC=>ab>^T*Vw@5Dvyf*0YD0(l5oL(wz-)k2H=yMsg79uKt
zwHCpIPUd7CH<%2|rBVl}0Tb0}lFhq|=sajhpgx7nkRW+=kR4S7S4KP9IRXWs$bR$;
zPyV-OprKgTOORRg@|b>9ksTCt?wtav7j%jTP-l>QbX@WxnxkfhPB0JnX-u$CA9L8M
zHGp5n(s??c)V8DEHjsBu)3n3yp_2y;&YYn>`h!c>R~z_<Xb5bfb}Vnp@h({hFOyt(
zebOKWMd_E9AwvE2DEnObY^phnEr&ppCEX%;mF%rmS@t4U7PEKB)xs4W5TNYQR`519
zW<9un(|S%w2cUy$>+uY5hVRtPw2Q#Yw8C%p#%icDkL6PMXS?@wH)LTUh(4_hS`{p-
zr4&sq1`Itk8h!QErL3}Kx5B*&X9U>CChU5_q&T`|2TKMlF`96xj{PHfvp{}S&4fCP
zET{6!S#B|=>1SJ4QHL2yU#}OHP`_c;FQKSs3T_eLbac@V<uytlyhu@MMpk^m@j39c
zw5sfDJSErUOG3Z6I4n)m#PSrAnmz!|^6HI?wGRtY5)9AYn(!+2Z$8>Jp?a<|;Qqe0
zjJ@bL7PH%-&cQpSkh7vQuB9&$e5%i`bJbrSj=@b=hyX)~H`6|R>or?Ws`B|2=5Lr>
zpLw}4xU|gOp_6_Pb*yhdf2-*+uk0W@3ZudyXxgt<46EEdC{!zX+L3WY277{Qb~IP<
z(gOZv7GOj-Dh;(_bq&|FRdzYZG1D}y@Y`sAJ075tc{wq-zW`Dfz#HPjB_(yqf$f9@
z0|?uKEd?J9@Xk>8yx|Mmc>&!Snv{C<W@S;@n~M8Zf(aF85k4@U-$k3^J91Up9B!8e
z@2bm8S<xpbIS#ZB3b2e>8W4bko+HwqBAxIDz0>qmV_j~_$_8E}&tTorqq&Q*YYqIn
zYY<e|`yw=g%?3UoHJO9$G5w^C)<(Fg<cO1>q2|tXxpHW^=%fKq(ItBYoLoZ}+V;`T
zC-<VHI9&FPh1*S!6~5PCO>{zURz5G`QB<7Bwt5E}elWX~?S3(quWy|T<T+yMdtz^n
z^%v<tp7XBBO`Yx6A!f3KN4+F22Y|BXBni~&cQXeDw$DMo(EY6-V#7!Gvgx%lbXhw<
zkG-xyl>#9`V<T9VT=~@%KB~&HOP|djeS$mQ8FwxvzGN5uB<P$n#ZRo5wt-QMT*4S1
zxix4{Rp!%NsN@(kwsV5E*!tRrf!e_{NnbLPn&7P&zD82ZqYj%fnnVFVFKum3Tz!ke
zsB&z)7}SkCxO4XLKBYaay%Ku)W6F7aVxOi;6b`y4LKnu)75umu_US>3o^m-(6#>S6
zi|3}FiJs`2W0bzy4Zc@6zWLH|QK!(nkOP3Y8j>^ATQPg)yO8w#ig<;&s)XzE*?Jf~
zxpJw?&7Y0Cf%8dS;qL3j8q*kP3U7QuJ8)l2_e{rV<TKU;NP7Y;Gm+}A&jeS2iuL&W
zj*q(UsX@pqdwx>k$V&FHBD>YcfWgWJcHD$rbNk3$A<x=Q%mkXYTKe+z>Qj`y23cVG
zWrV2Hc@<SNJ?-mDHv3J7>k*X^!t7)5c71@_|4TMD4b<iMw>q#nVd0QPmceU-5e}}=
z0SdsCU#kTR&A?H~TH)hgA8<ZgIK+BfEuxF}=Xy;XXIBi7UoKxIo~Y-HO)Q(Ns>^K{
zup*pP0%LUpfHCXsqM;qO_O^X7LfW%Z+l7?QwQhsxy%YmjUCXnebI05%tfz=YC#~?F
za~ANT+(55-*`p-AI6eCE37YwNO-Mb*j=HuDSugSq)+^gObH^HwmNRG{{$?+We)%!w
zEI#ppzL;jfKLDJ-V(mz)Gd3`fY;n-zkOch$uwguqXr*g4h{46)fC1&+rs#WRL%b`o
zY>{>C2db%j$Ujp~V*KhZ;<vNhG_PZ}pI|5QC=(;wuD?;(_6*(4NOGNmlXiO8Bs~GH
zi#PgXhONnLXnHxG)kvgSx@spCK$>v^eB$%!VoxS7)!J*Z4U9e%@HzN?F6v;-$rdL$
zQhX0V4w##nlHh1TlGq<kvap={9voF&@)-fD6tQcuaS3os{x8jmTPUnCm;&Xqw=HH*
z?>G6{n-(N=^BOVCkDG&D?C~^_zGv9#?f6b3F;!!AEmgXs!|!eW&kmK)gabz4456L!
zwqX99vlAYrAkeAHeXVB7?4|Wb2IyD!#NM8$FFI+5_q5Gs8mJ#O)xIN*F`oi3#`E>&
z#2@njvhfH1IW?wmgJ2AOoz?HFn&YD7ZQ|}VP~gT~v>7f5UcCs~$8wEN{Y-T-Zz^}L
zuh5Sa-$f9E3tE_x;x7D{6uAqOd$^pupx)(Jy)=?`7Xcs=jrH_>UkM}(lux(3TxX_~
z_aYTLSt|igAl-xCgYm;Z4tcGn*6xglRr7&yZco<QbplYI-lIc3zzdF6Wx5v!d#UNw
zIDkgu-`J7igW@PFwi)mP!C2oKdBF29XM4?xeg@s)&oV~(=Z4T<@e9|ksTj$ak<<_v
z?tGU`k_3L&cs=FO8u0`GwB(%Ih{H94wIavW7PDbF-g^i_P+oZ^ej6nRsdM`cSLDWp
z<IUUa)kUt!UDONRL-F`$xox>p!bOR9AG{v~GgcpFf4!Sd_T$#&Dw*Qo<X8dAwznIg
zULnlA7i`si*OJnv`l_Q`4ZA$<Byj=Z9XtWl_KhI_JDHfi$gjt=wmL?R-9?Lu@~WQ)
zNl~>qaeotqG2jp+=t)vim+_bDcQPGES4UZ5Bzk_Esy>HLT<&-M#?VfembeX2e*SJT
z4^`E5C;E{zRRjTGu-Z&}5Q}xx48Q+5HlrbLmv;<1nw>vaLOk|y9K6r%{1dtqK+r`2
zj5{OJM$)QzT$4L@ZY5m;$1}!UtAJdWSrT>4XIhCUtAgii1j0;%7Wkz1Z+*jo47JJN
zwbW3G7S~b^@3H^IS&>#p*0EkYUZ}Pu|BYK*G)-&AKC~`GkKID+4ln@8uVkis{GERk
z422pRDc^4=H-~&ysa8dYLllz;fauNDK`fIlNLNC-RCDgzU^=vyvR>0g-EqXz4VZI3
zbvZA?SWB$UriRGW`qV*vT28tyK8uLMHS_QIcM*V^hmF}bTU^x%?@?HocptHJoePHh
zG4=T!AeJ5iz@i$5VuaFt8L5K0NwDXOW<*6=q*2&_9wDIintpcj6R|kvQUS!WN6*u-
z@U&k6z5M5f8$-e9JJ1_dL(LZneB-?dv+#}u7DI+H09AnI)kB01e;NHvHv4~(lJ<DJ
z3X;xnY`Yi;tBgZMTXKMyy6wQb$@cwIJRiTFy<tmVu_#BN-Zog@_vAMEmyWji?c>7A
zSr%KD=ofaSL#E4S;O!k()=GnSZ0sDMYv_0S{En>3lecF2F~5@xOplLvPQ@JOP!%F@
zoGS=)S^wpiN!{qN+ht~UX=*T(D}##SRx|BsBnqR%A^7A204XwW4wtptI-WjP01!nF
zV24H8pW`=iUod`44eZU|!>kK*?r71qK&;tQ_L)g1bmBX;7_ToaESREE+Zb(S1K5=T
z8i=?iW_toVkwckC{PFN5EIw`_z&m75avi*vHl@MrazZgOuy!_Bq=>|O$x!vxSoe)T
z0>X?2?0Nw3-73yoZ;wM^?tyx(T1d66Im8&qLJWo>VGg2M0>prHvzP>D1>vuXVj5bU
zUvl!E(7H|6jvHM8bTsFOb?XLyW0HaW{(z!%{Z){8Y%|L)0&3A;CtN2*C7n#CJSQY0
zOv>=fpdbd`j}o<(6Gc(h6lmt<K2P0CI2}Kz`fZnfrCFZt4dCw&g8&Hz1otDKAzO9-
zU1yV<H=sF%C59_X1(>j*lKtm|ibroh%QL_Ev>4=NQL-!n@YWXFnB7j_AG#{>=QMhW
zdA|*W&uR2&l*7=U8+LykKB+ra?lpFyC8HDo;}cQg$)|w{BgH@F%IY#}!8(zr$qr)!
zdS|Ki@<tr;&v5@iygEfCqjxi#lKWAZZ1rdcNvT-flXH>F&DfOBrNc>fD<FB2q~)zE
z)>Y3IalT{22uDc)){or1ZJpGbExdW6#KGe`Vc|)yJeMcN)cx^xJrGG<NicY|U)q#*
zA5IF~{JTn&Xmp5^28W(moLwQbL8Y^n54oFvmiX)Bjdp;7Lsk7??<GlkMAu>fNNBMK
zM$rOD;KKY!l$`@aP-KkSPk?RCW!=bzwhw*sn%&0Yz=p2AKUXGkD5(q*<hR%x31Gu3
zI_I8HCs~fgkMeZNzzmr`Yqw>sP!ucps3V{^8cW7WfI#v`F+z_MpS<8|i^b{}<`<K0
zcmM`o#6w{_&jejk((b`Qqy|+93QvkLfN{d(S)?nS&@J-o!pSPyK}<+6?>S*bHs(-P
zteX+(HkOcJeSr$=xlGXJinLzDLLth&Kz>gzI4~F$C~$ZYS7i#EA<}DNFlHJxvHCK!
zq5=m=IH)Fx&bf}VmP_lgDMEpc9?)1GJhWB2M$mQ1?moz6F+e8*#(Vrijr_6gXIaef
zjYA99Lcohp8lT<FGCaWW<_O)Wx)qJVodFt<JIxw^Yo?J+ka7xCINgPVPmF@RclNO+
z4?<C!vJyMcnW{kKG+>Q0DCHLZK&}9QuE%0ZjtlGNzY*{%S{#TVwt86i+ZuMYoU{eb
z#)trlq877k^Auiv5dO&Xj>I5f!u`jde&KO9f9VcP+L`bSb!j#5*!5&9-GbJpS_wut
zL^JYI7U7urZWAeihA7ZL?2mHu=q(SU;cK<{Bo$NDM*+~}>_i%wt`+|1`z<2fbdB?i
z&XeyRzvHI`FU7a&6Or7|2_I_CM*V1o7kx!@;2=b9J+Ee~(2Ykq*C$1TMi#%`0(>wd
z3dY!rhEYfoK(Z)M6}(d|xRu&5PzEyo>mi_*nXpVgt?&kfxr7He(Uxte4?ohgKz^!P
zl2Hhp*k}Alo7yj#5={lMbOP=ehczytlv+DL76R{ByktrQy3nmcsc$sEJF$G=(uA^A
zavVN`(a2}e2B9e;oVnGaIC&17faIE}Zzw)=zrKqTGVS}tbW*ImwF}@JOxhP|jKC%F
zUz&6}Ylf$}CcA+77e5Uzsbjhzca8ryJz#n48sN?sy2=@^=cbzl#|Nek+H<p2yWaAL
zHzy-#@6McW1Kwr3ctzWy>wY#Ij|6{;EtnMn>5~^3_?j|usez*S<N>Xjmlq*%sG1+l
z-hh_67df3O2b|)a2nb$5q-b7iM$Prl3}6M{)5?~QtL3q;_-8uscpKyqFCL&!J(nmg
zdmt^ebx79tJ}q?*Jg*&Sk0cV<(_!(7mc_gKnRKAm@LRGjAEGeI9P<;#d630P^1!f9
zBh(vl?K8-kLFQ1p5J3**wbs?}{#ar4bhO39qwF!7JiuTy9>B(XHbpqj50$vQgr*n-
zpX?V?W0%w7y>}}D@tqqFh;$8K;6DXnc2rI*hZq$0?A4M4O5f84gkG*ahT0Z=PAZj9
zREa{FYR&D)L|OR9BXk##sb*@b1wWI3yNn(v*{Xqe+-lhdK(Dua0fQg?P4pGbA`nDh
zz-K@HD2y)0<j49vMPLj5tLw(xYuKYJYu|z0V{CrrsqiTmcs?n(s^th(l5^K_vvS@Q
zu=~gFeHK0PTN_6cAD)4NwnnPr&I^?Gld*VwaJ*uW7=M(HHu?N>fV@Y!^WgU4D#Hxr
zc;Z7muz&O69b3XMmqzkze*iOs_JQh#K^qb3GE{Q!kPK`fo;kp#(PkX`U%?3h2Hekp
zF{ZJ`H{~&YuA??VvpNq&lJoI;MxYPT!m!7aL2L6*SdESw-jMdhdzJ<nt(TJu5!3~O
zG^Gg+T>1*Qn#{!s9)h~as!ad0K%@fDpf90I<4(3eq`@}GcpOMwk}t)^u{)$dg$b=-
zI%yHKvk+dP2C=vSSPZn8`P2BZ;UIX(ZP$5VvbahcWL$F<M+_FWf{Rd$xLKS`(hfeL
z_h|vn`wcsR?ZCLmjS@n^b3L6L7a~2r3j2r#wf~lLBAxRJ@dSr|^|zOqj*uSGwzjbW
z!*|9GTPk{iOl&fcxlXomj2sCK|8r%4m8*dZd576yiP6pwAn@0Gt^F3bwQ1a#>DIzR
z8<0Yy1G!mmU4gIHr4rRKBA`tFIc3!LOl4M@>ezYkcns2?>+i@hAD01imLq{41sL(a
zv<V7v|Cy;)Vtc(=f(z8dIh$lR$f!$cuE-^SdxU#+ZwxZ^u_JH}@ZNr$AlVHuN)1UQ
z(hc5OqLe-@u%m}EG(X4y;Dvixa5DDp7-VgNxdbee>Ei|en^K}cQ6veV@*c(PhbVvl
z1j}B4%FrVcee%%NRRzCp%m4zaBDcnvMyD0L(ptXNKrBmvLj_RQF2kntiq-nh0iJTx
z#3-D8Q^!<X8k8zRA#LAU^x*!YxpKE343F^T=IBvUb$HJYU3?sZIHs-poBpW%a$;-~
zvdTQ`b3=`s7FLM>>V2NiTdD;@jyvx%_*|kRtWKpG%<O_Ps&7>IZ+;g${P-g=xg>)s
zMpIibKaDC@dJf4y3xHuBZ@_8Z77eh}ts9_>($#kHGFb>pop1VMlSlS-ju8m$M&b$P
zp7o(s;^`%FZSqB`$#-XbR6wTkA(N3YM(*~(AbmiU13*1HvPL(}14f|H*HK(@zWZVU
zt8-g#A?}jEq(ibpV$sZwnd#@iC!WzQAXgRkHp(OfoCmiTV*(q%0I6a>HhfD6P&6^f
z4(`f%4kaHA7=N1r8Vn+ll$G34K0SSK;0$q$1|q>UX!YgEfcv*bkR$Mnt3@g%@{9`@
zZj~Sk7+&*1r&sF;0Iu@#A)vr(idnxZ`=5Lk`(OBc6{zU{@~dH>r2pV+<o^cW|AKm;
t%l>-dUp^217t6nVH5`QcetM1u@7n`oi#fYSDd_)Q+*44MFP1fX{69{$*5UvF

literal 0
HcmV?d00001

diff --git a/test/fixtures/resolve.js b/test/fixtures/resolve.js
new file mode 100644
index 000000000..744bc2761
--- /dev/null
+++ b/test/fixtures/resolve.js
@@ -0,0 +1 @@
+window.testModule = require('./resolve.vue')
diff --git a/test/fixtures/resolve.vue b/test/fixtures/resolve.vue
new file mode 100644
index 000000000..c242e0fac
--- /dev/null
+++ b/test/fixtures/resolve.vue
@@ -0,0 +1,9 @@
+<template>
+  <img src="./logo.png">
+  <img src="~fixtures/logo.png">
+</template>
+
+<style>
+html { background-image: url(./logo.png); }
+body { background-image: url(~fixtures/logo.png); }
+</style>
diff --git a/test/test.js b/test/test.js
index 4ab7d04bd..e8b6d001d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -216,7 +216,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('dependency injection', function () {
+  it('dependency injection', function (done) {
     test({
       entry: './test/fixtures/inject.js'
     }, function (window) {
@@ -231,4 +231,27 @@ describe('vue-loader', function () {
     })
   })
 
+  it('translates relative URLs and respects resolve alias', function (done) {
+    test({
+      entry: './test/fixtures/resolve.js',
+      resolve: {
+        alias: {
+          fixtures: path.resolve(__dirname, 'fixtures')
+        }
+      },
+      module: {
+        loaders: [
+          { test: /\.vue$/, loader: loaderPath },
+          { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
+        ]
+      }
+    }, function (window) {
+      var module = window.testModule
+      expect(module.template).to.contain('<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')
+      expect(style).to.contain('body { background-image: url(logo.c9e00e.png); }')
+      done()
+    })
+  })
 })

From 37b3d4913e073efb594664749d96c6210d41fa00 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 6 Apr 2016 15:31:28 -0400
Subject: [PATCH 247/877] fix depenedncy injection test

---
 test/fixtures/inject.js  |  2 +-
 test/fixtures/inject.vue |  2 +-
 test/fixtures/service.js |  3 +++
 test/test.js             | 11 ++++++++---
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 test/fixtures/service.js

diff --git a/test/fixtures/inject.js b/test/fixtures/inject.js
index 5a984f1d1..302925789 100644
--- a/test/fixtures/inject.js
+++ b/test/fixtures/inject.js
@@ -1 +1 @@
-window.injector = require('!!vue?inject!./inject.vue')
+window.injector = require('!!../../lib/loader?inject!./inject.vue')
diff --git a/test/fixtures/inject.vue b/test/fixtures/inject.vue
index 9f740605e..6485a5c89 100644
--- a/test/fixtures/inject.vue
+++ b/test/fixtures/inject.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import SomeService from '../service'
+import SomeService from './service'
 
 export default {
   data () {
diff --git a/test/fixtures/service.js b/test/fixtures/service.js
new file mode 100644
index 000000000..8247bc0cc
--- /dev/null
+++ b/test/fixtures/service.js
@@ -0,0 +1,3 @@
+module.exports = {
+  msg: 'hi'
+}
diff --git a/test/test.js b/test/test.js
index e8b6d001d..0e19a5d17 100644
--- a/test/test.js
+++ b/test/test.js
@@ -41,8 +41,13 @@ describe('vue-loader', function () {
 
   function test (options, assert) {
     var config = Object.assign({}, globalConfig, options)
-    webpack(config, function (err) {
-      if (err) throw err
+    webpack(config, function (err, stats) {
+      if (stats.compilation.errors.length) {
+        stats.compilation.errors.forEach(function (err) {
+          console.error(err.message)
+        })
+      }
+      expect(stats.compilation.errors).to.be.empty
       getFile('test.build.js', function (data) {
         jsdom.env({
           html: testHTML,
@@ -221,7 +226,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/inject.js'
     }, function (window) {
       var module = window.injector({
-        '../service': {
+        './service': {
           msg: 'Hello from mocked service!'
         }
       })

From f1bdb86f33ecba7346b81be4d17743124c193d2c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 13 Apr 2016 14:06:40 -0400
Subject: [PATCH 248/877] fix rewriter injection regex messing up paths that
 contain "html". (fix vuejs-templates/webpack#41)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index e69de3a84..2a25b50cc 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -11,7 +11,7 @@ var defaultLang = {
   script: 'js'
 }
 
-var rewriterInjectRE = /\b((css|(vue-)?html)(-loader)?(\?[^!]+)?!?)\b/
+var rewriterInjectRE = /\b((css|(vue-)?html)(-loader)?(\?[^!]+)?)(?:!|$)/
 var rewriters = {
   template: require.resolve('./template-rewriter'),
   style: require.resolve('./style-rewriter')

From 1f23bb05e4445af4f36de7b1b145749c26797b86 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 13 Apr 2016 14:06:49 -0400
Subject: [PATCH 249/877] 8.2.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 28790e936..8a96e8e87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.2.2",
+  "version": "8.2.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b8fb8e8a3b1470d9bdf5558ee32dddf214d3f837 Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Fri, 15 Apr 2016 15:12:07 -0400
Subject: [PATCH 250/877] Add warning about using scoped in place of classes
 (#206)

---
 docs/features/scoped-css.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/features/scoped-css.md b/docs/features/scoped-css.md
index 96bd72874..4a1f19709 100644
--- a/docs/features/scoped-css.md
+++ b/docs/features/scoped-css.md
@@ -46,4 +46,6 @@ Into the following:
 
 3. Partials are not affected by scoped styles.
 
-4. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
+4. **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
+
+5. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.

From b79d7e9d09974bce4d71ce5e37c3d4ac99fc1b5d Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Thu, 21 Apr 2016 01:03:05 +0900
Subject: [PATCH 251/877] docs: preapre translation for multi languages (#208)

---
 docs/LANGS.md                                  | 1 +
 docs/{ => en}/README.md                        | 0
 docs/{ => en}/SUMMARY.md                       | 0
 docs/{ => en}/configurations/advanced.md       | 0
 docs/{ => en}/configurations/asset-url.md      | 0
 docs/{ => en}/configurations/extract-css.md    | 0
 docs/{ => en}/configurations/pre-processors.md | 0
 docs/{ => en}/features/es2015.md               | 0
 docs/{ => en}/features/hot-reload.md           | 0
 docs/{ => en}/features/postcss.md              | 0
 docs/{ => en}/features/scoped-css.md           | 0
 docs/{ => en}/getting-started.md               | 0
 docs/{ => en}/options.md                       | 0
 docs/{ => en}/start/spec.md                    | 0
 docs/{ => en}/start/tutorial.md                | 0
 docs/{ => en}/workflow/linting.md              | 0
 docs/{ => en}/workflow/production.md           | 0
 docs/{ => en}/workflow/testing-with-mocks.md   | 0
 docs/{ => en}/workflow/testing.md              | 0
 19 files changed, 1 insertion(+)
 create mode 100644 docs/LANGS.md
 rename docs/{ => en}/README.md (100%)
 rename docs/{ => en}/SUMMARY.md (100%)
 rename docs/{ => en}/configurations/advanced.md (100%)
 rename docs/{ => en}/configurations/asset-url.md (100%)
 rename docs/{ => en}/configurations/extract-css.md (100%)
 rename docs/{ => en}/configurations/pre-processors.md (100%)
 rename docs/{ => en}/features/es2015.md (100%)
 rename docs/{ => en}/features/hot-reload.md (100%)
 rename docs/{ => en}/features/postcss.md (100%)
 rename docs/{ => en}/features/scoped-css.md (100%)
 rename docs/{ => en}/getting-started.md (100%)
 rename docs/{ => en}/options.md (100%)
 rename docs/{ => en}/start/spec.md (100%)
 rename docs/{ => en}/start/tutorial.md (100%)
 rename docs/{ => en}/workflow/linting.md (100%)
 rename docs/{ => en}/workflow/production.md (100%)
 rename docs/{ => en}/workflow/testing-with-mocks.md (100%)
 rename docs/{ => en}/workflow/testing.md (100%)

diff --git a/docs/LANGS.md b/docs/LANGS.md
new file mode 100644
index 000000000..25b60e8a0
--- /dev/null
+++ b/docs/LANGS.md
@@ -0,0 +1 @@
+* [English](en/)
diff --git a/docs/README.md b/docs/en/README.md
similarity index 100%
rename from docs/README.md
rename to docs/en/README.md
diff --git a/docs/SUMMARY.md b/docs/en/SUMMARY.md
similarity index 100%
rename from docs/SUMMARY.md
rename to docs/en/SUMMARY.md
diff --git a/docs/configurations/advanced.md b/docs/en/configurations/advanced.md
similarity index 100%
rename from docs/configurations/advanced.md
rename to docs/en/configurations/advanced.md
diff --git a/docs/configurations/asset-url.md b/docs/en/configurations/asset-url.md
similarity index 100%
rename from docs/configurations/asset-url.md
rename to docs/en/configurations/asset-url.md
diff --git a/docs/configurations/extract-css.md b/docs/en/configurations/extract-css.md
similarity index 100%
rename from docs/configurations/extract-css.md
rename to docs/en/configurations/extract-css.md
diff --git a/docs/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
similarity index 100%
rename from docs/configurations/pre-processors.md
rename to docs/en/configurations/pre-processors.md
diff --git a/docs/features/es2015.md b/docs/en/features/es2015.md
similarity index 100%
rename from docs/features/es2015.md
rename to docs/en/features/es2015.md
diff --git a/docs/features/hot-reload.md b/docs/en/features/hot-reload.md
similarity index 100%
rename from docs/features/hot-reload.md
rename to docs/en/features/hot-reload.md
diff --git a/docs/features/postcss.md b/docs/en/features/postcss.md
similarity index 100%
rename from docs/features/postcss.md
rename to docs/en/features/postcss.md
diff --git a/docs/features/scoped-css.md b/docs/en/features/scoped-css.md
similarity index 100%
rename from docs/features/scoped-css.md
rename to docs/en/features/scoped-css.md
diff --git a/docs/getting-started.md b/docs/en/getting-started.md
similarity index 100%
rename from docs/getting-started.md
rename to docs/en/getting-started.md
diff --git a/docs/options.md b/docs/en/options.md
similarity index 100%
rename from docs/options.md
rename to docs/en/options.md
diff --git a/docs/start/spec.md b/docs/en/start/spec.md
similarity index 100%
rename from docs/start/spec.md
rename to docs/en/start/spec.md
diff --git a/docs/start/tutorial.md b/docs/en/start/tutorial.md
similarity index 100%
rename from docs/start/tutorial.md
rename to docs/en/start/tutorial.md
diff --git a/docs/workflow/linting.md b/docs/en/workflow/linting.md
similarity index 100%
rename from docs/workflow/linting.md
rename to docs/en/workflow/linting.md
diff --git a/docs/workflow/production.md b/docs/en/workflow/production.md
similarity index 100%
rename from docs/workflow/production.md
rename to docs/en/workflow/production.md
diff --git a/docs/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
similarity index 100%
rename from docs/workflow/testing-with-mocks.md
rename to docs/en/workflow/testing-with-mocks.md
diff --git a/docs/workflow/testing.md b/docs/en/workflow/testing.md
similarity index 100%
rename from docs/workflow/testing.md
rename to docs/en/workflow/testing.md

From b9a28e3741084853e4530f32fc162a55d077889c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 3 May 2016 12:57:14 -0400
Subject: [PATCH 252/877] update deps

---
 .eslintrc     | 162 +-------------------------------------------------
 lib/loader.js |   1 -
 lib/parser.js |   1 -
 package.json  |  36 +++++------
 4 files changed, 21 insertions(+), 179 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index fd0128479..d0dd64cbb 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,162 +1,4 @@
 {
-  "env": {
-    "browser": true,
-    "node": true
-  },
-
- "rules": {
-    "accessor-pairs": 2,
-    "array-bracket-spacing": 0,
-    "block-scoped-var": 0,
-    "brace-style": [2, "1tbs", { "allowSingleLine": true }],
-    "camelcase": 0,
-    "comma-dangle": [2, "never"],
-    "comma-spacing": [2, { "before": false, "after": true }],
-    "comma-style": [2, "last"],
-    "complexity": 0,
-    "computed-property-spacing": 0,
-    "consistent-return": 0,
-    "consistent-this": 0,
-    "constructor-super": 2,
-    "curly": [2, "multi-line"],
-    "default-case": 0,
-    "dot-location": [2, "property"],
-    "dot-notation": 0,
-    "eol-last": 2,
-    "eqeqeq": [2, "allow-null"],
-    "func-names": 0,
-    "func-style": 0,
-    "generator-star-spacing": [2, { "before": true, "after": true }],
-    "guard-for-in": 0,
-    "handle-callback-err": [2, "^(err|error)$" ],
-    "indent": [2, 2, { "SwitchCase": 1 }],
-    "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
-    "linebreak-style": 0,
-    "lines-around-comment": 0,
-    "max-nested-callbacks": 0,
-    "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
-    "new-parens": 2,
-    "newline-after-var": 0,
-    "no-alert": 0,
-    "no-array-constructor": 2,
-    "no-caller": 2,
-    "no-catch-shadow": 0,
-    "no-cond-assign": 2,
-    "no-console": 0,
-    "no-constant-condition": 0,
-    "no-continue": 0,
-    "no-control-regex": 2,
-    "no-debugger": 2,
-    "no-delete-var": 2,
-    "no-div-regex": 0,
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-else-return": 0,
-    "no-empty": 0,
-    "no-empty-character-class": 2,
-    "no-empty-label": 2,
-    "no-eq-null": 0,
-    "no-eval": 2,
-    "no-ex-assign": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-parens": 0,
-    "no-extra-semi": 0,
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-func-assign": 2,
-    "no-implied-eval": 2,
-    "no-inline-comments": 0,
-    "no-inner-declarations": [2, "functions"],
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": 2,
-    "no-lone-blocks": 2,
-    "no-lonely-if": 0,
-    "no-loop-func": 0,
-    "no-mixed-requires": 0,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multi-spaces": 2,
-    "no-multi-str": 2,
-    "no-multiple-empty-lines": [2, { "max": 1 }],
-    "no-native-reassign": 2,
-    "no-negated-in-lhs": 2,
-    "no-nested-ternary": 0,
-    "no-new": 2,
-    "no-new-func": 0,
-    "no-new-object": 2,
-    "no-new-require": 2,
-    "no-new-wrappers": 2,
-    "no-obj-calls": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-param-reassign": 0,
-    "no-path-concat": 0,
-    "no-process-env": 0,
-    "no-process-exit": 0,
-    "no-proto": 0,
-    "no-redeclare": 2,
-    "no-regex-spaces": 2,
-    "no-restricted-modules": 0,
-    "no-return-assign": 2,
-    "no-script-url": 0,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-shadow": 0,
-    "no-shadow-restricted-names": 2,
-    "no-spaced-func": 2,
-    "no-sparse-arrays": 2,
-    "no-sync": 0,
-    "no-ternary": 0,
-    "no-this-before-super": 2,
-    "no-throw-literal": 2,
-    "no-trailing-spaces": 2,
-    "no-undef": 2,
-    "no-undef-init": 2,
-    "no-undefined": 0,
-    "no-underscore-dangle": 0,
-    "no-unexpected-multiline": 2,
-    "no-unneeded-ternary": 2,
-    "no-unreachable": 2,
-    "no-unused-expressions": 0,
-    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
-    "no-use-before-define": 0,
-    "no-var": 0,
-    "no-void": 0,
-    "no-warning-comments": 0,
-    "no-with": 2,
-    "object-curly-spacing": 0,
-    "object-shorthand": 0,
-    "one-var": [2, { "initialized": "never" }],
-    "operator-assignment": 0,
-    "operator-linebreak": [2, "after", { "overrides": { "?": "before", ":": "before" } }],
-    "padded-blocks": 0,
-    "prefer-const": 0,
-    "quote-props": 0,
-    "quotes": [2, "single", "avoid-escape"],
-    "radix": 2,
-    "semi": [2, "never"],
-    "semi-spacing": 0,
-    "sort-vars": 0,
-    "space-after-keywords": [2, "always"],
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [2, "always"],
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-return-throw-case": 2,
-    "space-unary-ops": [2, { "words": true, "nonwords": false }],
-    "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
-    "strict": 0,
-    "use-isnan": 2,
-    "valid-jsdoc": 0,
-    "valid-typeof": 2,
-    "vars-on-top": 0,
-    "wrap-iife": [2, "any"],
-    "wrap-regex": 0,
-    "yoda": [2, "never"]
-  }
+  "root": true,
+  "extends": "vue"
 }
diff --git a/lib/loader.js b/lib/loader.js
index 2a25b50cc..1e889b29b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -20,7 +20,6 @@ var rewriters = {
 var templateLoader = require.resolve('./template-loader')
 
 module.exports = function (content) {
-
   var defaultLoaders = {
     html: 'vue-html-loader',
     css: 'vue-style-loader!css-loader',
diff --git a/lib/parser.js b/lib/parser.js
index 7a63229b0..de7f533fd 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -18,7 +18,6 @@ var commentSymbols = {
 }
 
 module.exports = function (content, filename, needMap) {
-
   var cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
   var filenameWithHash = filename + '?' + cacheKey
diff --git a/package.json b/package.json
index 8a96e8e87..acff8c1b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.2.3",
+  "version": "8.3.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -43,36 +43,38 @@
     "vue-template-validator": "^1.0.0"
   },
   "peerDependencies": {
-    "vue-html-loader": "^1.0.0",
+    "babel-loader": "^6.2.4",
+    "babel-core": "^6.8.0",
+    "babel-plugin-transform-runtime": "^6.8.0",
+    "babel-runtime": "^6.8.0",
+    "babel-preset-es2015": "^6.6.0",
     "css-loader": "*",
+    "vue-html-loader": "^1.0.0",
     "vue-style-loader": "^1.0.0",
-    "babel-loader": "^6.1.0",
-    "babel-core": "^6.1.2",
-    "babel-plugin-transform-runtime": "^6.1.2",
-    "babel-runtime": "^5.8.0",
-    "babel-preset-es2015": "^6.1.2",
     "vue-hot-reload-api": "^1.2.0"
   },
   "devDependencies": {
-    "babel-core": "^6.1.2",
-    "babel-loader": "^6.1.0",
-    "babel-plugin-transform-runtime": "^6.1.2",
-    "babel-preset-es2015": "^6.1.2",
+    "babel-core": "^6.8.0",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-transform-runtime": "^6.8.0",
+    "babel-preset-es2015": "^6.6.0",
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
-    "css-loader": "^0.21.0",
-    "eslint": "^1.6.0",
-    "extract-text-webpack-plugin": "^0.8.2",
+    "css-loader": "^0.23.1",
+    "eslint": "^2.9.0",
+    "eslint-config-vue": "^1.0.0",
+    "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
     "inject-loader": "^2.0.1",
     "jade": "^1.11.0",
-    "jsdom": "^7.2.2",
+    "jsdom": "^8.5.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
-    "node-libs-browser": "^0.5.3",
+    "node-libs-browser": "^1.0.0",
     "rimraf": "^2.4.0",
-    "stylus-loader": "^1.4.0",
+    "stylus": "^0.54.5",
+    "stylus-loader": "^2.0.0",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-style-loader": "^1.0.0",

From a35ca7fd38da1389028f573006546985188111d6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 3 May 2016 13:05:34 -0400
Subject: [PATCH 253/877] fix babel-runtime version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index acff8c1b8..93faccebd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -46,7 +46,7 @@
     "babel-loader": "^6.2.4",
     "babel-core": "^6.8.0",
     "babel-plugin-transform-runtime": "^6.8.0",
-    "babel-runtime": "^6.8.0",
+    "babel-runtime": "^6.0.0",
     "babel-preset-es2015": "^6.6.0",
     "css-loader": "*",
     "vue-html-loader": "^1.0.0",

From f3ef287e33517e21e310420177ea563dee87b5c2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 3 May 2016 13:08:18 -0400
Subject: [PATCH 254/877] add babel runtime to dev deps

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 93faccebd..cfd53e125 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "babel-core": "^6.8.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.8.0",
+    "babel-runtime": "^6.0.0",
     "babel-preset-es2015": "^6.6.0",
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",

From 0a7a33956242112d33dcee95c3a95ec0271faaac Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 4 May 2016 12:27:32 -0400
Subject: [PATCH 255/877] update tutorial

---
 docs/en/start/tutorial.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/start/tutorial.md b/docs/en/start/tutorial.md
index dd038285d..8a755507d 100644
--- a/docs/en/start/tutorial.md
+++ b/docs/en/start/tutorial.md
@@ -32,14 +32,14 @@ npm install\
   webpack webpack-dev-server\
   vue-loader vue-html-loader css-loader vue-style-loader vue-hot-reload-api\
   babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
-  babel-runtime@5\
+  babel-runtime\
   --save-dev
 npm install vue --save
 ```
 
 That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
 
-You may also notice that we are using `babel-runtime` version 5 instead of the latest 6.x - this is [intentional](https://github.com/vuejs/vue-loader/issues/96#issuecomment-162910917).
+> Note: In previous versions of `vue-loader` we used to explicitly install `babel-runtime` 5.x to avoid duplicate dependencies - this is no longer necessary after recent babel upgrade.
 
 After proper installation, your `package.json`'s `devDependencies` field should look like this:
 

From 92c6a6998f355603ac68ed2bf205f4a428360760 Mon Sep 17 00:00:00 2001
From: Mark Tinsley <info@marknjen.com>
Date: Tue, 10 May 2016 00:23:06 -0500
Subject: [PATCH 256/877] "return" vs "returns" and added an "a" (#220)

---
 docs/en/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index 792332a8f..737577bc8 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -34,7 +34,7 @@ npm install coffee-loader --save-dev
 
 ### Templates
 
-Processing templates is a little different, because most Webpack template loaders such as `jade-loader` returns a template function instead of compiled HTML string. Instead of using `jade-loader`, we can just install the original `jade`:
+Processing templates is a little different, because most Webpack template loaders such as `jade-loader` return a template function instead of a compiled HTML string. Instead of using `jade-loader`, we can just install the original `jade`:
 
 ``` bash
 npm install jade --save-dev

From 1a7c96c479fc6b82144838ca2935502865c4e7e0 Mon Sep 17 00:00:00 2001
From: Mark Tinsley <info@marknjen.com>
Date: Tue, 10 May 2016 00:23:18 -0500
Subject: [PATCH 257/877] "it fallbacks to" vs "it falls back to" (#221)

---
 docs/en/configurations/asset-url.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/asset-url.md b/docs/en/configurations/asset-url.md
index 8118ee0f7..d6ba44b54 100644
--- a/docs/en/configurations/asset-url.md
+++ b/docs/en/configurations/asset-url.md
@@ -6,7 +6,7 @@ For example, `url(image.png)` will be translated into `require('./image.png')`.
 
 1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes. The best part though, is that you can use relative URLs based on the folder structure of your source files, and Webpack will auto-rewrite them into different URLs in the bundled files based on the configuration.
 
-2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically fallbacks to `file-loader`.
+2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.
 
 Here's an example Webpack config that handles `.png`, `jpg` and `.gif` files, and inlining any file smaller than 10kb as base64 data URL:
 

From 4f75a13ccdb9c08214c75bb03a8c118c68698d63 Mon Sep 17 00:00:00 2001
From: Alex Kyriakidis <kyrenator@gmail.com>
Date: Tue, 10 May 2016 08:24:23 +0300
Subject: [PATCH 258/877] Use ES6 in main.js (#219)

* Use ES6 in main.js

Update main.js to comply with App.vue example.

* include App.vue from components dir
---
 docs/en/start/tutorial.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/start/tutorial.md b/docs/en/start/tutorial.md
index 8a755507d..e713eec9e 100644
--- a/docs/en/start/tutorial.md
+++ b/docs/en/start/tutorial.md
@@ -102,13 +102,13 @@ Webpack knows it needs to pipe the contents of `./my-component.vue` through `vue
 
 ### Creating Other Files
 
-The app entry point, `main.js` typically looks like this:
+The app entry point, `main.js` typically looks like this (using ES2015 syntax):
 
 ``` js
 // main.js
-var Vue = require('vue')
+import Vue from 'vue'
 // require a *.vue component
-var App = require('./components/App.vue')
+import App from './components/App'
 
 // mount a root Vue instance
 new Vue({
@@ -121,7 +121,7 @@ new Vue({
 })
 ```
 
-Inside a `*.vue` component's `<script>` tag, you can also require other `*.vue` components. For example in `./components/App.vue` (we are using ES2015 syntax):
+Inside a `*.vue` component's `<script>` tag, you can also require other `*.vue` components. For example in `./components/App.vue`:
 
 ``` html
 <template>

From 6ee7aaad6449e67e253a8ab7dead0b9fcae9fcb1 Mon Sep 17 00:00:00 2001
From: Paul Pflugradt <paulpflugradt@googlemail.com>
Date: Sun, 15 May 2016 17:38:38 +0200
Subject: [PATCH 259/877] cleanup tests by using expose loader (#225)

---
 package.json                         |  3 ++-
 test/fixtures/autoprefix.js          |  1 -
 test/fixtures/basic.js               |  1 -
 test/fixtures/extract-css.js         |  1 -
 test/fixtures/media-query.js         |  1 -
 test/fixtures/pre.js                 |  1 -
 test/fixtures/resolve.js             |  1 -
 test/fixtures/scoped-css.js          |  1 -
 test/fixtures/script-import-entry.js |  1 -
 test/fixtures/template-import.js     |  1 -
 test/test.js                         | 34 ++++++++++++++--------------
 11 files changed, 19 insertions(+), 27 deletions(-)
 delete mode 100644 test/fixtures/autoprefix.js
 delete mode 100644 test/fixtures/basic.js
 delete mode 100644 test/fixtures/extract-css.js
 delete mode 100644 test/fixtures/media-query.js
 delete mode 100644 test/fixtures/pre.js
 delete mode 100644 test/fixtures/resolve.js
 delete mode 100644 test/fixtures/scoped-css.js
 delete mode 100644 test/fixtures/script-import-entry.js
 delete mode 100644 test/fixtures/template-import.js

diff --git a/package.json b/package.json
index cfd53e125..230263bfe 100644
--- a/package.json
+++ b/package.json
@@ -57,14 +57,15 @@
     "babel-core": "^6.8.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.8.0",
-    "babel-runtime": "^6.0.0",
     "babel-preset-es2015": "^6.6.0",
+    "babel-runtime": "^6.0.0",
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
     "css-loader": "^0.23.1",
     "eslint": "^2.9.0",
     "eslint-config-vue": "^1.0.0",
+    "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
     "inject-loader": "^2.0.1",
diff --git a/test/fixtures/autoprefix.js b/test/fixtures/autoprefix.js
deleted file mode 100644
index a5e9680a8..000000000
--- a/test/fixtures/autoprefix.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./autoprefix.vue')
diff --git a/test/fixtures/basic.js b/test/fixtures/basic.js
deleted file mode 100644
index b5a46fc5f..000000000
--- a/test/fixtures/basic.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./basic.vue')
diff --git a/test/fixtures/extract-css.js b/test/fixtures/extract-css.js
deleted file mode 100644
index ce602cf28..000000000
--- a/test/fixtures/extract-css.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./extract-css.vue')
diff --git a/test/fixtures/media-query.js b/test/fixtures/media-query.js
deleted file mode 100644
index 1a292f332..000000000
--- a/test/fixtures/media-query.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./media-query.vue')
diff --git a/test/fixtures/pre.js b/test/fixtures/pre.js
deleted file mode 100644
index 2238f374f..000000000
--- a/test/fixtures/pre.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./pre.vue')
diff --git a/test/fixtures/resolve.js b/test/fixtures/resolve.js
deleted file mode 100644
index 744bc2761..000000000
--- a/test/fixtures/resolve.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./resolve.vue')
diff --git a/test/fixtures/scoped-css.js b/test/fixtures/scoped-css.js
deleted file mode 100644
index 607e0d58f..000000000
--- a/test/fixtures/scoped-css.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./scoped-css.vue')
diff --git a/test/fixtures/script-import-entry.js b/test/fixtures/script-import-entry.js
deleted file mode 100644
index 5c1491e49..000000000
--- a/test/fixtures/script-import-entry.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./script-import.vue')
diff --git a/test/fixtures/template-import.js b/test/fixtures/template-import.js
deleted file mode 100644
index 9f39ecaea..000000000
--- a/test/fixtures/template-import.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./template-import.vue')
diff --git a/test/test.js b/test/test.js
index 0e19a5d17..959ab05d5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -12,7 +12,7 @@ describe('vue-loader', function () {
 
   var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
   var outputDir = path.resolve(__dirname, './output')
-  var loaderPath = path.resolve(__dirname, '../')
+  var loaderPath = 'expose?vueModule!'+path.resolve(__dirname, '../')
   var globalConfig = {
     output: {
       path: outputDir,
@@ -66,9 +66,9 @@ describe('vue-loader', function () {
 
   it('basic', function (done) {
     test({
-      entry: './test/fixtures/basic.js'
+      entry: './test/fixtures/basic.vue'
     }, function (window) {
-      var module = window.testModule
+      var module = window.vueModule
       expect(module.template).to.contain('<h2 class="red">{{msg}}</h2>')
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
@@ -79,9 +79,9 @@ describe('vue-loader', function () {
 
   it('pre-processors', function (done) {
     test({
-      entry: './test/fixtures/pre.js'
+      entry: './test/fixtures/pre.vue'
     }, function (window) {
-      var module = window.testModule
+      var module = window.vueModule
       expect(module.template).to.contain(
         '<h1>This is the app</h1>' +
         '<comp-a></comp-a>' +
@@ -96,9 +96,9 @@ describe('vue-loader', function () {
 
   it('scoped style', function (done) {
     test({
-      entry: './test/fixtures/scoped-css.js'
+      entry: './test/fixtures/scoped-css.vue'
     }, function (window) {
-      var module = window.testModule
+      var module = window.vueModule
       var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
       expect(module.template).to.contain(
         '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
@@ -129,9 +129,9 @@ describe('vue-loader', function () {
 
   it('template import', function (done) {
     test({
-      entry: './test/fixtures/template-import.js'
+      entry: './test/fixtures/template-import.vue'
     }, function (window) {
-      var module = window.testModule
+      var module = window.vueModule
       expect(module.template).to.contain('<div><h1>hello</h1></div>')
       done()
     })
@@ -139,9 +139,9 @@ describe('vue-loader', function () {
 
   it('script import', function (done) {
     test({
-      entry: './test/fixtures/script-import-entry.js'
+      entry: './test/fixtures/script-import.vue'
     }, function (window) {
-      var module = window.testModule
+      var module = window.vueModule
       expect(module.data().msg).to.contain('Hello from Component A!')
       done()
     })
@@ -149,7 +149,7 @@ describe('vue-loader', function () {
 
   it('source map', function (done) {
     var config = Object.assign({}, globalConfig, {
-      entry: './test/fixtures/basic.js',
+      entry: './test/fixtures/basic.vue',
       devtool: 'source-map'
     })
     webpack(config, function (err) {
@@ -181,7 +181,7 @@ describe('vue-loader', function () {
 
   it('autoprefix', function (done) {
     test({
-      entry: './test/fixtures/autoprefix.js'
+      entry: './test/fixtures/autoprefix.vue'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('body {\n  -webkit-transform: scale(1);\n          transform: scale(1);\n}')
@@ -191,7 +191,7 @@ describe('vue-loader', function () {
 
   it('media-query', function (done) {
     test({
-      entry: './test/fixtures/media-query.js'
+      entry: './test/fixtures/media-query.vue'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
       var id = '_v-' + hash(require.resolve('./fixtures/media-query.vue'))
@@ -202,7 +202,7 @@ describe('vue-loader', function () {
 
   it('extract CSS', function (done) {
     webpack(Object.assign({}, globalConfig, {
-      entry: './test/fixtures/extract-css.js',
+      entry: './test/fixtures/extract-css.vue',
       vue: {
         loaders: {
           css: ExtractTextPlugin.extract('css'),
@@ -238,7 +238,7 @@ describe('vue-loader', function () {
 
   it('translates relative URLs and respects resolve alias', function (done) {
     test({
-      entry: './test/fixtures/resolve.js',
+      entry: './test/fixtures/resolve.vue',
       resolve: {
         alias: {
           fixtures: path.resolve(__dirname, 'fixtures')
@@ -251,7 +251,7 @@ describe('vue-loader', function () {
         ]
       }
     }, function (window) {
-      var module = window.testModule
+      var module = window.vueModule
       expect(module.template).to.contain('<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')

From 89512340ee9fe4931b7601bbead4bb96cd490d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Giumo=20X=2E=20Clanjor=20=28=E5=93=86=E5=95=A6=E6=AF=94?=
 =?UTF-8?q?=E7=8C=AB/=E5=85=B0=E5=A8=81=E4=B8=BE=29?= <cjxgm@126.com>
Date: Sun, 22 May 2016 11:08:04 -0500
Subject: [PATCH 260/877] pass query.id as an option to addId in style-rewriter
 (#237)

- removed global variable "currentId"
- query.id is passed as an option to addId
---
 lib/style-rewriter.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 23064b00b..cce1e4867 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -3,8 +3,7 @@ var selectorParser = require('postcss-selector-parser')
 var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
 
-var currentId
-var addId = postcss.plugin('add-id', function () {
+var addId = postcss.plugin('add-id', function (opts) {
   return function (root) {
     root.each(function rewriteSelector (node) {
       if (!node.selector) {
@@ -21,7 +20,7 @@ var addId = postcss.plugin('add-id', function () {
             if (n.type !== 'pseudo') node = n
           })
           selector.insertAfter(node, selectorParser.attribute({
-            attribute: currentId
+            attribute: opts.id
           }))
         })
       }).process(node.selector).result
@@ -46,7 +45,7 @@ module.exports = function (css, map) {
 
   // scoped css
   if (query.scoped) {
-    plugins.push(addId)
+    plugins.push(addId({ id: query.id }))
   }
 
   // autoprefixer
@@ -82,7 +81,6 @@ module.exports = function (css, map) {
     }
   }
 
-  currentId = query.id
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {

From ba4e0bb0b5b05af8ecc22b16b5f83065c2845f54 Mon Sep 17 00:00:00 2001
From: Alex Kyriakidis <kyrenator@gmail.com>
Date: Sun, 22 May 2016 19:08:42 +0300
Subject: [PATCH 261/877] add JetBrains vue plugins (#218)

+tiny fixes
---
 docs/en/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 25827545a..c69b6ebf2 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -83,7 +83,7 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 
 ### Syntax Highlighting
 
-Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue) and [Brackets](https://github.com/pandao/brackets-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
 
 ### Comments
 

From b95761e8d9d22f3eded64e9e00c584dd6b2516e8 Mon Sep 17 00:00:00 2001
From: Bob <bob-de-ruiter@live.nl>
Date: Sun, 22 May 2016 18:11:25 +0200
Subject: [PATCH 262/877] Enable passing an object to the template engine
 (#226)

---
 lib/template-loader.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/template-loader.js b/lib/template-loader.js
index 575ea0c5b..af3d6e083 100644
--- a/lib/template-loader.js
+++ b/lib/template-loader.js
@@ -6,6 +6,12 @@ module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
   var opt = loaderUtils.parseQuery(this.query)
+  var vue = this.options.vue
+  if (vue && vue.template) {
+    for (var key in vue.template) {
+      opt[key] = vue.template[key]
+    }
+  }
 
   function exportContent (content) {
     if (opt.raw) {

From f7f5efce019e7566ba921a5f37648f3997e4c40f Mon Sep 17 00:00:00 2001
From: kenvunz <ken@gladeye.co.nz>
Date: Tue, 24 May 2016 05:34:34 +1200
Subject: [PATCH 263/877] Fix: `browserify` flag should be false (#238)

Signed-off-by: Ken Vu <ken@gladeye.co.nz>
---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 1e889b29b..695c3265b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -218,7 +218,7 @@ module.exports = function (content) {
         'if (module.hot) {(function () {' +
         '  module.hot.accept()\n' +
         '  var hotAPI = require("vue-hot-reload-api")\n' +
-        '  hotAPI.install(require("vue"), true)\n' +
+        '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
         '  var id = ' + JSON.stringify(filePath) + '\n' +
         '  if (!module.hot.data) {\n' +

From 342ab08135765937d936f5083fe1b1b600f23563 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 23 May 2016 13:35:13 -0400
Subject: [PATCH 264/877] 8.4.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 230263bfe..b9156e496 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.3.1",
+  "version": "8.4.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From e822de664aeeadcb3ed6a0c9032bfcdf12f6f68f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 23 May 2016 13:37:54 -0400
Subject: [PATCH 265/877] update badge [ci-skip]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e6f0cf0ba..fab68c12c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://badge.fury.io/js/vue-loader.svg)](https://www.npmjs.com/package/vue-loader)
+# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg?maxAge=2592000)](https://www.npmjs.com/package/vue-loader)
 
 > Vue.js component loader for [Webpack](http://webpack.github.io).
 

From b5b87779b62c324c11fdde59ac6dfd792c7c7641 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 23 May 2016 15:01:52 -0400
Subject: [PATCH 266/877] update docs

---
 docs/en/options.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/en/options.md b/docs/en/options.md
index 5b51f0d28..bed156ad7 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -54,3 +54,10 @@
   Whether to enable source maps for CSS. Disabling this can avoid some relative path related bugs in `css-loader` and make the build a bit faster.
 
   Note this is automatically set to `false` if the `devtool` option is not present in the main Webpack config.
+
+### template
+
+- ^8.4.0
+- type: `Object`
+
+  Pass options to the template rendering engine (via [consolidate](https://github.com/tj/consolidate.js)) if you are using a non-html templating language.

From 1b705440e35b5360c33a0d71cb2a443d77c34f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dias=20Aur=C3=A9lien?= <aurelien.esiao@gmail.com>
Date: Wed, 25 May 2016 17:35:56 +0200
Subject: [PATCH 267/877] Allow vue-loader to user PostCSS options as object
 and custom syntax (#240)

* Allow vue-loader to user PostCSS options as object and custom syntax like SugarSS

* Fix error reported by eslint

* Better testing of available options to avoid complain about undefined properties

* Allow postcss to use a PostCSS options object

* Fix error option is undefined
---
 lib/style-rewriter.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index cce1e4867..63ff2b73f 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -40,6 +40,8 @@ module.exports = function (css, map) {
   var plugins = options.postcss
   if (typeof plugins === 'function') {
     plugins = plugins.call(this, this)
+  } else if (typeof options.postcss === 'object' && options.postcss.plugins) {
+    plugins = options.postcss.plugins
   }
   plugins = plugins ? plugins.slice() : [] // make sure to copy it
 
@@ -72,7 +74,8 @@ module.exports = function (css, map) {
     this.sourceMap &&
     !this.minimize &&
     options.cssSourceMap !== false &&
-    process.env.NODE_ENV !== 'production'
+    process.env.NODE_ENV !== 'production' &&
+    !options.postcss.options.map
   ) {
     opts.map = {
       inline: false,
@@ -81,6 +84,15 @@ module.exports = function (css, map) {
     }
   }
 
+  // postcss options from configuration
+  if (options.postcss && options.postcss.options) {
+    for (var option in options.postcss.options) {
+      if (!opts.hasOwnProperty(option)) {
+        opts[option] = options.postcss.options[option]
+      }
+    }
+  }
+
   postcss(plugins)
     .process(css, opts)
     .then(function (result) {

From f3db7afa253440151f25394be124dcf98ed204ce Mon Sep 17 00:00:00 2001
From: Nick Cappadona <cappadona@users.noreply.github.com>
Date: Wed, 25 May 2016 11:40:01 -0400
Subject: [PATCH 268/877] Use loaderUtils.stringifyRequest for relative path
 (#243)

https://webpack.github.io/docs/how-to-write-a-loader.html#should-not-embed-absolute-paths
---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 695c3265b..c2e2644e7 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -220,7 +220,7 @@ module.exports = function (content) {
         '  var hotAPI = require("vue-hot-reload-api")\n' +
         '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
-        '  var id = ' + JSON.stringify(filePath) + '\n' +
+        '  var id = ' + loaderUtils.stringifyRequest(loaderContext, filePath) + '\n' +
         '  if (!module.hot.data) {\n' +
         // initial insert
         '    hotAPI.createRecord(id, module.exports)\n' +

From 8f204c709a2dc64663434e949837fbc80540177d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 May 2016 11:48:20 -0400
Subject: [PATCH 269/877] update docs for postcss

---
 docs/en/features/postcss.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index 487b9e71f..48c35b566 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -47,3 +47,18 @@ module.exports = {
   }
 }
 ```
+
+In addition to providing an Array of plugins, the `postcss` option also accepts:
+
+- A function that returns an array of plugins;
+
+- An object that contains options to be passed to the PostCSS processor. This is useful when you are using PostCSS projects that relies on custom parser/stringifiers:
+
+  ``` js
+  postcss: {
+    plugins: [...], // list of plugins
+    options: {
+      parser: sugarss // use sugarss parser
+    }
+  }
+  ```

From d6b8b4143f4f54a0a230f78fb35bf8ba286506e8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 May 2016 11:48:23 -0400
Subject: [PATCH 270/877] 8.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b9156e496..f0c4913b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9f2cc28ba7662d0a10718c44b72b9b6cb94972b2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 May 2016 11:58:55 -0400
Subject: [PATCH 271/877] update docs

---
 docs/en/options.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index bed156ad7..61a1f2b47 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -30,7 +30,8 @@
 
 ### postcss
 
-- type: `Array` or `Function`
+- type: `Array` or `Function` or `Object`
+- `Object` format only supported in ^8.5.0
 
   Specify custom PostCSS plugins to be applied to CSS inside `*.vue` files. If using a function, the function will called using the same loader context and should return an Array of plugins.
 
@@ -46,6 +47,17 @@
   }
   ```
 
+  This option can also be an object that contains options to be passed to the PostCSS processor. This is useful when you are using PostCSS projects that relies on custom parser/stringifiers:
+
+  ``` js
+  postcss: {
+    plugins: [...], // list of plugins
+    options: {
+      parser: sugarss // use sugarss parser
+    }
+  }
+  ```
+
 ### cssSourceMap
 
 - type: `Boolean`

From abd04537741278a0c5a45a24f1899b14f152075c Mon Sep 17 00:00:00 2001
From: indirectlylit <indirectlylit@users.noreply.github.com>
Date: Wed, 25 May 2016 09:35:25 -0700
Subject: [PATCH 272/877] pad results with whitespace - re #190 (#230)

* pad results with whitespace - re #190

* address linter issues

* fix failing test

* remove debug log

* move var definition inside else block
---
 lib/parser.js | 9 +++++----
 test/test.js  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index de7f533fd..a353635d1 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -97,9 +97,7 @@ module.exports = function (content, filename, needMap) {
     var start = node.childNodes[0].__location.startOffset
     var end = node.childNodes[node.childNodes.length - 1].__location.endOffset
     var result
-    var lineOffset
     if (type === 'script') {
-      lineOffset = 0
       // preserve other parts as commenets so that linters
       // and babel can output correct line numbers in warnings
       result =
@@ -107,8 +105,11 @@ module.exports = function (content, filename, needMap) {
         deindent(content.slice(start, end)) +
         commentScript(content.slice(end), lang)
     } else {
-      lineOffset = content.slice(0, start).split(splitRE).length - 1
+      var lineOffset = content.slice(0, start).split(splitRE).length - 1
       result = deindent(content.slice(start, end))
+
+      // pad whith whitespace so that error messages are correct
+      result = Array(lineOffset + 1).join('\n') + result
     }
 
     if (needMap) {
@@ -128,7 +129,7 @@ module.exports = function (content, filename, needMap) {
           map.addMapping({
             source: filenameWithHash,
             original: {
-              line: index + 1 + lineOffset,
+              line: index + 1,
               column: 0
             },
             generated: {
diff --git a/test/test.js b/test/test.js
index 959ab05d5..038dc6c04 100644
--- a/test/test.js
+++ b/test/test.js
@@ -215,7 +215,7 @@ describe('vue-loader', function () {
     }), function (err) {
       expect(err).to.be.null
       getFile('test.output.css', function (data) {
-        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\n\n\n\n\n\nh2 {\n  color: green;\n}')
         done()
       })
     })

From 674c3bcb06621775971a3e9a1ac6d5f4e652e5cd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 May 2016 12:35:53 -0400
Subject: [PATCH 273/877] 8.5.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f0c4913b3..e69cc451a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.5.0",
+  "version": "8.5.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 66d2051498b69acb6e4af2311c106b35e1573a80 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 May 2016 13:51:46 -0400
Subject: [PATCH 274/877] fix style-rewriter bug and add test case

---
 lib/style-rewriter.js     | 27 +++++++++++++++++----------
 package.json              |  2 ++
 test/fixtures/postcss.vue |  5 +++++
 test/test.js              | 17 +++++++++++++++++
 4 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 test/fixtures/postcss.vue

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 63ff2b73f..7c297b094 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -35,13 +35,16 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
   var autoprefixOptions = options.autoprefixer
+  var postcssOptions = options.postcss
 
-  // plugins
-  var plugins = options.postcss
-  if (typeof plugins === 'function') {
-    plugins = plugins.call(this, this)
-  } else if (typeof options.postcss === 'object' && options.postcss.plugins) {
-    plugins = options.postcss.plugins
+  // postcss plugins
+  var plugins
+  if (Array.isArray(postcssOptions)) {
+    plugins = postcssOptions
+  } else if (typeof postcssOptions === 'function') {
+    plugins = postcssOptions.call(this, this)
+  } else if (isObject(postcssOptions) && postcssOptions.plugins) {
+    plugins = postcssOptions.plugins
   }
   plugins = plugins ? plugins.slice() : [] // make sure to copy it
 
@@ -75,7 +78,7 @@ module.exports = function (css, map) {
     !this.minimize &&
     options.cssSourceMap !== false &&
     process.env.NODE_ENV !== 'production' &&
-    !options.postcss.options.map
+    !(isObject(postcssOptions) && postcssOptions.options && postcssOptions.map)
   ) {
     opts.map = {
       inline: false,
@@ -85,10 +88,10 @@ module.exports = function (css, map) {
   }
 
   // postcss options from configuration
-  if (options.postcss && options.postcss.options) {
-    for (var option in options.postcss.options) {
+  if (isObject(postcssOptions) && postcssOptions.options) {
+    for (var option in postcssOptions.options) {
       if (!opts.hasOwnProperty(option)) {
-        opts[option] = options.postcss.options[option]
+        opts[option] = postcssOptions.options[option]
       }
     }
   }
@@ -104,3 +107,7 @@ module.exports = function (css, map) {
       cb(e)
     })
 }
+
+function isObject (val) {
+  return val && typeof val === 'object'
+}
diff --git a/package.json b/package.json
index e69cc451a..002edf4bf 100644
--- a/package.json
+++ b/package.json
@@ -74,9 +74,11 @@
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
+    "postcss": "^5.0.21",
     "rimraf": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
+    "sugarss": "^0.1.3",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-style-loader": "^1.0.0",
diff --git a/test/fixtures/postcss.vue b/test/fixtures/postcss.vue
new file mode 100644
index 000000000..a02d550de
--- /dev/null
+++ b/test/fixtures/postcss.vue
@@ -0,0 +1,5 @@
+<style>
+h1
+  color: red
+  font-size: 14px
+</style>
diff --git a/test/test.js b/test/test.js
index 038dc6c04..8644b3ef1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -259,4 +259,21 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('postcss options', function (done) {
+    test({
+      entry: './test/fixtures/postcss.vue',
+      vue: {
+        postcss: {
+          options: {
+            parser: require('sugarss')
+          }
+        }
+      }
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      done()
+    })
+  })
 })

From bc90d8352052d33fc54caa7fa78aa5fdb413ead2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 25 May 2016 13:51:50 -0400
Subject: [PATCH 275/877] 8.5.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 002edf4bf..0b6f80bea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.5.1",
+  "version": "8.5.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 4768112eb1a9ed55b9b0c4824cf0461b7f5634f2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 8 Jun 2016 21:14:34 -0400
Subject: [PATCH 276/877] roughly working for 2.0

---
 lib/loader.js            | 140 +++++++++++++-----------------
 lib/parser.js            | 183 +--------------------------------------
 lib/selector.js          |   5 +-
 lib/template-compiler.js |  45 ++++++++++
 lib/template-rewriter.js |  34 --------
 5 files changed, 113 insertions(+), 294 deletions(-)
 create mode 100644 lib/template-compiler.js
 delete mode 100644 lib/template-rewriter.js

diff --git a/lib/loader.js b/lib/loader.js
index c2e2644e7..450470faa 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -7,21 +7,20 @@ var path = require('path')
 
 var defaultLang = {
   template: 'html',
-  style: 'css',
+  styles: 'css',
   script: 'js'
 }
 
-var rewriterInjectRE = /\b((css|(vue-)?html)(-loader)?(\?[^!]+)?)(?:!|$)/
+var rewriterInjectRE = /\b(css(-loader)?(\?[^!]+)?)(?:!|$)/
 var rewriters = {
-  template: require.resolve('./template-rewriter'),
-  style: require.resolve('./style-rewriter')
+  styles: require.resolve('./style-rewriter')
 }
 
 var templateLoader = require.resolve('./template-loader')
 
 module.exports = function (content) {
   var defaultLoaders = {
-    html: 'vue-html-loader',
+    html: require.resolve('./template-compiler'),
     css: 'vue-style-loader!css-loader',
     js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
   }
@@ -106,8 +105,8 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + rewriter + templateLoader + '?raw&engine=' + lang + '!'
-        case 'style':
+          return defaultLoaders.html + '!' + templateLoader + '?raw&engine=' + lang + '!'
+        case 'styles':
           return defaultLoaders.css + '!' + rewriter + lang + '!'
         case 'script':
           return injectString + lang + '!'
@@ -143,35 +142,25 @@ module.exports = function (content) {
 
   var parts = parse(content, fileName, this.sourceMap)
   var hasLocalStyles = false
-  var output = 'var __vue_script__, __vue_template__\n'
-
-  // check if there are any template syntax errors
-  var templateWarnings = parts.template.length && parts.template[0].warnings
-  if (templateWarnings) {
-    templateWarnings.forEach(this.emitError)
-  }
-
-  // add requires for src imports
-  parts.styleImports.forEach(function (impt) {
-    if (impt.scoped) hasLocalStyles = true
-    output += getRequireForImport('style', impt, impt.scoped)
-  })
+  var output = ''
 
   // add requires for styles
-  parts.style.forEach(function (style, i) {
-    if (style.scoped) hasLocalStyles = true
-    output += getRequire('style', style, i, style.scoped)
+  parts.styles.forEach(function (style, i) {
+    var scoped = style.scoped
+    if (scoped) hasLocalStyles = true
+    output += style.src
+      ? getRequireForImport('styles', style.src, scoped)
+      : getRequire('styles', style, i, scoped)
   })
 
   // add require for script
-  var script
-  if (parts.script.length) {
-    script = parts.script[0]
+  var script = parts.script
+  if (script) {
     output +=
-      '__vue_script__ = ' + (
+      'var __vue_script__ = ' + (
         script.src
-          ? getRequireForImport('script', script, 0)
-          : getRequire('script', script, 0)
+          ? getRequireForImport('script', script)
+          : getRequire('script', script)
       )
     // check and warn named exports
     if (!this.minimize) {
@@ -187,68 +176,63 @@ module.exports = function (content) {
     }
   }
 
+  // plain require() compatibility
+  var exports = 'if (__exports__.__esModule) __exports__ = __exports__.default\n'
+
   // add require for template
-  var template
-  if (parts.template.length) {
-    template = parts.template[0]
-    output += '__vue_template__ = ' + (
-        template.src
-          ? getRequireForImport('template', template, hasLocalStyles)
-          : getRequire('template', template, 0, hasLocalStyles)
-      )
+  var template = parts.template
+  if (template) {
+    output += 'var __vue_template__ = ' + (
+      template.src
+        ? getRequireForImport('template', template, hasLocalStyles)
+        : getRequire('template', template, null, hasLocalStyles)
+    )
+    // attach render functions to exported options
+    exports +=
+      'var __vue_options__ = (typeof __exports__ === "function" ' +
+        '? (__exports__.options || (__exports__.options = {})) ' +
+        ': __exports__)\n' +
+      '__vue_options__.render = __vue_template__.render\n' +
+      '__vue_options__.staticRenderFns = __vue_template__.staticRenderFns\n'
   }
 
   if (!query.inject) {
-    // attach template
     output +=
-      'module.exports = __vue_script__ || {}\n' +
-      'if (module.exports.__esModule) module.exports = module.exports.default\n' +
-      'if (__vue_template__) {\n' +
-        '(typeof module.exports === "function" ' +
-          '? (module.exports.options || (module.exports.options = {})) ' +
-          ': module.exports).template = __vue_template__\n' +
-      '}\n'
+      'var __exports__ = __vue_script__ || {}\n' +
+      exports +
+      'module.exports = __exports__'
     // hot reload
-    if (
-      !this.minimize &&
-      process.env.NODE_ENV !== 'production' &&
-      (parts.script.length || parts.template.length)
-    ) {
-      output +=
-        'if (module.hot) {(function () {' +
-        '  module.hot.accept()\n' +
-        '  var hotAPI = require("vue-hot-reload-api")\n' +
-        '  hotAPI.install(require("vue"), false)\n' +
-        '  if (!hotAPI.compatible) return\n' +
-        '  var id = ' + loaderUtils.stringifyRequest(loaderContext, filePath) + '\n' +
-        '  if (!module.hot.data) {\n' +
-        // initial insert
-        '    hotAPI.createRecord(id, module.exports)\n' +
-        '  } else {\n' +
-        // update
-        '    hotAPI.update(id, module.exports, __vue_template__)\n' +
-        '  }\n' +
-        '})()}'
-    }
+    // if (
+    //   !this.minimize &&
+    //   process.env.NODE_ENV !== 'production' &&
+    //   (parts.script.length || parts.template.length)
+    // ) {
+    //   output +=
+    //     'if (module.hot) {(function () {' +
+    //     '  module.hot.accept()\n' +
+    //     '  var hotAPI = require("vue-hot-reload-api")\n' +
+    //     '  hotAPI.install(require("vue"), false)\n' +
+    //     '  if (!hotAPI.compatible) return\n' +
+    //     '  var id = ' + loaderUtils.stringifyRequest(loaderContext, filePath) + '\n' +
+    //     '  if (!module.hot.data) {\n' +
+    //     // initial insert
+    //     '    hotAPI.createRecord(id, module.exports)\n' +
+    //     '  } else {\n' +
+    //     // update
+    //     '    hotAPI.update(id, module.exports, __vue_template__)\n' +
+    //     '  }\n' +
+    //     '})()}'
+    // }
   } else {
     output +=
       'module.exports = function (injections) {\n' +
-      '  var mod = __vue_script__\n' +
+      '  var __exports__ = __vue_script__\n' +
       '    ? __vue_script__(injections)\n' +
-      '    : {}\n' +
-      '  if (mod.__esModule) mod = mod.default\n' +
-      '  if (__vue_template__) { (typeof mod === "function" ? mod.options : mod).template = __vue_template__ }\n' +
-      '  return mod\n' +
+      '    : {}\n' + exports +
+      '  return __exports__\n' +
       '}'
   }
 
   // done
   return output
 }
-
-module.exports.withLoaders = function () {
-  throw new Error(
-    'vue.withLoaders has been deprecated in vue-loader 6.0. ' +
-    'Add a "vue" section to the webpack config instead.'
-  )
-}
diff --git a/lib/parser.js b/lib/parser.js
index a353635d1..dc03007fa 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,21 +1,6 @@
-var parse5 = require('parse5')
-var validateTemplate = require('vue-template-validator')
+var compiler = require('vue-template-compiler')
 var cache = require('lru-cache')(100)
-var SourceMapGenerator = require('source-map').SourceMapGenerator
 var hash = require('hash-sum')
-var deindent = require('de-indent')
-var splitRE = /\r?\n/g
-var emptyRE = /^\s*$/
-var commentSymbols = {
-  'iced': '#',
-  'iced-jsx': '#',
-  'iced-redux': '#',
-  'coffee': '#',
-  'coffee-jsx': '#',
-  'coffee-redux': '#',
-  'purs': '--',
-  'ulmus': '--'
-}
 
 module.exports = function (content, filename, needMap) {
   var cacheKey = hash(filename + content)
@@ -23,171 +8,7 @@ module.exports = function (content, filename, needMap) {
   var filenameWithHash = filename + '?' + cacheKey
   var output = cache.get(cacheKey)
   if (output) return output
-
-  output = {
-    template: [],
-    style: [],
-    script: [],
-    styleImports: []
-  }
-
-  var fragment = parse5.parseFragment(content, {
-    locationInfo: true
-  })
-
-  fragment.childNodes.forEach(function (node) {
-    var type = node.tagName
-    var lang = getAttribute(node, 'lang')
-    var src = getAttribute(node, 'src')
-    var scoped = getAttribute(node, 'scoped') != null
-    var warnings = null
-    var map = null
-
-    if (!output[type]) {
-      return
-    }
-
-    // node count check
-    if (
-      (type === 'script' || type === 'template') &&
-      output[type].length > 0
-    ) {
-      throw new Error(
-        '[vue-loader] Only one <script> or <template> tag is ' +
-        'allowed inside a Vue component.'
-      )
-    }
-
-    // handle src imports
-    if (src) {
-      if (type === 'style') {
-        output.styleImports.push({
-          src: src,
-          lang: lang,
-          scoped: scoped
-        })
-      } else if (type === 'template') {
-        output.template.push({
-          src: src,
-          lang: lang
-        })
-      } else if (type === 'script') {
-        output.script.push({
-          src: src,
-          lang: lang
-        })
-      }
-      return
-    }
-
-    // skip empty script/style tags
-    if (type !== 'template' && (!node.childNodes || !node.childNodes.length)) {
-      return
-    }
-
-    // template content is nested inside the content fragment
-    if (type === 'template') {
-      node = node.content
-      if (!lang) {
-        warnings = validateTemplate(node, content)
-      }
-    }
-
-    // extract part
-    var start = node.childNodes[0].__location.startOffset
-    var end = node.childNodes[node.childNodes.length - 1].__location.endOffset
-    var result
-    if (type === 'script') {
-      // preserve other parts as commenets so that linters
-      // and babel can output correct line numbers in warnings
-      result =
-        commentScript(content.slice(0, start), lang) +
-        deindent(content.slice(start, end)) +
-        commentScript(content.slice(end), lang)
-    } else {
-      var lineOffset = content.slice(0, start).split(splitRE).length - 1
-      result = deindent(content.slice(start, end))
-
-      // pad whith whitespace so that error messages are correct
-      result = Array(lineOffset + 1).join('\n') + result
-    }
-
-    if (needMap) {
-      // generate source map
-      map = new SourceMapGenerator()
-      map.setSourceContent(filenameWithHash, content)
-
-      // do not add mappings for comment lines - babel's source map
-      // somehow gets messed up because of it
-      var isCommentLine = function (line) {
-        return type === 'script' &&
-          line.indexOf(getCommentSymbol(lang)) === 0
-      }
-
-      result.split(splitRE).forEach(function (line, index) {
-        if (!emptyRE.test(line) && !isCommentLine(line)) {
-          map.addMapping({
-            source: filenameWithHash,
-            original: {
-              line: index + 1,
-              column: 0
-            },
-            generated: {
-              line: index + 1,
-              column: 0
-            }
-          })
-        }
-      })
-      // workaround for Webpack eval-source-map bug
-      // https://github.com/webpack/webpack/pull/1816
-      // in case the script was piped through another loader
-      // that doesn't pass down the source map properly.
-      if (type === 'script' && !lang) {
-        result += '\n/* generated by vue-loader */\n'
-      }
-    }
-
-    output[type].push({
-      lang: lang,
-      scoped: scoped,
-      content: result,
-      map: map && map.toJSON(),
-      warnings: warnings
-    })
-  })
-
+  output = compiler.parseComponent(content)
   cache.set(cacheKey, output)
   return output
 }
-
-function commentScript (content, lang) {
-  var symbol = getCommentSymbol(lang)
-  var lines = content.split(splitRE)
-  return lines.map(function (line, index) {
-    // preserve EOL
-    if (index === lines.length - 1 && emptyRE.test(line)) {
-      return ''
-    } else {
-      return symbol + (emptyRE.test(line) ? '' : ' ' + line)
-    }
-  })
-  .join('\n')
-}
-
-function getCommentSymbol (lang) {
-  return commentSymbols[lang] || '//'
-}
-
-function getAttribute (node, name) {
-  if (node.attrs) {
-    var i = node.attrs.length
-    var attr
-    while (i--) {
-      attr = node.attrs[i]
-      if (attr.name === name) {
-        return attr.value
-      }
-    }
-  }
-}
diff --git a/lib/selector.js b/lib/selector.js
index 11dc029ff..552260783 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -7,6 +7,9 @@ module.exports = function (content) {
   var query = loaderUtils.parseQuery(this.query)
   var filename = path.basename(this.resourcePath)
   var parts = parse(content, filename, this.sourceMap)
-  var part = parts[query.type][query.index]
+  var part = parts[query.type]
+  if (Array.isArray(part)) {
+    part = part[query.index]
+  }
   this.callback(null, part.content, part.map)
 }
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
new file mode 100644
index 000000000..f382d6e36
--- /dev/null
+++ b/lib/template-compiler.js
@@ -0,0 +1,45 @@
+var compiler = require('vue-template-compiler')
+
+// vue compiler module for using file-loader img src
+var options = {
+  modules: [{
+    postTransformNode (el) {
+      if (el.tag === 'img') {
+        el.staticAttrs && el.staticAttrs.some(rewrite)
+      }
+    }
+  }]
+}
+
+function rewrite (attr) {
+  if (attr.name === 'src') {
+    var firstChar = attr.value.charAt(1)
+    if (firstChar === '.' || firstChar === '~') {
+      if (firstChar === '~') {
+        attr.value = '"' + attr.value.slice(2)
+      }
+      attr.value = `require(${attr.value})`
+    }
+    return true
+  }
+}
+
+module.exports = function (html) {
+  this.cacheable()
+  var compiled = compiler.compile(html, options)
+  if (compiled.errors.length) {
+    var self = this
+    compiled.errors.forEach(function (err) {
+      self.emitError('template syntax error ' + err)
+    })
+    return 'module.exports={render:function(){},staticRenderFns:[]}'
+  }
+  return 'module.exports={' +
+    'render:' + toFunction(compiled.render) + ',' +
+    'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+  '}'
+}
+
+function toFunction (code) {
+  return 'function(){' + code + '}'
+}
diff --git a/lib/template-rewriter.js b/lib/template-rewriter.js
deleted file mode 100644
index debdb71c2..000000000
--- a/lib/template-rewriter.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var parse5 = require('parse5')
-var loaderUtils = require('loader-utils')
-
-module.exports = function (html) {
-  this.cacheable()
-  var query = loaderUtils.parseQuery(this.query)
-  var id = query.id
-  var tree = parse5.parseFragment(html)
-  walk(tree, function (node) {
-    if (node.attrs) {
-      node.attrs.push({
-        name: id,
-        value: ''
-      })
-    }
-  })
-  return parse5.serialize(tree)
-}
-
-function walk (tree, fn) {
-  if (tree.childNodes) {
-    tree.childNodes.forEach(function (node) {
-      var isTemplate = node.tagName === 'template'
-      if (!isTemplate) {
-        fn(node)
-      }
-      if (isTemplate && node.content) {
-        walk(node.content, fn)
-      } else {
-        walk(node, fn)
-      }
-    })
-  }
-}

From 2c20abfa8dcb3341fa9bdb7f71f118b08cb9c196 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 8 Jun 2016 21:23:47 -0400
Subject: [PATCH 277/877] scoped css support

---
 lib/loader.js | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 450470faa..315cf1f6a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,7 +1,6 @@
 var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
 var parse = require('./parser')
-var selectorPath = require.resolve('./selector')
 var hash = require('hash-sum')
 var path = require('path')
 
@@ -12,15 +11,12 @@ var defaultLang = {
 }
 
 var rewriterInjectRE = /\b(css(-loader)?(\?[^!]+)?)(?:!|$)/
-var rewriters = {
-  styles: require.resolve('./style-rewriter')
-}
-
-var templateLoader = require.resolve('./template-loader')
+var selectorPath = 'vue-loader/lib/selector'
+var templateLoader = 'vue-loader/lib/template-loader'
 
 module.exports = function (content) {
   var defaultLoaders = {
-    html: require.resolve('./template-compiler'),
+    html: 'vue-loader/lib/template-compiler',
     css: 'vue-style-loader!css-loader',
     js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
   }
@@ -32,6 +28,7 @@ module.exports = function (content) {
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = '_v-' + hash(filePath)
+  var styleRewriter = 'vue-loader/lib/style-rewriter?id=' + moduleId
 
   // respect user babel options
   if (this.options.babel) {
@@ -88,7 +85,7 @@ module.exports = function (content) {
   function getLoaderString (type, part, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
-    var rewriter = getRewriter(type, scoped)
+    var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
     var injectString = (type === 'script' && query.inject) ? 'inject!' : ''
     if (loader !== undefined) {
       // inject rewriter before css/html loader for
@@ -114,18 +111,6 @@ module.exports = function (content) {
     }
   }
 
-  function getRewriter (type, scoped) {
-    var meta = '?id=' + moduleId
-    switch (type) {
-      case 'template':
-        return scoped ? (rewriters.template + meta + '!') : ''
-      case 'style':
-        return rewriters.style + (scoped ? meta + '&scoped=true!' : '!')
-      default:
-        return ''
-    }
-  }
-
   function getSelectorString (type, index) {
     return selectorPath +
       '?type=' + type +
@@ -141,13 +126,13 @@ module.exports = function (content) {
   }
 
   var parts = parse(content, fileName, this.sourceMap)
-  var hasLocalStyles = false
+  var hasScoped = false
   var output = ''
 
   // add requires for styles
   parts.styles.forEach(function (style, i) {
     var scoped = style.scoped
-    if (scoped) hasLocalStyles = true
+    if (scoped) hasScoped = true
     output += style.src
       ? getRequireForImport('styles', style.src, scoped)
       : getRequire('styles', style, i, scoped)
@@ -184,8 +169,8 @@ module.exports = function (content) {
   if (template) {
     output += 'var __vue_template__ = ' + (
       template.src
-        ? getRequireForImport('template', template, hasLocalStyles)
-        : getRequire('template', template, null, hasLocalStyles)
+        ? getRequireForImport('template', template)
+        : getRequire('template', template)
     )
     // attach render functions to exported options
     exports +=
@@ -194,6 +179,10 @@ module.exports = function (content) {
         ': __exports__)\n' +
       '__vue_options__.render = __vue_template__.render\n' +
       '__vue_options__.staticRenderFns = __vue_template__.staticRenderFns\n'
+    // attach scoped id
+    if (hasScoped) {
+      exports += '__vue_options__._scopeId = "' + moduleId + '"\n'
+    }
   }
 
   if (!query.inject) {

From 961c065850352748ae53312e1733c92ec2472831 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 8 Jun 2016 21:34:33 -0400
Subject: [PATCH 278/877] cleanup deps

---
 package.json | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 0b6f80bea..036e109c8 100644
--- a/package.json
+++ b/package.json
@@ -31,25 +31,16 @@
   "dependencies": {
     "autoprefixer": "^6.0.3",
     "consolidate": "^0.14.0",
-    "de-indent": "^1.0.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
     "lru-cache": "^2.7.0",
     "object-assign": "^4.0.0",
-    "parse5": "^2.1.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
-    "source-map": "^0.5.3",
-    "vue-template-validator": "^1.0.0"
+    "vue-template-compiler": "^0.1.0"
   },
   "peerDependencies": {
-    "babel-loader": "^6.2.4",
-    "babel-core": "^6.8.0",
-    "babel-plugin-transform-runtime": "^6.8.0",
-    "babel-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.6.0",
     "css-loader": "*",
-    "vue-html-loader": "^1.0.0",
     "vue-style-loader": "^1.0.0",
     "vue-hot-reload-api": "^1.2.0"
   },

From c9bd50626a2b440b13c5b17936216c306bb0603e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 9 Jun 2016 19:00:03 -0400
Subject: [PATCH 279/877] support 2.0 hot-reload

---
 lib/loader.js            | 57 ++++++++++++++++++++--------------------
 lib/template-compiler.js | 26 ++++++++++++++----
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 315cf1f6a..4ff48249a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -15,12 +15,6 @@ var selectorPath = 'vue-loader/lib/selector'
 var templateLoader = 'vue-loader/lib/template-loader'
 
 module.exports = function (content) {
-  var defaultLoaders = {
-    html: 'vue-loader/lib/template-compiler',
-    css: 'vue-style-loader!css-loader',
-    js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
-  }
-
   this.cacheable()
   var loaderContext = this
   var options = this.options.vue || {}
@@ -30,6 +24,12 @@ module.exports = function (content) {
   var moduleId = '_v-' + hash(filePath)
   var styleRewriter = 'vue-loader/lib/style-rewriter?id=' + moduleId
 
+  var defaultLoaders = {
+    html: 'vue-loader/lib/template-compiler?id=' + moduleId,
+    css: 'vue-style-loader!css-loader',
+    js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
+  }
+
   // respect user babel options
   if (this.options.babel) {
     defaultLoaders.js = 'babel-loader'
@@ -127,7 +127,7 @@ module.exports = function (content) {
 
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = false
-  var output = ''
+  var output = 'var __vue_script__\n'
 
   // add requires for styles
   parts.styles.forEach(function (style, i) {
@@ -142,7 +142,7 @@ module.exports = function (content) {
   var script = parts.script
   if (script) {
     output +=
-      'var __vue_script__ = ' + (
+      '__vue_script__ = ' + (
         script.src
           ? getRequireForImport('script', script)
           : getRequire('script', script)
@@ -191,27 +191,26 @@ module.exports = function (content) {
       exports +
       'module.exports = __exports__'
     // hot reload
-    // if (
-    //   !this.minimize &&
-    //   process.env.NODE_ENV !== 'production' &&
-    //   (parts.script.length || parts.template.length)
-    // ) {
-    //   output +=
-    //     'if (module.hot) {(function () {' +
-    //     '  module.hot.accept()\n' +
-    //     '  var hotAPI = require("vue-hot-reload-api")\n' +
-    //     '  hotAPI.install(require("vue"), false)\n' +
-    //     '  if (!hotAPI.compatible) return\n' +
-    //     '  var id = ' + loaderUtils.stringifyRequest(loaderContext, filePath) + '\n' +
-    //     '  if (!module.hot.data) {\n' +
-    //     // initial insert
-    //     '    hotAPI.createRecord(id, module.exports)\n' +
-    //     '  } else {\n' +
-    //     // update
-    //     '    hotAPI.update(id, module.exports, __vue_template__)\n' +
-    //     '  }\n' +
-    //     '})()}'
-    // }
+    if (
+      !this.minimize &&
+      process.env.NODE_ENV !== 'production' &&
+      (parts.script || parts.template)
+    ) {
+      output +=
+        '\nif (module.hot) {(function () {' +
+        '  var hotAPI = require("vue-hot-reload-api")\n' +
+        '  hotAPI.install(require("vue"), false)\n' +
+        '  if (!hotAPI.compatible) return\n' +
+        '  module.hot.accept()\n' +
+        '  if (!module.hot.data) {\n' +
+        // initial insert
+        '    hotAPI.createRecord("' + moduleId + '", __exports__)\n' +
+        '  } else {\n' +
+        // update
+        '    hotAPI.reload("' + moduleId + '", __exports__)\n' +
+        '  }\n' +
+        '})()}'
+    }
   } else {
     output +=
       'module.exports = function (injections) {\n' +
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index f382d6e36..c936dbf68 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -1,4 +1,5 @@
 var compiler = require('vue-template-compiler')
+var loaderUtils = require('loader-utils')
 
 // vue compiler module for using file-loader img src
 var options = {
@@ -27,17 +28,32 @@ function rewrite (attr) {
 module.exports = function (html) {
   this.cacheable()
   var compiled = compiler.compile(html, options)
+  var code
   if (compiled.errors.length) {
     var self = this
     compiled.errors.forEach(function (err) {
       self.emitError('template syntax error ' + err)
     })
-    return 'module.exports={render:function(){},staticRenderFns:[]}'
+    code = 'module.exports={render:function(){},staticRenderFns:[]}'
+  } else {
+    code = 'module.exports={' +
+      'render:' + toFunction(compiled.render) + ',' +
+      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+    '}'
   }
-  return 'module.exports={' +
-    'render:' + toFunction(compiled.render) + ',' +
-    'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-  '}'
+  // hot-reload
+  if (!this.minimize &&
+      process.env.NODE_ENV !== 'production') {
+    var moduleId = loaderUtils.parseQuery(this.query).id
+    code +=
+      '\nif (module.hot) {\n' +
+      '  module.hot.accept()\n' +
+      '  if (module.hot.data) {\n' +
+      '     require("vue-hot-reload-api").rerender("' + moduleId + '", module.exports)\n' +
+      '  }\n' +
+      '}'
+  }
+  return code
 }
 
 function toFunction (code) {

From 93212aa5c3f574fcc7d03a3ca6cc488d4d15a787 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Jun 2016 11:57:24 -0400
Subject: [PATCH 280/877] tweak css rewriter regex

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 4ff48249a..8b1797e5b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -10,7 +10,7 @@ var defaultLang = {
   script: 'js'
 }
 
-var rewriterInjectRE = /\b(css(-loader)?(\?[^!]+)?)(?:!|$)/
+var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 var selectorPath = 'vue-loader/lib/selector'
 var templateLoader = 'vue-loader/lib/template-loader'
 

From 4dfef0e09cf5911b7261497cf17f5129122a3bcb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Jun 2016 13:18:04 -0400
Subject: [PATCH 281/877] pass pad/map option to sfc parser

---
 lib/parser.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index dc03007fa..36e1eb4f7 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -8,7 +8,10 @@ module.exports = function (content, filename, needMap) {
   var filenameWithHash = filename + '?' + cacheKey
   var output = cache.get(cacheKey)
   if (output) return output
-  output = compiler.parseComponent(content)
+  output = compiler.parseComponent(content, {
+    pad: true,
+    map: true
+  })
   cache.set(cacheKey, output)
   return output
 }

From c6d282705e7b24c9a72dd5901c600cab0ee45ed7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 10 Jun 2016 13:38:02 -0400
Subject: [PATCH 282/877] pass in filename for sourcemap

---
 lib/parser.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 36e1eb4f7..4f674da24 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -10,7 +10,9 @@ module.exports = function (content, filename, needMap) {
   if (output) return output
   output = compiler.parseComponent(content, {
     pad: true,
-    map: true
+    map: needMap
+      ? { filename: filenameWithHash }
+      : false
   })
   cache.set(cacheKey, output)
   return output

From 9f00d51b83f175d76cf16df4bf5fabf4e85070f9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 12 Jun 2016 13:10:13 -0400
Subject: [PATCH 283/877] simplify deps by dynamically normalizing path

---
 lib/loader.js            | 36 ++++++++++++++++--------------------
 lib/normalize-dep.js     | 12 ++++++++++++
 lib/template-compiler.js |  4 +++-
 package.json             | 10 ++--------
 4 files changed, 33 insertions(+), 29 deletions(-)
 create mode 100644 lib/normalize-dep.js

diff --git a/lib/loader.js b/lib/loader.js
index 8b1797e5b..e3c3ac563 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -3,6 +3,7 @@ var assign = require('object-assign')
 var parse = require('./parser')
 var hash = require('hash-sum')
 var path = require('path')
+var normalizeDepPath = require('./normalize-dep')
 
 var defaultLang = {
   template: 'html',
@@ -12,7 +13,9 @@ var defaultLang = {
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 var selectorPath = 'vue-loader/lib/selector'
-var templateLoader = 'vue-loader/lib/template-loader'
+var templateLoaderPath = 'vue-loader/lib/template-loader'
+var styleLoaderPath = normalizeDepPath('vue-style-loader')
+var hotReloadAPIPath = normalizeDepPath('vue-hot-reload-api')
 
 module.exports = function (content) {
   this.cacheable()
@@ -24,25 +27,18 @@ module.exports = function (content) {
   var moduleId = '_v-' + hash(filePath)
   var styleRewriter = 'vue-loader/lib/style-rewriter?id=' + moduleId
 
-  var defaultLoaders = {
-    html: 'vue-loader/lib/template-compiler?id=' + moduleId,
-    css: 'vue-style-loader!css-loader',
-    js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
-  }
-
-  // respect user babel options
-  if (this.options.babel) {
-    defaultLoaders.js = 'babel-loader'
-  }
-
-  // enable css source map if needed
-  if (
+  var needCssSourceMap =
     this.sourceMap &&
     !this.minimize &&
-    options.cssSourceMap !== false &&
-    process.env.NODE_ENV !== 'production'
-  ) {
-    defaultLoaders.css = 'vue-style-loader!css-loader?sourceMap'
+    process.env.NODE_ENV !== 'production' &&
+    options.cssSourceMap !== false
+
+  var defaultLoaders = {
+    html: 'vue-loader/lib/template-compiler?id=' + moduleId,
+    css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
+    js: this.options.babel
+      ? 'babel-loader' // respect user options
+      : 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
   }
 
   // check if there are custom loaders specified via
@@ -102,7 +98,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templateLoader + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           return defaultLoaders.css + '!' + rewriter + lang + '!'
         case 'script':
@@ -198,7 +194,7 @@ module.exports = function (content) {
     ) {
       output +=
         '\nif (module.hot) {(function () {' +
-        '  var hotAPI = require("vue-hot-reload-api")\n' +
+        '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
         '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
         '  module.hot.accept()\n' +
diff --git a/lib/normalize-dep.js b/lib/normalize-dep.js
new file mode 100644
index 000000000..b7fbeda7b
--- /dev/null
+++ b/lib/normalize-dep.js
@@ -0,0 +1,12 @@
+var fs = require('fs')
+var path = require('path')
+
+module.exports = function normalizeDepPath (dep) {
+  if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
+    // npm 2 or npm linked
+    return 'vue-loader/node_modules/' + dep
+  } else {
+    // npm 3
+    return dep
+  }
+}
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index c936dbf68..871cb19d6 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -1,5 +1,7 @@
 var compiler = require('vue-template-compiler')
 var loaderUtils = require('loader-utils')
+var normalizeDepPath = require('./normalize-dep')
+var hotReloadAPIPath = normalizeDepPath('vue-hot-reload-api')
 
 // vue compiler module for using file-loader img src
 var options = {
@@ -49,7 +51,7 @@ module.exports = function (html) {
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("vue-hot-reload-api").rerender("' + moduleId + '", module.exports)\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + moduleId + '", module.exports)\n' +
       '  }\n' +
       '}'
   }
diff --git a/package.json b/package.json
index 036e109c8..7764b7743 100644
--- a/package.json
+++ b/package.json
@@ -37,12 +37,9 @@
     "object-assign": "^4.0.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
-    "vue-template-compiler": "^0.1.0"
-  },
-  "peerDependencies": {
-    "css-loader": "*",
+    "vue-hot-reload-api": "^2.0.0",
     "vue-style-loader": "^1.0.0",
-    "vue-hot-reload-api": "^1.2.0"
+    "vue-template-compiler": "^2.0.0-alpha.1"
   },
   "devDependencies": {
     "babel-core": "^6.8.0",
@@ -70,9 +67,6 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.1.3",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-style-loader": "^1.0.0",
     "webpack": "^1.12.2"
   }
 }

From 9f922344dd4e28cc1a6ea4a48414fd94fce2337d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 12 Jun 2016 13:42:03 -0400
Subject: [PATCH 284/877] centralize path normalization logic

---
 lib/loader.js            | 24 +++++++++++++++---------
 lib/normalize-dep.js     | 12 ------------
 lib/normalize.js         | 23 +++++++++++++++++++++++
 lib/template-compiler.js |  4 ++--
 test/test.js             | 32 +++++++++++++++++---------------
 5 files changed, 57 insertions(+), 38 deletions(-)
 delete mode 100644 lib/normalize-dep.js
 create mode 100644 lib/normalize.js

diff --git a/lib/loader.js b/lib/loader.js
index e3c3ac563..588fc3675 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -3,7 +3,19 @@ var assign = require('object-assign')
 var parse = require('./parser')
 var hash = require('hash-sum')
 var path = require('path')
-var normalizeDepPath = require('./normalize-dep')
+var normalize = require('./normalize')
+
+// internal lib loaders
+var selectorPath = normalize.lib('selector')
+var templateLoaderPath = normalize.lib('template-loader')
+var templateCompilerPath = normalize.lib('template-compiler')
+var styleRewriterPath = normalize.lib('style-rewriter')
+
+// dep loaders
+var styleLoaderPath = normalize.dep('vue-style-loader')
+var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
+
+var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
 var defaultLang = {
   template: 'html',
@@ -11,12 +23,6 @@ var defaultLang = {
   script: 'js'
 }
 
-var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
-var selectorPath = 'vue-loader/lib/selector'
-var templateLoaderPath = 'vue-loader/lib/template-loader'
-var styleLoaderPath = normalizeDepPath('vue-style-loader')
-var hotReloadAPIPath = normalizeDepPath('vue-hot-reload-api')
-
 module.exports = function (content) {
   this.cacheable()
   var loaderContext = this
@@ -25,7 +31,7 @@ module.exports = function (content) {
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = '_v-' + hash(filePath)
-  var styleRewriter = 'vue-loader/lib/style-rewriter?id=' + moduleId
+  var styleRewriter = styleRewriterPath + '?id=' + moduleId
 
   var needCssSourceMap =
     this.sourceMap &&
@@ -34,7 +40,7 @@ module.exports = function (content) {
     options.cssSourceMap !== false
 
   var defaultLoaders = {
-    html: 'vue-loader/lib/template-compiler?id=' + moduleId,
+    html: templateCompilerPath + '?id=' + moduleId,
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
     js: this.options.babel
       ? 'babel-loader' // respect user options
diff --git a/lib/normalize-dep.js b/lib/normalize-dep.js
deleted file mode 100644
index b7fbeda7b..000000000
--- a/lib/normalize-dep.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var fs = require('fs')
-var path = require('path')
-
-module.exports = function normalizeDepPath (dep) {
-  if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
-    // npm 2 or npm linked
-    return 'vue-loader/node_modules/' + dep
-  } else {
-    // npm 3
-    return dep
-  }
-}
diff --git a/lib/normalize.js b/lib/normalize.js
new file mode 100644
index 000000000..cc9f66287
--- /dev/null
+++ b/lib/normalize.js
@@ -0,0 +1,23 @@
+var IS_TEST = !!process.env.VUE_LOADER_TEST
+var fs = require('fs')
+var path = require('path')
+
+exports.lib = function (file) {
+  if (IS_TEST) {
+    return path.resolve(__dirname, file)
+  } else {
+    return 'vue-loader/lib/' + file
+  }
+}
+
+exports.dep = function (dep) {
+  if (IS_TEST) {
+    return dep
+  } else if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
+    // npm 2 or npm linked
+    return 'vue-loader/node_modules/' + dep
+  } else {
+    // npm 3
+    return dep
+  }
+}
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 871cb19d6..e4262b0d7 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -1,7 +1,7 @@
 var compiler = require('vue-template-compiler')
 var loaderUtils = require('loader-utils')
-var normalizeDepPath = require('./normalize-dep')
-var hotReloadAPIPath = normalizeDepPath('vue-hot-reload-api')
+var normalize = require('./normalize')
+var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 // vue compiler module for using file-loader img src
 var options = {
diff --git a/test/test.js b/test/test.js
index 8644b3ef1..74c37b314 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,3 +1,5 @@
+process.env.VUE_LOADER_TEST = true
+
 var fs = require('fs')
 var path = require('path')
 var webpack = require('webpack')
@@ -69,7 +71,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/basic.vue'
     }, function (window) {
       var module = window.vueModule
-      expect(module.template).to.contain('<h2 class="red">{{msg}}</h2>')
+      // expect(module.template).to.contain('<h2 class="red">{{msg}}</h2>')
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
@@ -82,11 +84,11 @@ describe('vue-loader', function () {
       entry: './test/fixtures/pre.vue'
     }, function (window) {
       var module = window.vueModule
-      expect(module.template).to.contain(
-        '<h1>This is the app</h1>' +
-        '<comp-a></comp-a>' +
-        '<comp-b></comp-b>'
-      )
+      // expect(module.template).to.contain(
+      //   '<h1>This is the app</h1>' +
+      //   '<comp-a></comp-a>' +
+      //   '<comp-b></comp-b>'
+      // )
       expect(module.data().msg).to.contain('Hello from coffee!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
@@ -100,12 +102,12 @@ describe('vue-loader', function () {
     }, function (window) {
       var module = window.vueModule
       var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
-      expect(module.template).to.contain(
-        '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
-        '<p class="abc def" ' + id + '="">hi</p>\n' +
-        '<template v-if="ok"><p class="test" ' + id + '="">yo</p></template>\n' +
-        '<svg ' + id + '=""><template><p ' + id + '=""></p></template></svg>'
-      )
+      // expect(module.template).to.contain(
+      //   '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
+      //   '<p class="abc def" ' + id + '="">hi</p>\n' +
+      //   '<template v-if="ok"><p class="test" ' + id + '="">yo</p></template>\n' +
+      //   '<svg ' + id + '=""><template><p ' + id + '=""></p></template></svg>'
+      // )
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
       expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
@@ -132,7 +134,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/template-import.vue'
     }, function (window) {
       var module = window.vueModule
-      expect(module.template).to.contain('<div><h1>hello</h1></div>')
+      // expect(module.template).to.contain('<div><h1>hello</h1></div>')
       done()
     })
   })
@@ -230,7 +232,7 @@ describe('vue-loader', function () {
           msg: 'Hello from mocked service!'
         }
       })
-      expect(module.template).to.contain('<div class="msg">{{ msg }}</div>')
+      // expect(module.template).to.contain('<div class="msg">{{ msg }}</div>')
       expect(module.data().msg).to.contain('Hello from mocked service!')
       done()
     })
@@ -252,7 +254,7 @@ describe('vue-loader', function () {
       }
     }, function (window) {
       var module = window.vueModule
-      expect(module.template).to.contain('<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
+      // expect(module.template).to.contain('<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')
       expect(style).to.contain('body { background-image: url(logo.c9e00e.png); }')

From 9518db6655e26442366b607531135906c9f81dd2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 12 Jun 2016 13:46:30 -0400
Subject: [PATCH 285/877] tests passing without template assertions

---
 lib/loader.js                |  2 +-
 test/fixtures/pre.vue        |  7 ++++---
 test/fixtures/resolve.vue    |  2 ++
 test/fixtures/scoped-css.vue | 10 ++++++----
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 588fc3675..40f571371 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -136,7 +136,7 @@ module.exports = function (content) {
     var scoped = style.scoped
     if (scoped) hasScoped = true
     output += style.src
-      ? getRequireForImport('styles', style.src, scoped)
+      ? getRequireForImport('styles', style, scoped)
       : getRequire('styles', style, i, scoped)
   })
 
diff --git a/test/fixtures/pre.vue b/test/fixtures/pre.vue
index 2eafdb4fd..238e1a2ee 100644
--- a/test/fixtures/pre.vue
+++ b/test/fixtures/pre.vue
@@ -7,9 +7,10 @@ body
 </style>
 
 <template lang="jade">
-h1 This is the app
-comp-a
-comp-b
+div
+  h1 This is the app
+  comp-a
+  comp-b
 </template>
 
 <script lang="coffee">
diff --git a/test/fixtures/resolve.vue b/test/fixtures/resolve.vue
index c242e0fac..cd66cf905 100644
--- a/test/fixtures/resolve.vue
+++ b/test/fixtures/resolve.vue
@@ -1,6 +1,8 @@
 <template>
+<div>
   <img src="./logo.png">
   <img src="~fixtures/logo.png">
+</div>
 </template>
 
 <style>
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 9c9ec3059..ce28b06bd 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -11,8 +11,10 @@ h1 {
 </style>
 
 <template>
-<div><h1>hi</h1></div>
-<p class="abc def">hi</p>
-<template v-if="ok"><p class="test">yo</p></template>
-<svg><template><p></p></template></svg>
+<div>
+  <div><h1>hi</h1></div>
+  <p class="abc def">hi</p>
+  <template v-if="ok"><p class="test">yo</p></template>
+  <svg><template><p></p></template></svg>
+</div>
 </template>

From 2aa8f6b9cd7dccf97256568ed0835271eb5c787b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 13 Jun 2016 14:08:51 -0400
Subject: [PATCH 286/877] full test including template -> render compilation

---
 test/test.js | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/test/test.js b/test/test.js
index 74c37b314..f8009bac7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -9,9 +9,14 @@ var rimraf = require('rimraf')
 var hash = require('hash-sum')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var compiler = require('vue-template-compiler')
 
-describe('vue-loader', function () {
+function assertRenderFn (options, template) {
+  var compiled = compiler.compile(template)
+  expect(options.render.toString()).to.equal('function (){' + compiled.render + '}')
+}
 
+describe('vue-loader', function () {
   var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
   var outputDir = path.resolve(__dirname, './output')
   var loaderPath = 'expose?vueModule!'+path.resolve(__dirname, '../')
@@ -71,7 +76,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/basic.vue'
     }, function (window) {
       var module = window.vueModule
-      // expect(module.template).to.contain('<h2 class="red">{{msg}}</h2>')
+      assertRenderFn(module, '<h2 class="red">{{msg}}</h2>')
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
@@ -84,11 +89,13 @@ describe('vue-loader', function () {
       entry: './test/fixtures/pre.vue'
     }, function (window) {
       var module = window.vueModule
-      // expect(module.template).to.contain(
-      //   '<h1>This is the app</h1>' +
-      //   '<comp-a></comp-a>' +
-      //   '<comp-b></comp-b>'
-      // )
+      assertRenderFn(module,
+        '<div>' +
+          '<h1>This is the app</h1>' +
+          '<comp-a></comp-a>' +
+          '<comp-b></comp-b>' +
+        '</div>'
+      )
       expect(module.data().msg).to.contain('Hello from coffee!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
@@ -102,12 +109,15 @@ describe('vue-loader', function () {
     }, function (window) {
       var module = window.vueModule
       var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
-      // expect(module.template).to.contain(
-      //   '<div ' + id + '=""><h1 ' + id + '="">hi</h1></div>\n' +
-      //   '<p class="abc def" ' + id + '="">hi</p>\n' +
-      //   '<template v-if="ok"><p class="test" ' + id + '="">yo</p></template>\n' +
-      //   '<svg ' + id + '=""><template><p ' + id + '=""></p></template></svg>'
-      // )
+      expect(module._scopeId).to.equal(id)
+      assertRenderFn(module,
+        '<div>' +
+          '<div><h1>hi</h1></div>\n' +
+          '<p class="abc def">hi</p>\n' +
+          '<template v-if="ok"><p class="test">yo</p></template>\n' +
+          '<svg><template><p></p></template></svg>' +
+        '</div>'
+      )
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
       expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
@@ -134,7 +144,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/template-import.vue'
     }, function (window) {
       var module = window.vueModule
-      // expect(module.template).to.contain('<div><h1>hello</h1></div>')
+      assertRenderFn(module, '<div><h1>hello</h1></div>')
       done()
     })
   })
@@ -232,7 +242,7 @@ describe('vue-loader', function () {
           msg: 'Hello from mocked service!'
         }
       })
-      // expect(module.template).to.contain('<div class="msg">{{ msg }}</div>')
+      assertRenderFn(module, '<div class="msg">{{ msg }}</div>')
       expect(module.data().msg).to.contain('Hello from mocked service!')
       done()
     })
@@ -254,7 +264,7 @@ describe('vue-loader', function () {
       }
     }, function (window) {
       var module = window.vueModule
-      // expect(module.template).to.contain('<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
+      assertRenderFn(module, '<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')
       expect(style).to.contain('body { background-image: url(logo.c9e00e.png); }')

From f957086c274895d43717253dda6d6d933814365e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 13 Jun 2016 19:42:27 -0400
Subject: [PATCH 287/877] bump vue-template-compiler dep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7764b7743..a33a3308f 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "postcss-selector-parser": "^1.1.2",
     "vue-hot-reload-api": "^2.0.0",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.0-alpha.1"
+    "vue-template-compiler": "^2.0.0-alpha.2"
   },
   "devDependencies": {
     "babel-core": "^6.8.0",

From 4ca04e04ad20c1a75c03018e18579fa64ec331d0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 13 Jun 2016 19:44:25 -0400
Subject: [PATCH 288/877] use node 6 on ci

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index fe4654099..b00026e21 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,3 @@
 machine:
   node:
-    version: 4
+    version: 6

From 840c31e9d2979ed4ebd961ea88a2d84e44a11e39 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 14 Jun 2016 16:57:55 -0400
Subject: [PATCH 289/877] remove default autoprefixer

---
 lib/style-rewriter.js        | 14 --------------
 package.json                 |  1 -
 test/fixtures/autoprefix.vue |  5 -----
 test/test.js                 | 10 ----------
 4 files changed, 30 deletions(-)
 delete mode 100644 test/fixtures/autoprefix.vue

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 7c297b094..d392f2403 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,7 +1,6 @@
 var postcss = require('postcss')
 var selectorParser = require('postcss-selector-parser')
 var loaderUtils = require('loader-utils')
-var assign = require('object-assign')
 
 var addId = postcss.plugin('add-id', function (opts) {
   return function (root) {
@@ -34,7 +33,6 @@ module.exports = function (css, map) {
 
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.vue || {}
-  var autoprefixOptions = options.autoprefixer
   var postcssOptions = options.postcss
 
   // postcss plugins
@@ -53,18 +51,6 @@ module.exports = function (css, map) {
     plugins.push(addId({ id: query.id }))
   }
 
-  // autoprefixer
-  if (autoprefixOptions !== false) {
-    autoprefixOptions = assign(
-      {},
-      // also respect autoprefixer-loader options
-      this.options.autoprefixer,
-      autoprefixOptions
-    )
-    var autoprefixer = require('autoprefixer')(autoprefixOptions)
-    plugins.push(autoprefixer)
-  }
-
   // postcss options, for source maps
   var file = this.resourcePath
   var opts
diff --git a/package.json b/package.json
index a33a3308f..e611d103d 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
     "deploy-docs": "bash ./docs/deploy.sh"
   },
   "dependencies": {
-    "autoprefixer": "^6.0.3",
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
diff --git a/test/fixtures/autoprefix.vue b/test/fixtures/autoprefix.vue
deleted file mode 100644
index a5308b2e0..000000000
--- a/test/fixtures/autoprefix.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<style>
-body {
-  transform: scale(1);
-}
-</style>
diff --git a/test/test.js b/test/test.js
index f8009bac7..24e8ad0b9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -191,16 +191,6 @@ describe('vue-loader', function () {
     })
   })
 
-  it('autoprefix', function (done) {
-    test({
-      entry: './test/fixtures/autoprefix.vue'
-    }, function (window) {
-      var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('body {\n  -webkit-transform: scale(1);\n          transform: scale(1);\n}')
-      done()
-    })
-  })
-
   it('media-query', function (done) {
     test({
       entry: './test/fixtures/media-query.vue'

From d3274ec88afe9b9550237a739c42651405768887 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 14 Jun 2016 18:03:38 -0400
Subject: [PATCH 290/877] make babel optional, tweak peer deps

---
 lib/loader.js | 15 ++++++++++++---
 package.json  |  4 ++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 40f571371..c44f810f9 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -15,6 +15,13 @@ var styleRewriterPath = normalize.lib('style-rewriter')
 var styleLoaderPath = normalize.dep('vue-style-loader')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
+var hasBabel = true
+try {
+  require('babel-loader')
+} catch (e) {
+  hasBabel = false
+}
+
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
 var defaultLang = {
@@ -42,9 +49,11 @@ module.exports = function (content) {
   var defaultLoaders = {
     html: templateCompilerPath + '?id=' + moduleId,
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
-    js: this.options.babel
-      ? 'babel-loader' // respect user options
-      : 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
+    js: hasBabel
+      ? this.options.babel
+        ? 'babel-loader' // respect user options
+        : 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
+      : ''
   }
 
   // check if there are custom loaders specified via
diff --git a/package.json b/package.json
index e611d103d..cd6a58eda 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,10 @@
     "vue-style-loader": "^1.0.0",
     "vue-template-compiler": "^2.0.0-alpha.2"
   },
+  "peerDependencies": {
+    "css-loader": "^0.23.1",
+    "file-loader": "^0.8.5"
+  },
   "devDependencies": {
     "babel-core": "^6.8.0",
     "babel-loader": "^6.2.4",

From f5c571d5f068933ed7a3717b2398bd325c4ca3d3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 14 Jun 2016 18:15:28 -0400
Subject: [PATCH 291/877] remove default babel configuration

---
 .babelrc      | 3 +++
 lib/loader.js | 6 +-----
 package.json  | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)
 create mode 100644 .babelrc

diff --git a/.babelrc b/.babelrc
new file mode 100644
index 000000000..c13c5f627
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/lib/loader.js b/lib/loader.js
index c44f810f9..dfd5877bf 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -49,11 +49,7 @@ module.exports = function (content) {
   var defaultLoaders = {
     html: templateCompilerPath + '?id=' + moduleId,
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
-    js: hasBabel
-      ? this.options.babel
-        ? 'babel-loader' // respect user options
-        : 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
-      : ''
+    js: hasBabel ? 'babel-loader' : ''
   }
 
   // check if there are custom loaders specified via
diff --git a/package.json b/package.json
index cd6a58eda..b27308d35 100644
--- a/package.json
+++ b/package.json
@@ -47,9 +47,7 @@
   "devDependencies": {
     "babel-core": "^6.8.0",
     "babel-loader": "^6.2.4",
-    "babel-plugin-transform-runtime": "^6.8.0",
     "babel-preset-es2015": "^6.6.0",
-    "babel-runtime": "^6.0.0",
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",

From 3a74b46a3edd713c15fc6cff8f8cd75cd7875968 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 14 Jun 2016 18:22:13 -0400
Subject: [PATCH 292/877] bump deps

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index b27308d35..f9c6ed669 100644
--- a/package.json
+++ b/package.json
@@ -32,10 +32,10 @@
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^0.2.10",
-    "lru-cache": "^2.7.0",
+    "lru-cache": "^4.0.1",
     "object-assign": "^4.0.0",
     "postcss": "^5.0.10",
-    "postcss-selector-parser": "^1.1.2",
+    "postcss-selector-parser": "^2.0.0",
     "vue-hot-reload-api": "^2.0.0",
     "vue-style-loader": "^1.0.0",
     "vue-template-compiler": "^2.0.0-alpha.2"
@@ -59,7 +59,7 @@
     "file-loader": "^0.8.5",
     "inject-loader": "^2.0.1",
     "jade": "^1.11.0",
-    "jsdom": "^8.5.0",
+    "jsdom": "^9.2.1",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",

From 6c6c3e8ffa740b67242332a10c0a678c91137efa Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 14 Jun 2016 18:23:17 -0400
Subject: [PATCH 293/877] version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f9c6ed669..541ab276c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "8.5.2",
+  "version": "9.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From bd581dc48fd3deca0ea9edf2eaf80826d575b96f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jun 2016 13:52:40 -0400
Subject: [PATCH 294/877] generate nicer looking scoped CSS ids

---
 lib/gen-id.js |  8 ++++++++
 lib/loader.js |  4 ++--
 test/test.js  | 10 +++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 lib/gen-id.js

diff --git a/lib/gen-id.js b/lib/gen-id.js
new file mode 100644
index 000000000..25281aec5
--- /dev/null
+++ b/lib/gen-id.js
@@ -0,0 +1,8 @@
+// utility for generating a uid for each component file
+// used in scoped CSS rewriting
+var fileUid = 1
+var fileRegistry = Object.create(null)
+
+module.exports = function genId (file) {
+  return fileRegistry[file] || (fileRegistry[file] = fileUid++)
+}
diff --git a/lib/loader.js b/lib/loader.js
index dfd5877bf..9034bdc0d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,9 +1,9 @@
 var loaderUtils = require('loader-utils')
 var assign = require('object-assign')
 var parse = require('./parser')
-var hash = require('hash-sum')
 var path = require('path')
 var normalize = require('./normalize')
+var genId = require('./gen-id')
 
 // internal lib loaders
 var selectorPath = normalize.lib('selector')
@@ -37,7 +37,7 @@ module.exports = function (content) {
   var query = loaderUtils.parseQuery(this.query)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
-  var moduleId = '_v-' + hash(filePath)
+  var moduleId = 'data-v-' + genId(filePath)
   var styleRewriter = styleRewriterPath + '?id=' + moduleId
 
   var needCssSourceMap =
diff --git a/test/test.js b/test/test.js
index 24e8ad0b9..6e2a4f941 100644
--- a/test/test.js
+++ b/test/test.js
@@ -6,7 +6,7 @@ var webpack = require('webpack')
 var jsdom = require('jsdom')
 var expect = require('chai').expect
 var rimraf = require('rimraf')
-var hash = require('hash-sum')
+var genId = require('../lib/gen-id')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('vue-template-compiler')
@@ -19,7 +19,7 @@ function assertRenderFn (options, template) {
 describe('vue-loader', function () {
   var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
   var outputDir = path.resolve(__dirname, './output')
-  var loaderPath = 'expose?vueModule!'+path.resolve(__dirname, '../')
+  var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
   var globalConfig = {
     output: {
       path: outputDir,
@@ -108,7 +108,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/scoped-css.vue'
     }, function (window) {
       var module = window.vueModule
-      var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
+      var id = 'data-v-' + genId(require.resolve('./fixtures/scoped-css.vue'))
       expect(module._scopeId).to.equal(id)
       assertRenderFn(module,
         '<div>' +
@@ -133,7 +133,7 @@ describe('vue-loader', function () {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red; }')
       // import with scoped
-      var id = '_v-' + hash(require.resolve('./fixtures/style-import.vue'))
+      var id = 'data-v-' + genId(require.resolve('./fixtures/style-import.vue'))
       expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green; }')
       done()
     })
@@ -196,7 +196,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/media-query.vue'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
-      var id = '_v-' + hash(require.resolve('./fixtures/media-query.vue'))
+      var id = 'data-v-' + genId(require.resolve('./fixtures/media-query.vue'))
       expect(style).to.contain('@media print {\n  .foo[' + id + '] {\n    color: #000;\n  }\n}')
       done()
     })

From 5db7330cc1da68a8d107919fe6d55694cbf7a194 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jun 2016 13:59:18 -0400
Subject: [PATCH 295/877] bump hot-reload-api version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 541ab276c..a301670b9 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "object-assign": "^4.0.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^2.0.0",
-    "vue-hot-reload-api": "^2.0.0",
+    "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
     "vue-template-compiler": "^2.0.0-alpha.2"
   },

From 258626ba3c94a5efb123c733a3a9414940a121ef Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jun 2016 13:59:21 -0400
Subject: [PATCH 296/877] 9.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a301670b9..643534354 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 64e040192e6bf4209de38e0083c881b01d6c4e12 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jun 2016 19:04:33 -0400
Subject: [PATCH 297/877] use es6 in basic fixture

---
 test/fixtures/basic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
index 5035c8304..5dce8c774 100644
--- a/test/fixtures/basic.vue
+++ b/test/fixtures/basic.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-module.exports = {
+export default {
   data () {
     return {
       msg: 'Hello from Component A!'

From ff5e94fcd6b56ea3889a90c0c240a973c155dcff Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jun 2016 19:21:34 -0400
Subject: [PATCH 298/877] refactor tests to use memory-fs

---
 package.json |   1 +
 test/test.js | 155 ++++++++++++++++++++++++---------------------------
 2 files changed, 73 insertions(+), 83 deletions(-)

diff --git a/package.json b/package.json
index 643534354..a9191b130 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "inject-loader": "^2.0.1",
     "jade": "^1.11.0",
     "jsdom": "^9.2.1",
+    "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
diff --git a/test/test.js b/test/test.js
index 6e2a4f941..6b661a83a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,8 +1,8 @@
 process.env.VUE_LOADER_TEST = true
 
-var fs = require('fs')
 var path = require('path')
 var webpack = require('webpack')
+var MemoryFS = require('memory-fs')
 var jsdom = require('jsdom')
 var expect = require('chai').expect
 var rimraf = require('rimraf')
@@ -11,66 +11,61 @@ var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('vue-template-compiler')
 
-function assertRenderFn (options, template) {
-  var compiled = compiler.compile(template)
-  expect(options.render.toString()).to.equal('function (){' + compiled.render + '}')
+var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
+var mfs = new MemoryFS()
+var globalConfig = {
+  output: {
+    path: '/',
+    filename: 'test.build.js'
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: loaderPath
+      }
+    ]
+  }
 }
 
-describe('vue-loader', function () {
-  var testHTML = '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
-  var outputDir = path.resolve(__dirname, './output')
-  var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
-  var globalConfig = {
-    output: {
-      path: outputDir,
-      filename: 'test.build.js'
-    },
-    module: {
-      loaders: [
-        {
-          test: /\.vue$/,
-          loader: loaderPath
-        }
-      ]
+function bundle (options, cb) {
+  var config = Object.assign({}, globalConfig, options)
+  var webpackCompiler = webpack(config)
+  webpackCompiler.outputFileSystem = mfs
+  webpackCompiler.run(function (err, stats) {
+    expect(err).to.be.null
+    if (stats.compilation.errors.length) {
+      stats.compilation.errors.forEach(function (err) {
+        console.error(err.message)
+      })
     }
-  }
-
-  beforeEach(function (done) {
-    rimraf(outputDir, done)
+    expect(stats.compilation.errors).to.be.empty
+    cb(mfs.readFileSync('/test.build.js').toString())
   })
+}
 
-  function getFile (file, cb) {
-    fs.readFile(path.resolve(outputDir, file), 'utf-8', function (err, data) {
-      expect(err).to.be.not.exist
-      cb(data)
-    })
-  }
-
-  function test (options, assert) {
-    var config = Object.assign({}, globalConfig, options)
-    webpack(config, function (err, stats) {
-      if (stats.compilation.errors.length) {
-        stats.compilation.errors.forEach(function (err) {
-          console.error(err.message)
-        })
+function test (options, assert) {
+  bundle(options, function (code) {
+    jsdom.env({
+      html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
+      src: [code],
+      done: function (err, window) {
+        if (err) {
+          console.log(err[0].data.error.stack)
+          expect(err).to.be.null
+        }
+        assert(window)
       }
-      expect(stats.compilation.errors).to.be.empty
-      getFile('test.build.js', function (data) {
-        jsdom.env({
-          html: testHTML,
-          src: [data],
-          done: function (err, window) {
-            if (err) {
-              console.log(err[0].data.error.stack)
-              expect(err).to.be.null
-            }
-            assert(window)
-          }
-        })
-      })
     })
-  }
+  })
+}
+
+function assertRenderFn (options, template) {
+  var compiled = compiler.compile(template)
+  expect(options.render.toString()).to.equal('function (){' + compiled.render + '}')
+}
 
+describe('vue-loader', function () {
   it('basic', function (done) {
     test({
       entry: './test/fixtures/basic.vue'
@@ -164,30 +159,26 @@ describe('vue-loader', function () {
       entry: './test/fixtures/basic.vue',
       devtool: 'source-map'
     })
-    webpack(config, function (err) {
-      expect(err).to.be.null
-      getFile('test.build.js.map', function (map) {
-        var smc = new SourceMapConsumer(JSON.parse(map))
-        getFile('test.build.js', function (code) {
-          var line
-          var col
-          var targetRE = /^\s+msg: 'Hello from Component A!'/
-          code.split(/\r?\n/g).some(function (l, i) {
-            if (targetRE.test(l)) {
-              line = i + 1
-              col = l.length
-              return true
-            }
-          })
-          var pos = smc.originalPositionFor({
-            line: line,
-            column: col
-          })
-          expect(pos.source.indexOf('basic.vue') > -1)
-          expect(pos.line).to.equal(9)
-          done()
-        })
+    bundle(config, function (code) {
+      var map = mfs.readFileSync('/test.build.js.map').toString()
+      var smc = new SourceMapConsumer(JSON.parse(map))
+      var line
+      var col
+      var targetRE = /^\s+msg: 'Hello from Component A!'/
+      code.split(/\r?\n/g).some(function (l, i) {
+        if (targetRE.test(l)) {
+          line = i + 1
+          col = l.length
+          return true
+        }
       })
+      var pos = smc.originalPositionFor({
+        line: line,
+        column: col
+      })
+      expect(pos.source.indexOf('basic.vue') > -1)
+      expect(pos.line).to.equal(9)
+      done()
     })
   })
 
@@ -203,7 +194,7 @@ describe('vue-loader', function () {
   })
 
   it('extract CSS', function (done) {
-    webpack(Object.assign({}, globalConfig, {
+    bundle(Object.assign({}, globalConfig, {
       entry: './test/fixtures/extract-css.vue',
       vue: {
         loaders: {
@@ -214,12 +205,10 @@ describe('vue-loader', function () {
       plugins: [
         new ExtractTextPlugin('test.output.css')
       ]
-    }), function (err) {
-      expect(err).to.be.null
-      getFile('test.output.css', function (data) {
-        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\n\n\n\n\n\nh2 {\n  color: green;\n}')
-        done()
-      })
+    }), function () {
+      var css = mfs.readFileSync('/test.output.css').toString()
+      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\n\n\n\n\n\nh2 {\n  color: green;\n}')
+      done()
     })
   })
 

From 60703baa693ec6160812ec80954b9005a4294126 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 15 Jun 2016 22:29:47 -0400
Subject: [PATCH 299/877] better template-loader error handling

---
 lib/template-loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/template-loader.js b/lib/template-loader.js
index af3d6e083..ce26b75b4 100644
--- a/lib/template-loader.js
+++ b/lib/template-loader.js
@@ -27,10 +27,10 @@ module.exports = function (content) {
   }
 
   if (!cons[opt.engine]) {
-    throw new Error(
+    return callback(new Error(
       'Template engine \'' + opt.engine + '\' ' +
       'isn\'t available in Consolidate.js'
-    )
+    ))
   }
 
   // for relative includes
@@ -38,7 +38,7 @@ module.exports = function (content) {
 
   cons[opt.engine].render(content, opt, function (err, html) {
     if (err) {
-      throw err
+      return callback(err)
     }
     exportContent(html)
   })

From 911efa209078a214299ccfe69e1142176922a1cc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Jun 2016 01:11:45 -0400
Subject: [PATCH 300/877] move source map logic into vue-loader

---
 lib/parser.js | 52 +++++++++++++++++++++++++++++++++++++++++++++------
 package.json  |  1 +
 test/test.js  |  2 +-
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 4f674da24..d65b14fe4 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,6 +1,10 @@
 var compiler = require('vue-template-compiler')
 var cache = require('lru-cache')(100)
 var hash = require('hash-sum')
+var SourceMapGenerator = require('source-map').SourceMapGenerator
+
+var splitRE = /\r?\n/g
+var emptyRE = /^(?:\/\/)?\s*$/
 
 module.exports = function (content, filename, needMap) {
   var cacheKey = hash(filename + content)
@@ -8,12 +12,48 @@ module.exports = function (content, filename, needMap) {
   var filenameWithHash = filename + '?' + cacheKey
   var output = cache.get(cacheKey)
   if (output) return output
-  output = compiler.parseComponent(content, {
-    pad: true,
-    map: needMap
-      ? { filename: filenameWithHash }
-      : false
-  })
+  output = compiler.parseComponent(content, { pad: true })
+  if (needMap) {
+    if (output.script && !output.script.src) {
+      output.script.map = generateSourceMap(
+        filenameWithHash,
+        content,
+        output.script.content
+      )
+    }
+    if (output.styles) {
+      output.styles.forEach(style => {
+        if (!style.src) {
+          style.map = generateSourceMap(
+            filenameWithHash,
+            content,
+            style.content
+          )
+        }
+      })
+    }
+  }
   cache.set(cacheKey, output)
   return output
 }
+
+function generateSourceMap (filename, source, generated) {
+  var map = new SourceMapGenerator()
+  map.setSourceContent(filename, source)
+  generated.split(splitRE).forEach((line, index) => {
+    if (!emptyRE.test(line)) {
+      map.addMapping({
+        source: filename,
+        original: {
+          line: index + 1,
+          column: 0
+        },
+        generated: {
+          line: index + 1,
+          column: 0
+        }
+      })
+    }
+  })
+  return map.toJSON()
+}
diff --git a/package.json b/package.json
index a9191b130..63261e9f0 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "object-assign": "^4.0.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^2.0.0",
+    "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
     "vue-template-compiler": "^2.0.0-alpha.2"
diff --git a/test/test.js b/test/test.js
index 6b661a83a..af4fb772b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -157,7 +157,7 @@ describe('vue-loader', function () {
   it('source map', function (done) {
     var config = Object.assign({}, globalConfig, {
       entry: './test/fixtures/basic.vue',
-      devtool: 'source-map'
+      devtool: '#source-map'
     })
     bundle(config, function (code) {
       var map = mfs.readFileSync('/test.build.js.map').toString()

From 63a1031e2105748bcf2c0f156c5e9133804a082d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Jun 2016 01:11:50 -0400
Subject: [PATCH 301/877] 9.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63261e9f0..f9456fa6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 0256778a51e7727bc47145882795210f54403853 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Jun 2016 03:45:07 -0400
Subject: [PATCH 302/877] remove file-loader peerdep

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f9456fa6d..bc27eae51 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,7 @@
     "vue-template-compiler": "^2.0.0-alpha.2"
   },
   "peerDependencies": {
-    "css-loader": "^0.23.1",
-    "file-loader": "^0.8.5"
+    "css-loader": "^0.23.1"
   },
   "devDependencies": {
     "babel-core": "^6.8.0",

From a218d67049e2629ed32550674c7d772a9793d56a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Jun 2016 03:45:10 -0400
Subject: [PATCH 303/877] 9.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc27eae51..c65cb3249 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 584189c9542add147c484f75b7a6c2a7e7fc08f4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 25 Jun 2016 08:57:10 -0400
Subject: [PATCH 304/877] do not insert style for server bundle + trim css

---
 lib/loader.js         | 17 +++++++++--------
 lib/style-rewriter.js | 12 +++++++++++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 9034bdc0d..f247615a9 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -32,6 +32,7 @@ var defaultLang = {
 
 module.exports = function (content) {
   this.cacheable()
+  var isServer = this.options.target === 'node'
   var loaderContext = this
   var options = this.options.vue || {}
   var query = loaderUtils.parseQuery(this.query)
@@ -133,17 +134,17 @@ module.exports = function (content) {
   }
 
   var parts = parse(content, fileName, this.sourceMap)
-  var hasScoped = false
+  var hasScoped = parts.styles.some(function (s) { return s.scoped })
   var output = 'var __vue_script__\n'
 
   // add requires for styles
-  parts.styles.forEach(function (style, i) {
-    var scoped = style.scoped
-    if (scoped) hasScoped = true
-    output += style.src
-      ? getRequireForImport('styles', style, scoped)
-      : getRequire('styles', style, i, scoped)
-  })
+  if (!isServer) {
+    parts.styles.forEach(function (style, i) {
+      output += style.src
+        ? getRequireForImport('styles', style, style.scoped)
+        : getRequire('styles', style, i, style.scoped)
+    })
+  }
 
   // add require for script
   var script = parts.script
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index d392f2403..32f9cd080 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -27,6 +27,16 @@ var addId = postcss.plugin('add-id', function (opts) {
   }
 })
 
+var trim = postcss.plugin('trim', function (opts) {
+  return function (css) {
+    css.walk(function (node) {
+      if (node.type === 'rule' || node.type == 'atrule') {
+        node.raws.before = node.raws.after = '\n'
+      }
+    })
+  }
+})
+
 module.exports = function (css, map) {
   this.cacheable()
   var cb = this.async()
@@ -44,7 +54,7 @@ module.exports = function (css, map) {
   } else if (isObject(postcssOptions) && postcssOptions.plugins) {
     plugins = postcssOptions.plugins
   }
-  plugins = plugins ? plugins.slice() : [] // make sure to copy it
+  plugins = [trim].concat(plugins || [])
 
   // scoped css
   if (query.scoped) {

From af26a063af0b99cbc518ee07e42012361f0ff9f9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 25 Jun 2016 09:45:08 -0400
Subject: [PATCH 305/877] do not include hot-reload for server

---
 lib/loader.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/loader.js b/lib/loader.js
index f247615a9..80dd6f6ab 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -200,6 +200,7 @@ module.exports = function (content) {
       'module.exports = __exports__'
     // hot reload
     if (
+      !isServer &&
       !this.minimize &&
       process.env.NODE_ENV !== 'production' &&
       (parts.script || parts.template)

From 7381356b7b82ca1f4434327be52c166afc34a88f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 25 Jun 2016 11:25:04 -0400
Subject: [PATCH 306/877] fix eslint

---
 lib/style-rewriter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 32f9cd080..3702c90a5 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -30,7 +30,7 @@ var addId = postcss.plugin('add-id', function (opts) {
 var trim = postcss.plugin('trim', function (opts) {
   return function (css) {
     css.walk(function (node) {
-      if (node.type === 'rule' || node.type == 'atrule') {
+      if (node.type === 'rule' || node.type === 'atrule') {
         node.raws.before = node.raws.after = '\n'
       }
     })

From 0aabf82f2ebd7f266188c13e3db735c85e23a907 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 25 Jun 2016 11:30:44 -0400
Subject: [PATCH 307/877] fix css tests

---
 test/test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test.js b/test/test.js
index af4fb772b..d7cdc8d48 100644
--- a/test/test.js
+++ b/test/test.js
@@ -126,10 +126,10 @@ describe('vue-loader', function () {
       entry: './test/fixtures/style-import.vue'
     }, function (window) {
       var styles = window.document.querySelectorAll('style')
-      expect(styles[0].textContent).to.contain('h1 { color: red; }')
+      expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
       // import with scoped
       var id = 'data-v-' + genId(require.resolve('./fixtures/style-import.vue'))
-      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green; }')
+      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
       done()
     })
   })
@@ -188,7 +188,7 @@ describe('vue-loader', function () {
     }, function (window) {
       var style = window.document.querySelector('style').textContent
       var id = 'data-v-' + genId(require.resolve('./fixtures/media-query.vue'))
-      expect(style).to.contain('@media print {\n  .foo[' + id + '] {\n    color: #000;\n  }\n}')
+      expect(style).to.contain('@media print {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
       done()
     })
   })
@@ -207,7 +207,7 @@ describe('vue-loader', function () {
       ]
     }), function () {
       var css = mfs.readFileSync('/test.output.css').toString()
-      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\n\n\n\n\n\nh2 {\n  color: green;\n}')
+      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
       done()
     })
   })
@@ -245,8 +245,8 @@ describe('vue-loader', function () {
       var module = window.vueModule
       assertRenderFn(module, '<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
       var style = window.document.querySelector('style').textContent
-      expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')
-      expect(style).to.contain('body { background-image: url(logo.c9e00e.png); }')
+      expect(style).to.contain('html { background-image: url(logo.c9e00e.png);\n}')
+      expect(style).to.contain('body { background-image: url(logo.c9e00e.png);\n}')
       done()
     })
   })

From 518557b627cb68cdb4145100441549f638e6fb1d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 28 Jun 2016 16:20:02 -0400
Subject: [PATCH 308/877] nicer output with named exports support

---
 lib/loader.js           | 65 ++++++++++++++++++-----------------------
 package.json            |  4 +--
 test/fixtures/basic.vue |  4 +++
 test/test.js            | 36 ++++++++++++-----------
 4 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 80dd6f6ab..7bcc9d5b1 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -41,10 +41,11 @@ module.exports = function (content) {
   var moduleId = 'data-v-' + genId(filePath)
   var styleRewriter = styleRewriterPath + '?id=' + moduleId
 
+  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
+
   var needCssSourceMap =
+    !isProduction &&
     this.sourceMap &&
-    !this.minimize &&
-    process.env.NODE_ENV !== 'production' &&
     options.cssSourceMap !== false
 
   var defaultLoaders = {
@@ -135,10 +136,11 @@ module.exports = function (content) {
 
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
-  var output = 'var __vue_script__\n'
+  var output = 'var __vue_exports__, __vue_options__\n'
 
   // add requires for styles
-  if (!isServer) {
+  if (!isServer && parts.styles.length) {
+    output += '\n/* styles */\n'
     parts.styles.forEach(function (style, i) {
       output += style.src
         ? getRequireForImport('styles', style, style.scoped)
@@ -149,32 +151,26 @@ module.exports = function (content) {
   // add require for script
   var script = parts.script
   if (script) {
+    output += '\n/* script */\n'
     output +=
-      '__vue_script__ = ' + (
+      '__vue_exports__ = ' + (
         script.src
           ? getRequireForImport('script', script)
           : getRequire('script', script)
       )
-    // check and warn named exports
-    if (!this.minimize) {
-      output +=
-        'if (__vue_script__ &&\n' +
-        '    __vue_script__.__esModule &&\n' +
-        '    Object.keys(__vue_script__).length > 1) {\n' +
-        '  console.warn(' + JSON.stringify(
-            '[vue-loader] ' + path.relative(process.cwd(), filePath) +
-            ': named exports in *.vue files are ignored.'
-          ) + ')' +
-        '}\n'
-    }
   }
 
-  // plain require() compatibility
-  var exports = 'if (__exports__.__esModule) __exports__ = __exports__.default\n'
+  var exports =
+    '__vue_options__ = __vue_exports__ || {}\n' +
+    // ES6 modules interop
+    'if (__vue_options__.__esModule) __vue_options__ = __vue_options__.default\n' +
+    // constructor export interop
+    'if (typeof __vue_options__ === "function") __vue_options__ = __vue_options__.options\n'
 
   // add require for template
   var template = parts.template
   if (template) {
+    output += '\n/* template */\n'
     output += 'var __vue_template__ = ' + (
       template.src
         ? getRequireForImport('template', template)
@@ -182,9 +178,6 @@ module.exports = function (content) {
     )
     // attach render functions to exported options
     exports +=
-      'var __vue_options__ = (typeof __exports__ === "function" ' +
-        '? (__exports__.options || (__exports__.options = {})) ' +
-        ': __exports__)\n' +
       '__vue_options__.render = __vue_template__.render\n' +
       '__vue_options__.staticRenderFns = __vue_template__.staticRenderFns\n'
     // attach scoped id
@@ -194,39 +187,39 @@ module.exports = function (content) {
   }
 
   if (!query.inject) {
-    output +=
-      'var __exports__ = __vue_script__ || {}\n' +
-      exports +
-      'module.exports = __exports__'
+    output += exports
     // hot reload
     if (
       !isServer &&
-      !this.minimize &&
-      process.env.NODE_ENV !== 'production' &&
+      !isProduction &&
       (parts.script || parts.template)
     ) {
       output +=
-        '\nif (module.hot) {(function () {' +
+        '\n/* hot reload */\n' +
+        'if (module.hot) {(function () {\n' +
         '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
         '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
         '  module.hot.accept()\n' +
         '  if (!module.hot.data) {\n' +
         // initial insert
-        '    hotAPI.createRecord("' + moduleId + '", __exports__)\n' +
+        '    hotAPI.createRecord("' + moduleId + '", __vue_options__)\n' +
         '  } else {\n' +
         // update
-        '    hotAPI.reload("' + moduleId + '", __exports__)\n' +
+        '    hotAPI.reload("' + moduleId + '", __vue_options__)\n' +
         '  }\n' +
-        '})()}'
+        '})()}\n'
     }
+    // final export
+    output += '\nmodule.exports = __vue_exports__ || __vue_options__\n'
   } else {
+    // inject-loader support
     output +=
+      '\n/* dependency injection */\n' +
       'module.exports = function (injections) {\n' +
-      '  var __exports__ = __vue_script__\n' +
-      '    ? __vue_script__(injections)\n' +
-      '    : {}\n' + exports +
-      '  return __exports__\n' +
+      '  __vue_exports__ = __vue_exports__(injections)\n' +
+      exports +
+      '  return __vue_exports__ || __vue_options__\n' +
       '}'
   }
 
diff --git a/package.json b/package.json
index c65cb3249..59b161dc0 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
     "lint": "eslint lib",
-    "test": "eslint lib && mocha test/test.js --slow 5000 --timeout 10000",
+    "test": "eslint lib && mocha --slow 5000 --timeout 10000",
     "docs": "cd docs && gitbook serve",
     "deploy-docs": "bash ./docs/deploy.sh"
   },
@@ -39,7 +39,7 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.0-alpha.2"
+    "vue-template-compiler": "^2.0.0-alpha.8"
   },
   "peerDependencies": {
     "css-loader": "^0.23.1"
diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
index 5dce8c774..96f47a6b7 100644
--- a/test/fixtures/basic.vue
+++ b/test/fixtures/basic.vue
@@ -3,6 +3,10 @@
 </template>
 
 <script>
+export function test () {
+  return 'hi'
+}
+
 export default {
   data () {
     return {
diff --git a/test/test.js b/test/test.js
index d7cdc8d48..62f9b7043 100644
--- a/test/test.js
+++ b/test/test.js
@@ -54,7 +54,7 @@ function test (options, assert) {
           console.log(err[0].data.error.stack)
           expect(err).to.be.null
         }
-        assert(window)
+        assert(window, interopDefault(window.vueModule), window.vueModule)
       }
     })
   })
@@ -65,12 +65,19 @@ function assertRenderFn (options, template) {
   expect(options.render.toString()).to.equal('function (){' + compiled.render + '}')
 }
 
+function interopDefault (module) {
+  return module
+    ? module.__esModule ? module.default : module
+    : module
+}
+
 describe('vue-loader', function () {
   it('basic', function (done) {
     test({
       entry: './test/fixtures/basic.vue'
-    }, function (window) {
-      var module = window.vueModule
+    }, function (window, module, rawModule) {
+      // test named export
+      expect(rawModule.test()).to.equal('hi')
       assertRenderFn(module, '<h2 class="red">{{msg}}</h2>')
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
@@ -82,8 +89,7 @@ describe('vue-loader', function () {
   it('pre-processors', function (done) {
     test({
       entry: './test/fixtures/pre.vue'
-    }, function (window) {
-      var module = window.vueModule
+    }, function (window, module) {
       assertRenderFn(module,
         '<div>' +
           '<h1>This is the app</h1>' +
@@ -101,8 +107,7 @@ describe('vue-loader', function () {
   it('scoped style', function (done) {
     test({
       entry: './test/fixtures/scoped-css.vue'
-    }, function (window) {
-      var module = window.vueModule
+    }, function (window, module) {
       var id = 'data-v-' + genId(require.resolve('./fixtures/scoped-css.vue'))
       expect(module._scopeId).to.equal(id)
       assertRenderFn(module,
@@ -137,8 +142,7 @@ describe('vue-loader', function () {
   it('template import', function (done) {
     test({
       entry: './test/fixtures/template-import.vue'
-    }, function (window) {
-      var module = window.vueModule
+    }, function (window, module) {
       assertRenderFn(module, '<div><h1>hello</h1></div>')
       done()
     })
@@ -147,8 +151,7 @@ describe('vue-loader', function () {
   it('script import', function (done) {
     test({
       entry: './test/fixtures/script-import.vue'
-    }, function (window) {
-      var module = window.vueModule
+    }, function (window, module) {
       expect(module.data().msg).to.contain('Hello from Component A!')
       done()
     })
@@ -168,7 +171,7 @@ describe('vue-loader', function () {
       code.split(/\r?\n/g).some(function (l, i) {
         if (targetRE.test(l)) {
           line = i + 1
-          col = l.length
+          col = 0
           return true
         }
       })
@@ -177,7 +180,7 @@ describe('vue-loader', function () {
         column: col
       })
       expect(pos.source.indexOf('basic.vue') > -1)
-      expect(pos.line).to.equal(9)
+      expect(pos.line).to.equal(13)
       done()
     })
   })
@@ -216,11 +219,11 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/inject.js'
     }, function (window) {
-      var module = window.injector({
+      var module = interopDefault(window.injector({
         './service': {
           msg: 'Hello from mocked service!'
         }
-      })
+      }))
       assertRenderFn(module, '<div class="msg">{{ msg }}</div>')
       expect(module.data().msg).to.contain('Hello from mocked service!')
       done()
@@ -241,8 +244,7 @@ describe('vue-loader', function () {
           { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
         ]
       }
-    }, function (window) {
-      var module = window.vueModule
+    }, function (window, module) {
       assertRenderFn(module, '<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('html { background-image: url(logo.c9e00e.png);\n}')

From bf0c84df4635fa946fd72100e1f027db7a09baa6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 28 Jun 2016 16:26:21 -0400
Subject: [PATCH 309/877] 9.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 59b161dc0..8155d9241 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.0.3",
+  "version": "9.1.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 6fb5b70329c9ac5efe0418a46807ed580453fd5a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 28 Jun 2016 16:53:40 -0400
Subject: [PATCH 310/877] add functional warning

---
 lib/loader.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/loader.js b/lib/loader.js
index 7bcc9d5b1..d34e5ea05 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -210,6 +210,15 @@ module.exports = function (content) {
         '  }\n' +
         '})()}\n'
     }
+    // check functional
+    if (!isProduction) {
+      output +=
+        'if (__vue_options__.functional) {console.error("' +
+          '[vue-loader] ' + fileName + ': functional components are not ' +
+          'supported and should be defined in plain js files using render ' +
+          'functions.' +
+        '")}\n'
+    }
     // final export
     output += '\nmodule.exports = __vue_exports__ || __vue_options__\n'
   } else {

From 29ca95e789e502cb23b9dc64e5594b637e743ccb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 28 Jun 2016 16:53:42 -0400
Subject: [PATCH 311/877] 9.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8155d9241..ef5cbd6cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.1.0",
+  "version": "9.1.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 0effe8e69a19132a69229bdaabd4fff4ac615572 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 29 Jun 2016 22:34:26 -0400
Subject: [PATCH 312/877] add scopeId as long as there is scoped CSS

---
 lib/loader.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index d34e5ea05..f6e37b2bd 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -180,10 +180,11 @@ module.exports = function (content) {
     exports +=
       '__vue_options__.render = __vue_template__.render\n' +
       '__vue_options__.staticRenderFns = __vue_template__.staticRenderFns\n'
-    // attach scoped id
-    if (hasScoped) {
-      exports += '__vue_options__._scopeId = "' + moduleId + '"\n'
-    }
+  }
+
+  // attach scoped id
+  if (hasScoped) {
+    exports += '__vue_options__._scopeId = "' + moduleId + '"\n'
   }
 
   if (!query.inject) {

From 635560f27a54b86e6c20f0a880e873a366f8bfbd Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 30 Jun 2016 10:19:17 -0400
Subject: [PATCH 313/877] 9.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ef5cbd6cd..b3b4ffbcb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.1.1",
+  "version": "9.1.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 4acd55379f154ea4d9cfd892b35f22d0a79d2dcb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 10 Jul 2016 17:14:03 -0400
Subject: [PATCH 314/877] avoid including hot-reload code for server build (fix
 #280)

---
 lib/template-compiler.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index e4262b0d7..30d2b52c1 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -29,6 +29,7 @@ function rewrite (attr) {
 
 module.exports = function (html) {
   this.cacheable()
+  var isServer = this.options.target === 'node'
   var compiled = compiler.compile(html, options)
   var code
   if (compiled.errors.length) {
@@ -44,7 +45,8 @@ module.exports = function (html) {
     '}'
   }
   // hot-reload
-  if (!this.minimize &&
+  if (!isServer &&
+      !this.minimize &&
       process.env.NODE_ENV !== 'production') {
     var moduleId = loaderUtils.parseQuery(this.query).id
     code +=

From 08e0cbb6c8cf96621ae036b8ca50cc8702c47c64 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 10 Jul 2016 17:14:08 -0400
Subject: [PATCH 315/877] 9.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b3b4ffbcb..38eb2d95c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.1.2",
+  "version": "9.1.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 269e93ff41f33d2f7ef3e61623d714fb21dd6bd0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Jul 2016 19:07:47 -0400
Subject: [PATCH 316/877] beautify compiled render functions

---
 lib/template-compiler.js | 5 ++++-
 package.json             | 1 +
 test/test.js             | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 30d2b52c1..7aa91a50c 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -1,5 +1,6 @@
 var compiler = require('vue-template-compiler')
 var loaderUtils = require('loader-utils')
+var beautify = require('js-beautify').js_beautify
 var normalize = require('./normalize')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
@@ -61,5 +62,7 @@ module.exports = function (html) {
 }
 
 function toFunction (code) {
-  return 'function(){' + code + '}'
+  return 'function(){' +
+    beautify(code, { indent_size: 2 }) +
+  '}'
 }
diff --git a/package.json b/package.json
index 38eb2d95c..f28d38df0 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
   "dependencies": {
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
+    "js-beautify": "^1.6.3",
     "loader-utils": "^0.2.10",
     "lru-cache": "^4.0.1",
     "object-assign": "^4.0.0",
diff --git a/test/test.js b/test/test.js
index 62f9b7043..d9fc6477e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -10,6 +10,7 @@ var genId = require('../lib/gen-id')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('vue-template-compiler')
+var beautify = require('js-beautify').js_beautify
 
 var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
 var mfs = new MemoryFS()
@@ -62,7 +63,9 @@ function test (options, assert) {
 
 function assertRenderFn (options, template) {
   var compiled = compiler.compile(template)
-  expect(options.render.toString()).to.equal('function (){' + compiled.render + '}')
+  expect(options.render.toString().replace(/\t/g, '')).to.equal('function (){' +
+    beautify(compiled.render, { indent_size: 2 }) +
+  '}')
 }
 
 function interopDefault (module) {

From 91133701ad924e10d48069ba2ab6886533b904f6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Jul 2016 19:07:58 -0400
Subject: [PATCH 317/877] 9.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f28d38df0..5315e5aa9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.1.3",
+  "version": "9.2.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 7a439c8a1c7140a3cc7ca5113dccc76aa8ce4239 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 27 Jul 2016 19:15:04 -0400
Subject: [PATCH 318/877] support webpack 2.0 (no __esModules)

---
 lib/loader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index f6e37b2bd..68489be5d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -163,7 +163,8 @@ module.exports = function (content) {
   var exports =
     '__vue_options__ = __vue_exports__ || {}\n' +
     // ES6 modules interop
-    'if (__vue_options__.__esModule) __vue_options__ = __vue_options__.default\n' +
+    'if (__vue_options__.__esModule || typeof __vue_options__.default === "object")\n' +
+      '__vue_options__ = __vue_options__.default\n' +
     // constructor export interop
     'if (typeof __vue_options__ === "function") __vue_options__ = __vue_options__.options\n'
 

From 73fcd8cf6b38b3ffdae0bbd8669c01b6844439e6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 27 Jul 2016 19:15:08 -0400
Subject: [PATCH 319/877] 9.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5315e5aa9..99875977f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From bf381e6f58a75cd06be364df567f29e69ceab8ef Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jul 2016 09:08:35 -0400
Subject: [PATCH 320/877] fix webpack 2 compat

---
 lib/loader.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 68489be5d..c4983f050 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -163,10 +163,17 @@ module.exports = function (content) {
   var exports =
     '__vue_options__ = __vue_exports__ || {}\n' +
     // ES6 modules interop
-    'if (__vue_options__.__esModule || typeof __vue_options__.default === "object")\n' +
-      '__vue_options__ = __vue_options__.default\n' +
+    'if (__vue_options__.__esModule) {\n' +
+    '  __vue_options__ = __vue_options__.default\n' +
+    // Webpack 2 interop
+    '} else if (typeof __vue_options__.default === "object") {\n' +
+    '  __vue_options__ = __vue_options__.default\n' +
+    '  __vue_exports__.__esModule = true\n' +
+    '}\n' +
     // constructor export interop
-    'if (typeof __vue_options__ === "function") __vue_options__ = __vue_options__.options\n'
+    'if (typeof __vue_options__ === "function") {\n' +
+    '  __vue_options__ = __vue_options__.options\n' +
+    '}\n'
 
   // add require for template
   var template = parts.template

From b954d589638658681eb5a4606a95ce8688de43cc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jul 2016 09:08:42 -0400
Subject: [PATCH 321/877] 9.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 99875977f..61c0c4989 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From edebe815a4d849f8c40a0f2dcfea45ef1ac95997 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jul 2016 15:57:55 -0400
Subject: [PATCH 322/877] ensure esModule export for files without <script>

---
 lib/loader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index c4983f050..42c31f4df 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -161,7 +161,8 @@ module.exports = function (content) {
   }
 
   var exports =
-    '__vue_options__ = __vue_exports__ || {}\n' +
+    '__vue_options__ = __vue_exports__ = ' +
+      '__vue_exports__ || { default: {}, __esModule: true }\n' +
     // ES6 modules interop
     'if (__vue_options__.__esModule) {\n' +
     '  __vue_options__ = __vue_options__.default\n' +

From 0b77668bf1c8e486ba4c6cfd0e602273965911a1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 28 Jul 2016 15:57:59 -0400
Subject: [PATCH 323/877] 9.2.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 61c0c4989..cf7375975 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.2.2",
+  "version": "9.2.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 83f161930b6517e3c5150576fa7e7e2b2ca42b6e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 30 Jul 2016 22:30:16 -0400
Subject: [PATCH 324/877] revert named exports support due to module format
 complexity

---
 lib/loader.js           | 16 ++++++----------
 test/fixtures/basic.vue |  4 ----
 test/test.js            |  4 +---
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 42c31f4df..b6bd5d57e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -161,15 +161,11 @@ module.exports = function (content) {
   }
 
   var exports =
-    '__vue_options__ = __vue_exports__ = ' +
-      '__vue_exports__ || { default: {}, __esModule: true }\n' +
+    '__vue_options__ = __vue_exports__ = __vue_exports__ || {}\n' +
     // ES6 modules interop
-    'if (__vue_options__.__esModule) {\n' +
-    '  __vue_options__ = __vue_options__.default\n' +
-    // Webpack 2 interop
-    '} else if (typeof __vue_options__.default === "object") {\n' +
-    '  __vue_options__ = __vue_options__.default\n' +
-    '  __vue_exports__.__esModule = true\n' +
+    'if (typeof __vue_exports__.default === "object") {\n' +
+      (isProduction ? '' : 'if (Object.keys(__vue_exports__).length > 1) console.error("[vue-loader]: named exports are not supported.")\n') +
+      '__vue_options__ = __vue_exports__ = __vue_exports__.default\n' +
     '}\n' +
     // constructor export interop
     'if (typeof __vue_options__ === "function") {\n' +
@@ -230,7 +226,7 @@ module.exports = function (content) {
         '")}\n'
     }
     // final export
-    output += '\nmodule.exports = __vue_exports__ || __vue_options__\n'
+    output += '\nmodule.exports = __vue_exports__\n'
   } else {
     // inject-loader support
     output +=
@@ -238,7 +234,7 @@ module.exports = function (content) {
       'module.exports = function (injections) {\n' +
       '  __vue_exports__ = __vue_exports__(injections)\n' +
       exports +
-      '  return __vue_exports__ || __vue_options__\n' +
+      '  return __vue_exports__\n' +
       '}'
   }
 
diff --git a/test/fixtures/basic.vue b/test/fixtures/basic.vue
index 96f47a6b7..5dce8c774 100644
--- a/test/fixtures/basic.vue
+++ b/test/fixtures/basic.vue
@@ -3,10 +3,6 @@
 </template>
 
 <script>
-export function test () {
-  return 'hi'
-}
-
 export default {
   data () {
     return {
diff --git a/test/test.js b/test/test.js
index d9fc6477e..6608bb290 100644
--- a/test/test.js
+++ b/test/test.js
@@ -79,8 +79,6 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue'
     }, function (window, module, rawModule) {
-      // test named export
-      expect(rawModule.test()).to.equal('hi')
       assertRenderFn(module, '<h2 class="red">{{msg}}</h2>')
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
@@ -183,7 +181,7 @@ describe('vue-loader', function () {
         column: col
       })
       expect(pos.source.indexOf('basic.vue') > -1)
-      expect(pos.line).to.equal(13)
+      expect(pos.line).to.equal(9)
       done()
     })
   })

From edfc740fd338273ac458f4839966d8356894a1af Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 30 Jul 2016 22:30:24 -0400
Subject: [PATCH 325/877] 9.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cf7375975..774d10906 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.2.3",
+  "version": "9.3.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From cf4b53ac2990ce669a3986ab14ddcaa5cae2937e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 30 Jul 2016 22:41:58 -0400
Subject: [PATCH 326/877] more robust named exports check (fix for loose mode)

---
 lib/loader.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index b6bd5d57e..3f93e3f0a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -30,6 +30,10 @@ var defaultLang = {
   script: 'js'
 }
 
+var checkNamedExports =
+  'if (Object.keys(__vue_exports__).some(function (key) { return key !== "default" && key !== "__esModule" })) {' +
+  'console.error("named exports are not supported in *.vue files.")}\n'
+
 module.exports = function (content) {
   this.cacheable()
   var isServer = this.options.target === 'node'
@@ -164,7 +168,7 @@ module.exports = function (content) {
     '__vue_options__ = __vue_exports__ = __vue_exports__ || {}\n' +
     // ES6 modules interop
     'if (typeof __vue_exports__.default === "object") {\n' +
-      (isProduction ? '' : 'if (Object.keys(__vue_exports__).length > 1) console.error("[vue-loader]: named exports are not supported.")\n') +
+      (isProduction ? '' : checkNamedExports) +
       '__vue_options__ = __vue_exports__ = __vue_exports__.default\n' +
     '}\n' +
     // constructor export interop

From e12440be72f19bdcc42a3f6e6b4582713f11fb93 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 30 Jul 2016 22:42:03 -0400
Subject: [PATCH 327/877] 9.3.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 774d10906..4922d8a2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.3.0",
+  "version": "9.3.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 66c244d09be26113b491af2189b50c680c16b2ec Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 3 Aug 2016 19:53:23 -0400
Subject: [PATCH 328/877] fix img src resolution with compiler beta.6

---
 lib/template-compiler.js | 13 +++++++++----
 package.json             |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 7aa91a50c..db872fded 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -9,7 +9,7 @@ var options = {
   modules: [{
     postTransformNode (el) {
       if (el.tag === 'img') {
-        el.staticAttrs && el.staticAttrs.some(rewrite)
+        el.attrs && el.attrs.some(rewrite)
       }
     }
   }]
@@ -17,12 +17,17 @@ var options = {
 
 function rewrite (attr) {
   if (attr.name === 'src') {
-    var firstChar = attr.value.charAt(1)
+    var value = attr.value
+    var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
+    if (!isStatic) {
+      return
+    }
+    var firstChar = value.charAt(1)
     if (firstChar === '.' || firstChar === '~') {
       if (firstChar === '~') {
-        attr.value = '"' + attr.value.slice(2)
+        value = '"' + value.slice(2)
       }
-      attr.value = `require(${attr.value})`
+      attr.value = `require(${value})`
     }
     return true
   }
diff --git a/package.json b/package.json
index 4922d8a2c..02e5e7a3a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.0-alpha.8"
+    "vue-template-compiler": "^2.0.0-beta.6"
   },
   "peerDependencies": {
     "css-loader": "^0.23.1"

From a8f3468056aa27788ebed4c459e1c8d8864236bf Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 3 Aug 2016 19:53:35 -0400
Subject: [PATCH 329/877] 9.3.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 02e5e7a3a..b4b18debd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.3.1",
+  "version": "9.3.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From c261e0a8658c442ca92292c3ba3f0535d219f09c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 16 Aug 2016 14:46:38 -0400
Subject: [PATCH 330/877] support babel transpile in template render function

---
 lib/loader.js            |   2 +-
 lib/template-compiler.js |  42 +++++++++++---
 test/fixtures/babel.vue  |   3 +
 test/test.js             | 115 ++++++++++++++++++++++++++++++---------
 4 files changed, 126 insertions(+), 36 deletions(-)
 create mode 100644 test/fixtures/babel.vue

diff --git a/lib/loader.js b/lib/loader.js
index 3f93e3f0a..799cd9e31 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -53,7 +53,7 @@ module.exports = function (content) {
     options.cssSourceMap !== false
 
   var defaultLoaders = {
-    html: templateCompilerPath + '?id=' + moduleId,
+    html: templateCompilerPath + '?id=' + moduleId + (hasBabel ? '&babel=true' : ''),
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
     js: hasBabel ? 'babel-loader' : ''
   }
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index db872fded..3aa531bdb 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -35,6 +35,7 @@ function rewrite (attr) {
 
 module.exports = function (html) {
   this.cacheable()
+  var query = loaderUtils.parseQuery(this.query)
   var isServer = this.options.target === 'node'
   var compiled = compiler.compile(html, options)
   var code
@@ -46,28 +47,53 @@ module.exports = function (html) {
     code = 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
     code = 'module.exports={' +
-      'render:' + toFunction(compiled.render) + ',' +
-      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+      'render:' + toFunction(compiled.render, query.babel) + ',' +
+      'staticRenderFns: [' + compiled.staticRenderFns.map(function (code) {
+        return toFunction(code, query.babel)
+      }).join(',') + ']' +
     '}'
+
+    if (query.babel) {
+      var babelOptions = {
+        filename: require('path').basename(this.resourcePath),
+        sourceRoot: process.cwd(),
+        babelrc: true
+      }
+      if (this.options.babel) {
+        for (var key in this.options.babel) {
+          babelOptions[key] = this.options.babel[key]
+        }
+      }
+      code = transpile(code, babelOptions)
+    }
   }
   // hot-reload
   if (!isServer &&
       !this.minimize &&
       process.env.NODE_ENV !== 'production') {
-    var moduleId = loaderUtils.parseQuery(this.query).id
     code +=
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("' + hotReloadAPIPath + '").rerender("' + moduleId + '", module.exports)\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + query.id + '", module.exports)\n' +
       '  }\n' +
       '}'
   }
   return code
 }
 
-function toFunction (code) {
-  return 'function(){' +
-    beautify(code, { indent_size: 2 }) +
-  '}'
+function transpile (code, options) {
+  return require('babel-core').transform(code, options).code
+    // strip use strict
+    .replace(/['"]use strict['"];?\n?/, '')
+    // add back with
+    .replace(/if\s*\("__VUE_LOADER_WITH__"\)/g, 'with(this)')
+}
+
+function toFunction (code, needBabel) {
+  if (needBabel) {
+    // replace "with(this){" with something that works in strict mode
+    code = code.replace(/with\(this\)/, 'if("__VUE_LOADER_WITH__")')
+  }
+  return 'function (){' + beautify(code, { indent_size: 2 }) + '}'
 }
diff --git a/test/fixtures/babel.vue b/test/fixtures/babel.vue
new file mode 100644
index 000000000..899f8d725
--- /dev/null
+++ b/test/fixtures/babel.vue
@@ -0,0 +1,3 @@
+<template>
+  <div :class="{[a]:true}"></div>
+</template>
diff --git a/test/test.js b/test/test.js
index 6608bb290..7b8572f58 100644
--- a/test/test.js
+++ b/test/test.js
@@ -9,8 +9,7 @@ var rimraf = require('rimraf')
 var genId = require('../lib/gen-id')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
-var compiler = require('vue-template-compiler')
-var beautify = require('js-beautify').js_beautify
+var compiler = require('../lib/template-compiler')
 
 var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
 var mfs = new MemoryFS()
@@ -61,11 +60,26 @@ function test (options, assert) {
   })
 }
 
-function assertRenderFn (options, template) {
-  var compiled = compiler.compile(template)
-  expect(options.render.toString().replace(/\t/g, '')).to.equal('function (){' +
-    beautify(compiled.render, { indent_size: 2 }) +
-  '}')
+function mockRender (options, data) {
+  return options.render.call(Object.assign({
+    _h (tag, data, children) {
+      if (Array.isArray(data)) {
+        children = data
+        data = null
+      }
+      return {
+        tag: tag,
+        data: data,
+        children: children
+      }
+    },
+    _m (index) {
+      return options.staticRenderFns[index].call(this)
+    },
+    _s (str) {
+      return String(str)
+    }
+  }, data))
 }
 
 function interopDefault (module) {
@@ -79,7 +93,14 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue'
     }, function (window, module, rawModule) {
-      assertRenderFn(module, '<h2 class="red">{{msg}}</h2>')
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      // <h2 class="red">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('red')
+      expect(vnode.children[0]).to.equal('hi')
+
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
@@ -91,13 +112,15 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/pre.vue'
     }, function (window, module) {
-      assertRenderFn(module,
-        '<div>' +
-          '<h1>This is the app</h1>' +
-          '<comp-a></comp-a>' +
-          '<comp-b></comp-b>' +
-        '</div>'
-      )
+      var vnode = mockRender(module)
+      // div
+      //   h1 This is the app
+      //   comp-a
+      //   comp-b
+      expect(vnode.children[0].tag).to.equal('h1')
+      expect(vnode.children[1].tag).to.equal('comp-a')
+      expect(vnode.children[2].tag).to.equal('comp-b')
+
       expect(module.data().msg).to.contain('Hello from coffee!')
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
@@ -111,14 +134,23 @@ describe('vue-loader', function () {
     }, function (window, module) {
       var id = 'data-v-' + genId(require.resolve('./fixtures/scoped-css.vue'))
       expect(module._scopeId).to.equal(id)
-      assertRenderFn(module,
-        '<div>' +
-          '<div><h1>hi</h1></div>\n' +
-          '<p class="abc def">hi</p>\n' +
-          '<template v-if="ok"><p class="test">yo</p></template>\n' +
-          '<svg><template><p></p></template></svg>' +
-        '</div>'
-      )
+
+      var vnode = mockRender(module, {
+        ok: true
+      })
+      // <div>
+      //   <div><h1>hi</h1></div>
+      //   <p class="abc def">hi</p>
+      //   <template v-if="ok"><p class="test">yo</p></template>
+      //   <svg><template><p></p></template></svg>
+      // </div>
+      expect(vnode.children[0].tag).to.equal('div')
+      expect(vnode.children[1]).to.equal(' ')
+      expect(vnode.children[2].tag).to.equal('p')
+      expect(vnode.children[2].data.staticClass).to.equal('abc def')
+      expect(vnode.children[4][0].tag).to.equal('p')
+      expect(vnode.children[4][0].data.staticClass).to.equal('test')
+
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
       expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
@@ -144,7 +176,10 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/template-import.vue'
     }, function (window, module) {
-      assertRenderFn(module, '<div><h1>hello</h1></div>')
+      var vnode = mockRender(module)
+      // '<div><h1>hello</h1></div>'
+      expect(vnode.children[0].tag).to.equal('h1')
+      expect(vnode.children[0].children[0]).to.equal('hello')
       done()
     })
   })
@@ -225,8 +260,11 @@ describe('vue-loader', function () {
           msg: 'Hello from mocked service!'
         }
       }))
-      assertRenderFn(module, '<div class="msg">{{ msg }}</div>')
-      expect(module.data().msg).to.contain('Hello from mocked service!')
+      var vnode = mockRender(module, module.data())
+      // <div class="msg">{{ msg }}</div>
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.data.staticClass).to.equal('msg')
+      expect(vnode.children[0]).to.equal('Hello from mocked service!')
       done()
     })
   })
@@ -246,7 +284,16 @@ describe('vue-loader', function () {
         ]
       }
     }, function (window, module) {
-      assertRenderFn(module, '<img src="logo.c9e00e.png">\n<img src="logo.c9e00e.png">')
+      var vnode = mockRender(module)
+      // <div>
+      //   <img src="logo.c9e00e.png">
+      //   <img src="logo.c9e00e.png">
+      // </div>
+      expect(vnode.children[0].tag).to.equal('img')
+      expect(vnode.children[0].data.attrs.src).to.equal('logo.c9e00e.png')
+      expect(vnode.children[2].tag).to.equal('img')
+      expect(vnode.children[2].data.attrs.src).to.equal('logo.c9e00e.png')
+
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('html { background-image: url(logo.c9e00e.png);\n}')
       expect(style).to.contain('body { background-image: url(logo.c9e00e.png);\n}')
@@ -270,4 +317,18 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('transpile template with babel', function (done) {
+    test({
+      entry: './test/fixtures/babel.vue'
+    }, function (window, module) {
+      var vnode = mockRender(module, {
+        a: 'hello'
+      })
+      // <div :class="{[a]:true}"></div>
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.data.class.hello).to.equal(true)
+      done()
+    })
+  })
 })

From 3b1558a2f36561cd9efb85ca60f4657d7169a0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E9=93=84=E8=BF=90?= <fnlctrl@gmail.com>
Date: Thu, 18 Aug 2016 00:48:04 +0800
Subject: [PATCH 331/877] =?UTF-8?q?Add=20ability=20to=20set=20`transformTo?=
 =?UTF-8?q?Require`=20option=20under=20`vue`=20in=20webpack=E2=80=A6=20(#3?=
 =?UTF-8?q?16)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add ability to set `transformToRequire` option under `vue` in webpack config,
This provides the missing feature from html-loader to specify which tag-attribute combination to be transformed to `require()`.

`transformToRequire` Defaults to {img: 'src'}.

Example usage: (in webpack.config.js)
```javascript
vue: {
  transformToRequire: {
    foo: 'bar'
  }
}
``
will transform ``<foo bar="..."/>`` to ``<foo bar="require(...)"/>``

* fix extra semi colon

* support array config for vue.transformToRequire

* remove trailing spaces
---
 lib/template-compiler.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 3aa531bdb..809b84d87 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -4,19 +4,30 @@ var beautify = require('js-beautify').js_beautify
 var normalize = require('./normalize')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
-// vue compiler module for using file-loader img src
+// vue compiler module for using transforming `<tag>:<attribute>` to `require`
+var defaultTransformToRequire = {
+  img: 'src'
+}
+var transformToRequire = Object.assign({}, defaultTransformToRequire)
 var options = {
   modules: [{
     postTransformNode (el) {
-      if (el.tag === 'img') {
-        el.attrs && el.attrs.some(rewrite)
+      for (var tag in transformToRequire) {
+        if (el.tag === tag && el.attrs) {
+          var attributes = transformToRequire[tag]
+          if (typeof attributes === 'string') {
+            el.attrs.some(attr => rewrite(attr, attributes))
+          } else if (Array.isArray(attributes)) {
+            attributes.forEach(item => el.attrs.some(attr => rewrite(attr, item)))
+          }
+        }
       }
     }
   }]
 }
 
-function rewrite (attr) {
-  if (attr.name === 'src') {
+function rewrite (attr, name) {
+  if (attr.name === name) {
     var value = attr.value
     var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
     if (!isStatic) {
@@ -37,6 +48,9 @@ module.exports = function (html) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var isServer = this.options.target === 'node'
+  if (this.options.vue && this.options.vue.transformToRequire) {
+    Object.assign(transformToRequire, this.options.vue.transformToRequire)
+  }
   var compiled = compiler.compile(html, options)
   var code
   if (compiled.errors.length) {

From 64859083d9a589419d041dcc065c4c2d0a38fe29 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 20 Aug 2016 13:52:17 -0400
Subject: [PATCH 332/877] support es2015 features in templates using buble

---
 lib/loader.js            |  2 +-
 lib/template-compiler.js | 39 ++++++---------------------------------
 package.json             |  3 ++-
 test/fixtures/babel.vue  |  3 ---
 test/fixtures/es2015.vue |  3 +++
 test/test.js             | 10 ++++++----
 6 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 test/fixtures/babel.vue
 create mode 100644 test/fixtures/es2015.vue

diff --git a/lib/loader.js b/lib/loader.js
index 799cd9e31..3f93e3f0a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -53,7 +53,7 @@ module.exports = function (content) {
     options.cssSourceMap !== false
 
   var defaultLoaders = {
-    html: templateCompilerPath + '?id=' + moduleId + (hasBabel ? '&babel=true' : ''),
+    html: templateCompilerPath + '?id=' + moduleId,
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
     js: hasBabel ? 'babel-loader' : ''
   }
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 3aa531bdb..8940d5593 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -1,4 +1,5 @@
 var compiler = require('vue-template-compiler')
+var transpile = require('vue-template-es2015-compiler')
 var loaderUtils = require('loader-utils')
 var beautify = require('js-beautify').js_beautify
 var normalize = require('./normalize')
@@ -46,26 +47,10 @@ module.exports = function (html) {
     })
     code = 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
-    code = 'module.exports={' +
-      'render:' + toFunction(compiled.render, query.babel) + ',' +
-      'staticRenderFns: [' + compiled.staticRenderFns.map(function (code) {
-        return toFunction(code, query.babel)
-      }).join(',') + ']' +
-    '}'
-
-    if (query.babel) {
-      var babelOptions = {
-        filename: require('path').basename(this.resourcePath),
-        sourceRoot: process.cwd(),
-        babelrc: true
-      }
-      if (this.options.babel) {
-        for (var key in this.options.babel) {
-          babelOptions[key] = this.options.babel[key]
-        }
-      }
-      code = transpile(code, babelOptions)
-    }
+    code = transpile('module.exports={' +
+      'render:' + toFunction(compiled.render) + ',' +
+      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+    '}')
   }
   // hot-reload
   if (!isServer &&
@@ -82,18 +67,6 @@ module.exports = function (html) {
   return code
 }
 
-function transpile (code, options) {
-  return require('babel-core').transform(code, options).code
-    // strip use strict
-    .replace(/['"]use strict['"];?\n?/, '')
-    // add back with
-    .replace(/if\s*\("__VUE_LOADER_WITH__"\)/g, 'with(this)')
-}
-
-function toFunction (code, needBabel) {
-  if (needBabel) {
-    // replace "with(this){" with something that works in strict mode
-    code = code.replace(/with\(this\)/, 'if("__VUE_LOADER_WITH__")')
-  }
+function toFunction (code) {
   return 'function (){' + beautify(code, { indent_size: 2 }) + '}'
 }
diff --git a/package.json b/package.json
index b4b18debd..58dfce1d2 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,8 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.0-beta.6"
+    "vue-template-compiler": "^2.0.0-rc.2",
+    "vue-template-es2015-compiler": "^1.0.0"
   },
   "peerDependencies": {
     "css-loader": "^0.23.1"
diff --git a/test/fixtures/babel.vue b/test/fixtures/babel.vue
deleted file mode 100644
index 899f8d725..000000000
--- a/test/fixtures/babel.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div :class="{[a]:true}"></div>
-</template>
diff --git a/test/fixtures/es2015.vue b/test/fixtures/es2015.vue
new file mode 100644
index 000000000..5b2cb1ba5
--- /dev/null
+++ b/test/fixtures/es2015.vue
@@ -0,0 +1,3 @@
+<template>
+  <div :class="{ [`test-${a}`]: true, b }"></div>
+</template>
diff --git a/test/test.js b/test/test.js
index 7b8572f58..4d16cbe0e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -318,16 +318,18 @@ describe('vue-loader', function () {
     })
   })
 
-  it('transpile template with babel', function (done) {
+  it('transpile ES2015 features in template', function (done) {
     test({
-      entry: './test/fixtures/babel.vue'
+      entry: './test/fixtures/es2015.vue'
     }, function (window, module) {
       var vnode = mockRender(module, {
-        a: 'hello'
+        a: 'hello',
+        b: true
       })
       // <div :class="{[a]:true}"></div>
       expect(vnode.tag).to.equal('div')
-      expect(vnode.data.class.hello).to.equal(true)
+      expect(vnode.data.class['test-hello']).to.equal(true)
+      expect(vnode.data.class['b']).to.equal(true)
       done()
     })
   })

From fdfa7b8db859bd4a98e4908187cb6fb0dd54f2a4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 22 Aug 2016 03:05:25 +0200
Subject: [PATCH 333/877] bump dep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58dfce1d2..72a513192 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.0-rc.2",
+    "vue-template-compiler": "^2.0.0-rc.3",
     "vue-template-es2015-compiler": "^1.0.0"
   },
   "peerDependencies": {

From 1f64dbf6f8273816e15ed34e6a4254a8b0653d6f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 22 Aug 2016 03:05:32 +0200
Subject: [PATCH 334/877] 9.4.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72a513192..b650293a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.3.2",
+  "version": "9.4.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From fac98993d57fcdcfeab5d2f5ee81d43087595004 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 Aug 2016 17:04:17 -0400
Subject: [PATCH 335/877] auto pick up buble-loader if it is present

---
 lib/loader.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 3f93e3f0a..a098bf8ed 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -15,12 +15,15 @@ var styleRewriterPath = normalize.lib('style-rewriter')
 var styleLoaderPath = normalize.dep('vue-style-loader')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
-var hasBabel = true
+var hasBabel = false
 try {
-  require('babel-loader')
-} catch (e) {
-  hasBabel = false
-}
+  hasBabel = !!require('babel-loader')
+} catch (e) {}
+
+var hasBuble = false
+try {
+  hasBuble = !!require('buble-loader')
+} catch (e) {}
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
@@ -55,7 +58,7 @@ module.exports = function (content) {
   var defaultLoaders = {
     html: templateCompilerPath + '?id=' + moduleId,
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
-    js: hasBabel ? 'babel-loader' : ''
+    js: hasBuble ? 'buble-loader' : hasBabel ? 'babel-loader' : ''
   }
 
   // check if there are custom loaders specified via

From 41a64e2cd293166c13b6088d734a9ee02cc5c0c1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 Aug 2016 17:04:32 -0400
Subject: [PATCH 336/877] 9.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b650293a9..63ac62692 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.4.0",
+  "version": "9.4.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From df3b03e84d4caf90968a2ef061ee969684dac469 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 Aug 2016 15:32:23 -0400
Subject: [PATCH 337/877] relax css-loader peerdep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63ac62692..4f9b2a357 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "vue-template-es2015-compiler": "^1.0.0"
   },
   "peerDependencies": {
-    "css-loader": "^0.23.1"
+    "css-loader": "*"
   },
   "devDependencies": {
     "babel-core": "^6.8.0",

From 7828b413421d80906e0860c208a99ffb4f667045 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 Aug 2016 15:32:42 -0400
Subject: [PATCH 338/877] 9.4.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4f9b2a357..3850f2194 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.4.1",
+  "version": "9.4.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 07bf51805389650a953dfc289b748c8a5810c7fa Mon Sep 17 00:00:00 2001
From: katashin <ktsn55@gmail.com>
Date: Thu, 8 Sep 2016 16:06:45 +0900
Subject: [PATCH 339/877] allow to export constructor even if using es6 default
 export (#341)

* allow to export constructor even if using es6 default export

* add test for `export default Vue.extend`

* test instance data of exported constructor
---
 lib/loader.js            |  5 ++++-
 package.json             |  1 +
 test/fixtures/extend.vue | 12 ++++++++++++
 test/test.js             | 15 +++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/extend.vue

diff --git a/lib/loader.js b/lib/loader.js
index a098bf8ed..196d8307d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -170,7 +170,10 @@ module.exports = function (content) {
   var exports =
     '__vue_options__ = __vue_exports__ = __vue_exports__ || {}\n' +
     // ES6 modules interop
-    'if (typeof __vue_exports__.default === "object") {\n' +
+    'if (\n' +
+    '  typeof __vue_exports__.default === "object" ||\n' +
+    '  typeof __vue_exports__.default === "function"\n' +
+    ') {\n' +
       (isProduction ? '' : checkNamedExports) +
       '__vue_options__ = __vue_exports__ = __vue_exports__.default\n' +
     '}\n' +
diff --git a/package.json b/package.json
index 3850f2194..e10a01810 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.1.3",
+    "vue": "^2.0.0-rc.4",
     "webpack": "^1.12.2"
   }
 }
diff --git a/test/fixtures/extend.vue b/test/fixtures/extend.vue
new file mode 100644
index 000000000..ca11dfe65
--- /dev/null
+++ b/test/fixtures/extend.vue
@@ -0,0 +1,12 @@
+<template>
+  <div>{{ msg }}</div>
+</template>
+
+<script>
+import Vue from 'vue'
+export default Vue.extend({
+  data () {
+    return { msg: 'success' }
+  }
+})
+</script>
diff --git a/test/test.js b/test/test.js
index 4d16cbe0e..abe47a253 100644
--- a/test/test.js
+++ b/test/test.js
@@ -333,4 +333,19 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('allows to export extended constructor', function (done) {
+    test({
+      entry: './test/fixtures/extend.vue'
+    }, function (window, Module) {
+      // extend.vue should export Vue constructor
+      var vnode = mockRender(Module.options, {
+        msg: 'success'
+      })
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.children[0]).to.equal('success')
+      expect(new Module().msg === 'success')
+      done()
+    })
+  })
 })

From cd74def6a49f5ca03942a2737c5d32e5ab049b32 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 13 Sep 2016 15:29:19 -0400
Subject: [PATCH 340/877] fix eslint plugin dep

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e10a01810..595cd6c36 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "css-loader": "^0.23.1",
     "eslint": "^2.9.0",
     "eslint-config-vue": "^1.0.0",
+    "eslint-plugin-html": "^1.5.2",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",

From 9ce2eee790167a96d208cbb68fcc5b2950768d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?=
 <HerringtonDarkholme@users.noreply.github.com>
Date: Wed, 14 Sep 2016 11:14:43 -0500
Subject: [PATCH 341/877] add esModule support (#349)

* add alternative module exports

* add esModule test and docs
---
 docs/en/options.md |  8 ++++++++
 lib/loader.js      |  6 +++++-
 test/test.js       | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index 61a1f2b47..d11e1eefd 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -73,3 +73,11 @@
 - type: `Object`
 
   Pass options to the template rendering engine (via [consolidate](https://github.com/tj/consolidate.js)) if you are using a non-html templating language.
+
+### esModule
+
+- ^9.4.3
+- type: `Boolean`
+- default: `undefined`
+
+  Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Bable, like TypeScript.
diff --git a/lib/loader.js b/lib/loader.js
index 196d8307d..abd3d7ba0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -236,7 +236,11 @@ module.exports = function (content) {
         '")}\n'
     }
     // final export
-    output += '\nmodule.exports = __vue_exports__\n'
+    if (options.esModule) {
+      output += '\nexports.__esModule = true;\nexports["default"] = __vue_exports__\n'
+    } else {
+      output += '\nmodule.exports = __vue_exports__\n'
+    }
   } else {
     // inject-loader support
     output +=
diff --git a/test/test.js b/test/test.js
index abe47a253..056599c18 100644
--- a/test/test.js
+++ b/test/test.js
@@ -348,4 +348,24 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('support es compatible modules', function (done) {
+    test({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        esModule: true
+      }
+    }, function (window, module, rawModule) {
+      expect(rawModule.__esModule).to.equal(true)
+      var vnode = mockRender(rawModule.default, {
+        msg: 'hi'
+      })
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('red')
+      expect(vnode.children[0]).to.equal('hi')
+
+      expect(rawModule.default.data().msg).to.contain('Hello from Component A!')
+      done()
+    })
+  })
 })

From 9d9accce8ac675eeec6e5b24fe731f76a2a945bb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Sep 2016 23:17:12 -0400
Subject: [PATCH 342/877] webpack 2 options interop

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index abd3d7ba0..40424fbf9 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -41,7 +41,7 @@ module.exports = function (content) {
   this.cacheable()
   var isServer = this.options.target === 'node'
   var loaderContext = this
-  var options = this.options.vue || {}
+  var options = this.vue || this.options.vue || {}
   var query = loaderUtils.parseQuery(this.query)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)

From bae8d2920753d4c74a42d3ffb0e935ea3e5d4825 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Sep 2016 23:17:20 -0400
Subject: [PATCH 343/877] 9.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 595cd6c36..2421d4974 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.4.2",
+  "version": "9.5.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 75a2b33cdf8c5d47f330ec07ab4460ca43c4106c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Sep 2016 19:21:50 -0400
Subject: [PATCH 344/877] fix vue options in template compiler and style
 rewriter

---
 lib/style-rewriter.js    | 2 +-
 lib/template-compiler.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 3702c90a5..886a46306 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -42,7 +42,7 @@ module.exports = function (css, map) {
   var cb = this.async()
 
   var query = loaderUtils.parseQuery(this.query)
-  var options = this.options.vue || {}
+  var options = this.vue || this.options.vue || {}
   var postcssOptions = options.postcss
 
   // postcss plugins
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index c704b509b..9bca81777 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -49,8 +49,9 @@ module.exports = function (html) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var isServer = this.options.target === 'node'
-  if (this.options.vue && this.options.vue.transformToRequire) {
-    Object.assign(transformToRequire, this.options.vue.transformToRequire)
+  var vueOptions = this.vue || this.options.vue || {}
+  if (vueOptions.transformToRequire) {
+    Object.assign(transformToRequire, vueOptions.transformToRequire)
   }
   var compiled = compiler.compile(html, options)
   var code

From 8462e55b0f3223dfb106dbcd7764b53bbb00e819 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Sep 2016 20:06:17 -0400
Subject: [PATCH 345/877] update docs and readme

---
 README.md                              |  17 ++-
 docs/en/SUMMARY.md                     |   6 +-
 docs/en/configurations/advanced.md     |  21 ++-
 docs/en/configurations/asset-url.md    |  45 ++----
 docs/en/configurations/extract-css.md  |  33 ++++-
 docs/en/features/es2015.md             |  71 +---------
 docs/en/features/hot-reload.md         |  37 +----
 docs/en/features/postcss.md            |  46 ++----
 docs/en/getting-started.md             | 176 -----------------------
 docs/en/options.md                     |  44 +++---
 docs/en/start/setup.md                 |  17 +++
 docs/en/start/tutorial.md              | 186 -------------------------
 docs/en/workflow/production.md         |   2 +-
 docs/en/workflow/testing-with-mocks.md |   2 -
 docs/en/workflow/testing.md            |   2 +
 15 files changed, 153 insertions(+), 552 deletions(-)
 delete mode 100644 docs/en/getting-started.md
 create mode 100644 docs/en/start/setup.md
 delete mode 100644 docs/en/start/tutorial.md

diff --git a/README.md b/README.md
index fab68c12c..c10c312aa 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,22 @@
 
 > Vue.js component loader for [Webpack](http://webpack.github.io).
 
+**NOTE: the master branch now hosts 9.x which only works with Vue 2.0. For version 8.x which works with Vue 1.x, see the [8.x branch](https://github.com/vuejs/vue-loader/tree/8.x).**
+
 It allows you to write your components in this format:
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
-For detailed usage, checkout the [documentation](http://vuejs.github.io/vue-loader/).
+The best way to get started is with [vue-cli](https://github.com/vuejs/vue-cli):
+
+``` js
+npm install -g vue-cli
+vue init webpack-simple hello
+cd hello
+npm install
+npm run dev
+```
 
-There are also some example projects:
+This will setup a basic Webpack + `vue-loader` project for you, with `*.vue` files and hot-reloading working out of the box!
 
-- [vue-loader-example](https://github.com/vuejs/vue-loader-example/)
-- [vue-hackernews](https://github.com/vuejs/vue-hackernews)
+For advanced `vue-loader` configuration, checkout the [documentation](http://vuejs.github.io/vue-loader/).
diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 1c4d10f64..50e9da249 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -1,10 +1,10 @@
 - Getting Started
   - [Vue Component Spec](start/spec.md)
-  - [Basic Tutorial](start/tutorial.md)
+  - [Setting Up a Project](start/setup.md)
 - Features
-  - [ES2015 and Babel](features/es2015.md)
+  - [ES2015](features/es2015.md)
   - [Scoped CSS](features/scoped-css.md)
-  - [PostCSS and Autoprefixer](features/postcss.md)
+  - [PostCSS](features/postcss.md)
   - [Hot Reload](features/hot-reload.md)
 - Configurations
   - [Pre-Processors](configurations/pre-processors.md)
diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 71e7984a4..1578a3133 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -2,7 +2,7 @@
 
 Sometimes you may want to apply a custom loader string to a language instead of letting `vue-loader` infer it. Or you may simply want to overwrite the built-in loader configuration for the default languages. To do that, add a `vue` block in your Webpack config file, and specify the `loaders` option.
 
-Example:
+Webpack 1.x Example:
 
 ``` js
 // webpack.config.js
@@ -30,4 +30,23 @@ module.exports = {
 }
 ```
 
+Webpack 2.x:
+
+``` js
+var webpack = require('webpack')
+
+module.exports = {
+  // ...
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      vue: {
+        loaders: {
+          // ...
+        }
+      }
+    })
+  ]
+}
+```
+
 A more practical usage of the advanced loader configuration is [extracting CSS inside components into a single file](./extract-css.md).
diff --git a/docs/en/configurations/asset-url.md b/docs/en/configurations/asset-url.md
index d6ba44b54..938e258fb 100644
--- a/docs/en/configurations/asset-url.md
+++ b/docs/en/configurations/asset-url.md
@@ -1,38 +1,23 @@
 # Asset URL Handling
 
-By default, `vue-loader` automatically processes your style and template files with [css-loader](https://github.com/webpack/css-loader) and [vue-html-loader](https://github.com/vuejs/vue-html-loader) (which is just a Vue-specific fork of [html-loader](https://github.com/webpack/html-loader)). What this means is that all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+By default, `vue-loader` automatically processes your style and template files with [css-loader](https://github.com/webpack/css-loader) and the Vue template compiler. In this compilation process, all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
 
-For example, `url(image.png)` will be translated into `require('./image.png')`. Because `.png` is not JavaScript, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. This may feel cumbersome, but it gives us some very powerful benefits by managing static assets this way:
+For example, `url(./image.png)` will be translated into `require('./image.png')`, and
 
-1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes. The best part though, is that you can use relative URLs based on the folder structure of your source files, and Webpack will auto-rewrite them into different URLs in the bundled files based on the configuration.
-
-2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.
-
-Here's an example Webpack config that handles `.png`, `jpg` and `.gif` files, and inlining any file smaller than 10kb as base64 data URL:
-
-``` bash
-npm install url-loader file-loader --save-dev
+``` html
+<img src="../image.png">
 ```
 
+will be compiled into:
+
 ``` js
-// webpack.config.js
-module.exports = {
-  // ... other options
-  module: {
-    loaders: [
-      // ... other loaders
-      {
-        test: /\.(png|jpg|gif)$/,
-        loader: 'url',
-        query: {
-          // limit for base64 inlining in bytes
-          limit: 10000,
-          // custom naming format if file is larger than
-          // the threshold
-          name: '[name].[ext]?[hash]'
-        }
-      }
-    ]
-  }
-}
+createElement('img', { attrs: { src: require('../image.png') }})
 ```
+
+Because `.png` is not a JavaScript file, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. The project scaffolded with `vue-cli` has also configured this for you.
+
+The benefits of all this are:
+
+1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreoever, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, Webpack will auto-rewrite the file paths into correct URLs in the bundled output.
+
+2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index 453e666a5..a48ccf163 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -2,13 +2,15 @@
 
 Example config to extract all the processed CSS in all Vue components into a single CSS file:
 
+### Webpack 1.x
+
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js
 // webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
   // other options...
@@ -32,3 +34,32 @@ module.exports = {
   ]
 }
 ```
+
+### Webpack 2.x
+
+``` bash
+npm install extract-text-webpack-plugin@2.x --save-dev
+```
+
+``` js
+// webpack.config.js
+var webpack = require('webpack')
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      vue: {
+        loaders: {
+          css: ExtractTextPlugin.extract({
+            loader: 'css-loader',
+            fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+          })
+        }
+      }
+    }),
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index dae2dd4f8..9ef7de272 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -1,6 +1,6 @@
-# ES2015 and Babel Configuration
+# ES2015
 
-`vue-loader` ships with ES2015 (aka ES6) enabled by default in `<script>` tags. All scripts inside Vue components are compiled with [Babel](https://babeljs.io/) using `babel-loader`. If you haven't picked up the new language features yet, you definitely should. Some good learning resources:
+When `vue-loader` detects the presence of `babel-loader` or `buble-loader` in the same project, it will use them to process the `<script>` parts of all `*.vue` files, allowing us to use ES2015 in our Vue components. If you haven't picked up the new language features yet, you definitely should. Some good learning resources:
 
 - [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
 - [ES6 Features](https://github.com/lukehoban/es6features)
@@ -24,69 +24,10 @@ export default {
 
 We are using ES2015's Object literal shorthand here to define the child components. `{ ComponentA }` is simply shorthand for `{ ComponentA: ComponentA }`. Vue will automatically convert the key to `component-a`, so you can use the imported component in the template as `<component-a>`.
 
-### Using Custom Babel Configuration
+### Traspiling Normal `.js` Files
 
-> **Compatibility Note**: `vue-loader` 7.0+ uses Babel 6. If you need to use Babel 5 for transpiling your code, use vue-loader 6.x.
+Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.
 
-The default Babel options used for scripts inside Vue components are:
+### Configuring Babel with `.babelrc`
 
-``` json
-{
-  "presets": ["es2015"],
-  "plugins": ["transform-runtime"]
-}
-```
-
-If you want to use custom presets or plugins, for example, to enable stage-0 language features, install the preset/plugin and then add a `babel` field in your Webpack config:
-
-``` bash
-npm install babel-preset-stage-0 --save-dev
-```
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other configs...
-  babel: {
-    // enable stage 0 babel transforms.
-    presets: ['es2015', 'stage-0'],
-    plugins: ['transform-runtime']
-  }
-}
-```
-
-Alternatively, you can add a `.babelrc` file at the root of your project.
-
-### Compiling `.js` Files with Babel
-
-Since we are already using Babel, most likely you'll want to compile your normal `.js` files too! Here's how to do it in your Webpack config:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other options ...
-  module: {
-    loaders: [
-      {
-        // use vue-loader for *.vue files
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-      {
-        // use babel-loader for *.js files
-        test: /\.js$/,
-        loader: 'babel',
-        // important: exclude files in node_modules
-        // otherwise it's going to be really slow!
-        exclude: /node_modules/
-      }
-    ]
-  },
-  // if you are using babel-loader directly then
-  // the babel config block becomes required.
-  babel: {
-    presets: ['es2015'],
-    plugins: ['transform-runtime']
-  }
-}
-```
+`babel-laoder` respects [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), so it is the recommended approach to configure the Babel presets and plugins.
diff --git a/docs/en/features/hot-reload.md b/docs/en/features/hot-reload.md
index 57672d606..6ce6f8389 100644
--- a/docs/en/features/hot-reload.md
+++ b/docs/en/features/hot-reload.md
@@ -4,39 +4,4 @@
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
-### Enabling Hot Reload
-
-The easiest setup for enabling hot reload is what we outlined in the [basic tutorial](../start/tutorial.md):
-
-``` js
-// package.json
-...
-"scripts": {
-  "dev": "webpack-dev-server --inline --hot"
-}
-...
-```
-
-This is assuming that you are serving the same `index.html` from the root of your project. By default, Webpack dev server uses the current working directory as its content base and serves all static files in the directory.
-
-Run `npm run dev` and the static app will be served at `http://localhost:8080`.
-
-### Hot Reload Notes
-
-- When a component is hot-reloaded, its current state is preserved. However, the component itself is destroyed and recreated, so all of its lifecycle hooks will be called accordingly. Make sure to properly teardown any side effects in your lifecycle hooks.
-
-- Private state for child components of a hot-reloaded component is not guaranteed to be preserved across reloads.
-
-- A root Vue instance or a manually mounted instance cannot be hot-reloaded. It will always force a full reload.
-
-### Configuration Tips
-
-- You can use the `--port` option to serve at a different port.
-
-- If your file structure is different, you will have to configure `output.publicPath` in your Webpack config and the `--content-base` option of your webpack-dev-server command accordingly.
-
-- If you are using the HTML5 history API (for example with `vue-router`), you will also want to add the `--history-api-fallback` option.
-
-- Consult the [Webpack dev server documentation](https://webpack.github.io/docs/webpack-dev-server.html) for advanced topics such as combining the dev server with another backend server.
-
-- Finally, if you have an existing [Express](http://expressjs.com/en/index.html) based Node.js backend, you can just add the [Webpack dev middleware](https://webpack.github.io/docs/webpack-dev-middleware.html) to serve your webpack bundle.
+When scaffolding the project with `vue-cli`, Hot Reload is enabled out-of-the-box.
diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index 48c35b566..9a6d9b03d 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -1,50 +1,34 @@
-# PostCSS and Autoprefixer
+# PostCSS
 
-Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for scoped CSS rewriting and auto-prefixed by default using [autoprefixer](https://github.com/postcss/autoprefixer).
+Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for scoped CSS rewriting. You can also add custom PostCSS plugins to the process, for example [autoprefixer](https://github.com/postcss/autoprefixer) or [CSSNext](http://cssnext.io/).
 
-### Configuring Autoprefixer
-
-You can configure autoprefixer using the `autoprefixer` option under the `vue` section of your webpack config. See possible [autoprefixer options](https://github.com/postcss/autoprefixer#options). Also, you can pass in `false` to disable autoprefixing.
-
-Example:
+Example usage in Webpack 1.x:
 
 ``` js
 // webpack.config.js
 module.exports = {
-  // other options...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  },
-  // vue-loader configurations
+  // other configs...
   vue: {
-    // configure autoprefixer
-    autoprefixer: {
-      browsers: ['last 2 versions']
-    }
+    // use custom postcss plugins
+    postcss: [require('postcss-cssnext')()]
   }
 }
 ```
 
-### Using Custom PostCSS Plugins
-
-To use custom PostCSS pugins, pass an array to the `postcss` option under the `vue` section. Example using [CSSNext](http://cssnext.io/):
+For Webpack 2.x:
 
 ``` js
 // webpack.config.js
 module.exports = {
   // other configs...
-  vue: {
-    // use custom postcss plugins
-    postcss: [require('postcss-cssnext')()],
-    // disable vue-loader autoprefixing.
-    // this is a good idea since cssnext comes with it too.
-    autoprefixer: false
-  }
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      vue: {
+        // use custom postcss plugins
+        postcss: [require('postcss-cssnext')()]
+      }
+    })
+  ]
 }
 ```
 
diff --git a/docs/en/getting-started.md b/docs/en/getting-started.md
deleted file mode 100644
index beac721df..000000000
--- a/docs/en/getting-started.md
+++ /dev/null
@@ -1,176 +0,0 @@
-# Getting Started
-
-### Syntax Highlighting
-
-First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
-
-### Project Structure
-
-We are going to walk through setting up a Webpack + `vue-loader` project from scratch. If you are interested in ready-to-run examples, check out [vue-loader-example](https://github.com/vuejs/vue-loader-example) and [vue-hackernews](https://github.com/vuejs/vue-hackernews). However, if you are not already a Webpack expert, I highly recommend going through the following tutorial to understand how the pieces fit together.
-
-A simple `vue-loader` based project structure looks like this:
-
-``` bash
-.
-├── index.html
-├── main.js
-├── components
-│   ├── App.vue
-│   ├── ComponentA.vue
-│   └── ComponentB.vue
-├── package.json
-└── webpack.config.js
-```
-
-### Installing Dependencies
-
-Before we write any code, we need to install the proper NPM dependencies. Let's run:
-
-``` bash
-# Create a package.json file.
-# fill in the questions as you desire.
-npm init
-
-# Install everything we need
-npm install\
-  webpack webpack-dev-server\
-  vue-loader vue-html-loader css-loader style-loader vue-hot-reload-api\
-  babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
-  babel-runtime@5\
-  --save-dev
-```
-
-That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
-
-You may also notice that we are using `babel-runtime` version 5 instead of the latest 6.x - this is [intentional](https://github.com/vuejs/vue-loader/issues/96#issuecomment-162910917).
-
-After proper installation, your `package.json`'s `devDependencies` field should look like this:
-
-``` json
-...
-  "devDependencies": {
-    "babel-core": "^6.3.17",
-    "babel-loader": "^6.2.0",
-    "babel-plugin-transform-runtime": "^6.3.13",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-runtime": "^5.8.34",
-    "css-loader": "^0.23.0",
-    "style-loader": "^0.13.0",
-    "vue-hot-reload-api": "^1.2.2",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^7.2.0",
-    "webpack": "^1.12.9",
-    "webpack-dev-server": "^1.14.0"
-  },
-...
-```
-
-### Configuring Webpack
-
-Here's the most basic Webpack configuration for `vue-loader`:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // entry point of our application
-  entry: './main.js',
-  // where to place the compiled bundle
-  output: {
-    path: __dirname,
-    filename: 'build.js'
-  },
-  module: {
-    // `loaders` is an array of loaders to use.
-    // here we are only configuring vue-loader
-    loaders: [
-      {
-        test: /\.vue$/, // a regex for matching all files that end in `.vue`
-        loader: 'vue'   // loader to use for matched files
-      }
-    ]
-  }
-}
-```
-
-With the above configuration, when you write the following in your JavaScript code:
-
-``` js
-var MyComponent = require('./my-component.vue')
-```
-
-Webpack knows it needs to pipe the contents of `./my-component.vue` through `vue-loader`, because the filename matches the regex we provided in the config.
-
-### Creating Other Files
-
-The app entry point, `main.js` typically looks like this:
-
-``` js
-// main.js
-var Vue = require('vue')
-// require a *.vue component
-var App = require('./components/App.vue')
-
-// mount a root Vue instance
-new Vue({
-  el: 'body',
-  components: {
-    // include the required component
-    // in the options
-    app: App
-  }
-})
-```
-
-Inside a `*.vue` component's `<script>` tag, you can also require other `*.vue` components. For example in `./components/App.vue` (we will talk about ES2015 later):
-
-``` html
-<template>
-  <div class="app">
-    <component-a></component-a>
-    <component-b></component-b>
-  </div>
-</template>
-
-<script>
-module.exports = {
-  components: {
-    'component-a': require('./ComponentA.vue'),
-    'component-b': require('./ComponentB.vue')
-  }
-}
-</script>
-```
-
-Next, let's create an `index.html` that simply uses the bundled file:
-
-``` html
-<!-- index.html -->
-<body>
-  <app></app>
-  <script src="build.js"></script>
-</body>
-```
-
-### Running It
-
-Finally, it's time to get it running! We will simply use [NPM scripts](https://docs.npmjs.com/misc/scripts) as our task runner, which is sufficient in most cases. Add the following to your `package.json`:
-
-``` json
-...
-"scripts": {
-  "dev": "webpack-dev-server --inline --hot"
-}
-...
-```
-
-Then run:
-
-``` bash
-npm run dev
-```
-
-And you should see your app working at `http://localhost:8080`, with hot-reloading enabled!
-
----
-
-[^(1)] If you are using NPM version 2.x, when you do `npm install vue-loader --save-dev` it will install and save all the peer dependencies for you. However, if you are using NPM 3.x, these peer dependencies will no longer be automatically installed. You will have to install them explicitly like we did above. Another way to deal with it is to simply copy `vue-loader`'s peer dependencies into your `package.json`'s `devDependencies` field and then run `npm install`.
diff --git a/docs/en/options.md b/docs/en/options.md
index d11e1eefd..0c196ef84 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -1,5 +1,33 @@
 # Options Reference
 
+## Usage Difference Between Webpack 1 & 2
+
+For Webpack 1.x: add a root `vue` block in your Webpack config:
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader options
+  }
+}
+```
+
+For Webpack 2: use `webpack.LoaderOptionsPlugin`:
+
+``` js
+module.exports = {
+  // ...
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      vue: {
+        // vue-loader options
+      }
+    })
+  ]
+}
+```
+
 ### loaders
 
 - type: `Object`
@@ -21,13 +49,6 @@
   }
   ```
 
-### autoprefixer
-
-- type: `Boolean`
-- default: `true`
-
-  Whether to enable autoprefixer for CSS inside `*.vue` files.
-
 ### postcss
 
 - type: `Array` or `Function` or `Object`
@@ -40,7 +61,6 @@
   vue: {
     // note: do not nest the `postcss` option under `loaders`
     postcss: [require('postcss-cssnext')()],
-    autoprefixer: false,
     loaders: {
       // ...
     }
@@ -67,16 +87,8 @@
 
   Note this is automatically set to `false` if the `devtool` option is not present in the main Webpack config.
 
-### template
-
-- ^8.4.0
-- type: `Object`
-
-  Pass options to the template rendering engine (via [consolidate](https://github.com/tj/consolidate.js)) if you are using a non-html templating language.
-
 ### esModule
 
-- ^9.4.3
 - type: `Boolean`
 - default: `undefined`
 
diff --git a/docs/en/start/setup.md b/docs/en/start/setup.md
new file mode 100644
index 000000000..761e281d2
--- /dev/null
+++ b/docs/en/start/setup.md
@@ -0,0 +1,17 @@
+# Setting Up a Project
+
+### Syntax Highlighting
+
+First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+
+### Using `vue-cli`
+
+It's recommended to scaffold a project using `vue-loader` with `vue-cli`:
+
+``` bash
+npm install -g vue-cli
+vue init webpack-simple hello-vue
+cd hello-vue
+npm install
+npm run dev # ready to go!
+```
diff --git a/docs/en/start/tutorial.md b/docs/en/start/tutorial.md
deleted file mode 100644
index e713eec9e..000000000
--- a/docs/en/start/tutorial.md
+++ /dev/null
@@ -1,186 +0,0 @@
-# Basic Tutorial
-
-We are going to walk through setting up a Webpack + `vue-loader` project from scratch. If you are interested in ready-to-run examples, check out [vue-cli](https://github.com/vuejs/vue-cli) to quickly scaffold new projects. However, if you are not already a Webpack expert, I highly recommend going through the following tutorial to understand how the pieces fit together.
-
-### Project Structure
-
-A simple `vue-loader` based project structure looks like this:
-
-``` bash
-.
-├── index.html
-├── main.js
-├── components
-│   ├── App.vue
-│   ├── ComponentA.vue
-│   └── ComponentB.vue
-├── package.json
-└── webpack.config.js
-```
-
-### Installing Dependencies
-
-Before we write any code, we need to install the proper NPM dependencies. Let's run:
-
-``` bash
-# Create a package.json file.
-# fill in the questions as you desire.
-npm init
-
-# Install everything we need
-npm install\
-  webpack webpack-dev-server\
-  vue-loader vue-html-loader css-loader vue-style-loader vue-hot-reload-api\
-  babel-loader babel-core babel-plugin-transform-runtime babel-preset-es2015\
-  babel-runtime\
-  --save-dev
-npm install vue --save
-```
-
-That's a lot of dependencies, I know! This is mostly because `vue-loader` need to have other webpack loaders as **peer dependencies** rather than nested dependencies so that Webpack can find them.[^(1)]
-
-> Note: In previous versions of `vue-loader` we used to explicitly install `babel-runtime` 5.x to avoid duplicate dependencies - this is no longer necessary after recent babel upgrade.
-
-After proper installation, your `package.json`'s `devDependencies` field should look like this:
-
-``` json
-...
-  "devDependencies": {
-    "babel-core": "^6.3.17",
-    "babel-loader": "^6.2.0",
-    "babel-plugin-transform-runtime": "^6.3.13",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-runtime": "^5.8.34",
-    "css-loader": "^0.23.0",
-    "vue-hot-reload-api": "^1.2.2",
-    "vue-html-loader": "^1.0.0",
-    "vue-style-loader": "^1.0.0",
-    "vue-loader": "^7.2.0",
-    "webpack": "^1.12.9",
-    "webpack-dev-server": "^1.14.0"
-  },
-  "dependencies": {
-    "vue": "^1.0.13"
-  },
-...
-```
-
-### Configuring Webpack
-
-Here's the most basic Webpack configuration for `vue-loader`:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // entry point of our application
-  entry: './main.js',
-  // where to place the compiled bundle
-  output: {
-    path: __dirname,
-    filename: 'build.js'
-  },
-  module: {
-    // `loaders` is an array of loaders to use.
-    // here we are only configuring vue-loader
-    loaders: [
-      {
-        test: /\.vue$/, // a regex for matching all files that end in `.vue`
-        loader: 'vue'   // loader to use for matched files
-      }
-    ]
-  }
-}
-```
-
-With the above configuration, when you write the following in your JavaScript code:
-
-``` js
-var MyComponent = require('./my-component.vue')
-```
-
-Webpack knows it needs to pipe the contents of `./my-component.vue` through `vue-loader`, because the filename matches the regex we provided in the config.
-
-### Creating Other Files
-
-The app entry point, `main.js` typically looks like this (using ES2015 syntax):
-
-``` js
-// main.js
-import Vue from 'vue'
-// require a *.vue component
-import App from './components/App'
-
-// mount a root Vue instance
-new Vue({
-  el: 'body',
-  components: {
-    // include the required component
-    // in the options
-    app: App
-  }
-})
-```
-
-Inside a `*.vue` component's `<script>` tag, you can also require other `*.vue` components. For example in `./components/App.vue`:
-
-``` html
-<template>
-  <div class="app">
-    <component-a></component-a>
-    <component-b></component-b>
-  </div>
-</template>
-
-<script>
-import ComponentA from './ComponentA.vue'
-import ComponentB from './ComponentB.vue'
-
-export default {
-  components: {
-    ComponentA,
-    ComponentB
-  }
-}
-</script>
-```
-
-Next, let's create an `index.html` that simply uses the bundled file:
-
-``` html
-<!-- index.html -->
-<body>
-  <app></app>
-  <script src="build.js"></script>
-</body>
-```
-
-### Running It
-
-Finally, it's time to get it running! We will simply use [NPM scripts](https://docs.npmjs.com/misc/scripts) as our task runner, which is sufficient in most cases. Add the following to your `package.json`:
-
-``` json
-...
-"scripts": {
-  "dev": "webpack-dev-server --inline --hot",
-  "build": "webpack -p"
-}
-...
-```
-
-Then run:
-
-``` bash
-npm run dev
-```
-
-And you should see your app working at `http://localhost:8080`, with hot-reloading enabled! To build, minify and write your bundle to disk, run:
-
-``` bash
-npm run build
-```
-
-Note that Webpack uses the `webpack.config.js` if it finds one. If you named your Webpack config file with a different name, you need to specify it using the `--config /path/to/your/file` command line option.
-
----
-
-[^(1)] If you are using NPM version 2.x, when you do `npm install vue-loader --save-dev` it will install and save all the peer dependencies for you. However, if you are using NPM 3.x, these peer dependencies will no longer be automatically installed. You will have to install them explicitly like we did above. Another way to deal with it is to simply copy `vue-loader`'s peer dependencies into your `package.json`'s `devDependencies` field and then run `npm install`.
diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index fe25b559f..fcb84569c 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -34,6 +34,6 @@ Obviously we don't want to use this config during development, so there are seve
 
 1. Dynamically build up the configuration object based on an environment variable;
 
-2. Or, use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-loader-example](https://github.com/vuejs/vue-loader-example/tree/master/build).
+2. Or, use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
 
 It's really up to you as long as it achieves the goal.
diff --git a/docs/en/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
index 97f099fa2..10ee2fbe5 100644
--- a/docs/en/workflow/testing-with-mocks.md
+++ b/docs/en/workflow/testing-with-mocks.md
@@ -1,7 +1,5 @@
 # Testing with Mocks
 
-> This feature requires `vue-loader@^7.3.0`.
-
 In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
 
 `vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
diff --git a/docs/en/workflow/testing.md b/docs/en/workflow/testing.md
index 515ef50d0..1893b09d5 100644
--- a/docs/en/workflow/testing.md
+++ b/docs/en/workflow/testing.md
@@ -1,5 +1,7 @@
 # Testing
 
+> The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
+
 When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
 
 Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:

From 1fc953aff2c84956404224332d5fbc7176d5ef0f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 28 Sep 2016 20:07:04 -0400
Subject: [PATCH 346/877] 9.5.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2421d4974..0f7c5986e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.5.0",
+  "version": "9.5.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From e14ba8ff33240383824a0286a5bb273e9e0260ba Mon Sep 17 00:00:00 2001
From: Raymond Rutjes <raymond.rutjes@gmail.com>
Date: Mon, 10 Oct 2016 21:43:20 +0200
Subject: [PATCH 347/877] Update es2015.md (#392)

---
 docs/en/features/es2015.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index 9ef7de272..385f9ac41 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -30,4 +30,4 @@ Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to p
 
 ### Configuring Babel with `.babelrc`
 
-`babel-laoder` respects [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), so it is the recommended approach to configure the Babel presets and plugins.
+`babel-loader` respects [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), so it is the recommended approach to configure the Babel presets and plugins.

From 4fd133db364f35babff3f329167630f318ece1a5 Mon Sep 17 00:00:00 2001
From: Raymond Rutjes <raymond.rutjes@gmail.com>
Date: Mon, 10 Oct 2016 21:43:28 +0200
Subject: [PATCH 348/877] Update options.md (#393)

---
 docs/en/options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index 0c196ef84..8fc66c111 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -92,4 +92,4 @@ module.exports = {
 - type: `Boolean`
 - default: `undefined`
 
-  Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Bable, like TypeScript.
+  Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.

From 43e331978d61cb153897221b61468fc8d77c06aa Mon Sep 17 00:00:00 2001
From: Aji <adele513900383@gmail.com>
Date: Tue, 11 Oct 2016 03:43:56 +0800
Subject: [PATCH 349/877] Change a character at line 33 (#391)

Change a character 'babel-laoder' to 'babel-loader'

From 84487b63d2e622fda36255825033bb2adefc713a Mon Sep 17 00:00:00 2001
From: Obura Tongoi <oburatongoi@users.noreply.github.com>
Date: Mon, 10 Oct 2016 12:44:06 -0700
Subject: [PATCH 350/877] Minor typo (#387)

Change traspile to transpile
---
 docs/en/features/es2015.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index 385f9ac41..f57542600 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -24,7 +24,7 @@ export default {
 
 We are using ES2015's Object literal shorthand here to define the child components. `{ ComponentA }` is simply shorthand for `{ ComponentA: ComponentA }`. Vue will automatically convert the key to `component-a`, so you can use the imported component in the template as `<component-a>`.
 
-### Traspiling Normal `.js` Files
+### Transpiling Normal `.js` Files
 
 Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.
 

From 5d7696847adc571636f20d805b7c1bb5f5936028 Mon Sep 17 00:00:00 2001
From: Lar Van Der Jagt <supaspoida@gmail.com>
Date: Mon, 10 Oct 2016 15:45:12 -0400
Subject: [PATCH 351/877] Fix link to deprecated example repo (#375)

The top of the page contains the correct link, but this reference is still outdated.
---
 docs/en/workflow/testing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/testing.md b/docs/en/workflow/testing.md
index 1893b09d5..03c0a64c5 100644
--- a/docs/en/workflow/testing.md
+++ b/docs/en/workflow/testing.md
@@ -98,4 +98,4 @@ Finally, run:
 npm test
 ```
 
-Again, [vue-loader-example](https://github.com/vuejs/vue-loader-example) contains a fully working example with tests.
+Again, [webpack vue-cli template](https://github.com/vuejs-templates/webpack) contains a fully working example with tests.

From 8f9dff5789c7512213b7878638aaf3759ca564d9 Mon Sep 17 00:00:00 2001
From: Nikola Kovacs <nikola.kovacs@gmail.com>
Date: Mon, 10 Oct 2016 22:02:39 +0200
Subject: [PATCH 352/877] Add Webpack 2.x configuration for eslint (#378)

---
 docs/en/workflow/linting.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index 417d5b75a..431047436 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -66,3 +66,28 @@ module.exports = {
   }
 }
 ```
+
+For Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    rules: [
+      // only lint local *.vue files
+      {
+        enforce: 'pre',
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      },
+      // but use vue-loader for all *.vue files
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```

From b95750bf504b738db5a6f0f51ea775a571ab5fcd Mon Sep 17 00:00:00 2001
From: Sam Herbert <sam@samherbert.net>
Date: Mon, 10 Oct 2016 14:02:56 -0600
Subject: [PATCH 353/877] Update production.md (#373)

"setup described in the Vue.js guide" was linking to v1 docs and 404ing. Updated to link to correct v2.0 docs
---
 docs/en/workflow/production.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index fcb84569c..9642520c3 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -3,7 +3,7 @@
 There are two things to do when building our bundle for production:
 
 1. Minify our application code;
-2. Use the [setup described in the Vue.js guide](http://vuejs.org/guide/application.html#Deploying_for_Production) to strip all the warnings from Vue.js source code.
+2. Use the [setup described in the Vue.js guide](http://vuejs.org/guide/single-file-components.html#Deploying-for-Production) to strip all the warnings from Vue.js source code.
 
 Here's an example config:
 

From cd358d62497b475188c999e66a6c7c1598fd23bb Mon Sep 17 00:00:00 2001
From: Chris Fritz <chrisvfritz@gmail.com>
Date: Tue, 11 Oct 2016 13:33:39 -0400
Subject: [PATCH 354/877] Provide default for name option (#396)

* Automatically set name option unless already set

Use the filename to set a component's name option, if one isn't provided. This allows more helpful debugging messages by default.

* remove unnecessary object check for __vue_options__

* add test for automatic name setting based on filenames

* remove redundant if statement from loader.js
---
 lib/loader.js                               |  4 +++-
 test/fixtures/named.vue                     |  9 +++++++++
 test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue |  3 +++
 test/fixtures/unnamed.vue                   |  3 +++
 test/test.js                                | 19 +++++++++++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/named.vue
 create mode 100644 test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue
 create mode 100644 test/fixtures/unnamed.vue

diff --git a/lib/loader.js b/lib/loader.js
index 40424fbf9..ee14c74c0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -180,7 +180,9 @@ module.exports = function (content) {
     // constructor export interop
     'if (typeof __vue_options__ === "function") {\n' +
     '  __vue_options__ = __vue_options__.options\n' +
-    '}\n'
+    '}\n' +
+    // add name based on filename if not already set
+    '__vue_options__.name = __vue_options__.name || "' + fileName.replace(/(\.vue|[^a-z0-9\-])/gi, '') + '"\n'
 
   // add require for template
   var template = parts.template
diff --git a/test/fixtures/named.vue b/test/fixtures/named.vue
new file mode 100644
index 000000000..f2edcd883
--- /dev/null
+++ b/test/fixtures/named.vue
@@ -0,0 +1,9 @@
+<template>
+  <p>hi</p>
+</template>
+
+<script>
+export default {
+  name: 'custom-name'
+}
+</script>
diff --git a/test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue b/test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue
new file mode 100644
index 000000000..92122e949
--- /dev/null
+++ b/test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue
@@ -0,0 +1,3 @@
+<template>
+  <p>hi</p>
+</template>
diff --git a/test/fixtures/unnamed.vue b/test/fixtures/unnamed.vue
new file mode 100644
index 000000000..92122e949
--- /dev/null
+++ b/test/fixtures/unnamed.vue
@@ -0,0 +1,3 @@
+<template>
+  <p>hi</p>
+</template>
diff --git a/test/test.js b/test/test.js
index 056599c18..61818d08f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -108,6 +108,25 @@ describe('vue-loader', function () {
     })
   })
 
+  it('automatic name setting based on filename', function (done) {
+    test({
+      entry: './test/fixtures/unnamed.vue'
+    }, function (window, module, rawModule) {
+      expect(module.name).to.equal('unnamed')
+      test({
+        entry: './test/fixtures/named.vue'
+      }, function (window, module, rawModule) {
+        expect(module.name).to.equal('custom-name')
+        test({
+          entry: './test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue'
+        }, function (window, module, rawModule) {
+          expect(module.name).to.equal('unnamed-5trng3f1l3nme')
+          done()
+        })
+      })
+    })
+  })
+
   it('pre-processors', function (done) {
     test({
       entry: './test/fixtures/pre.vue'

From f2b09066d2a55fd09aa414c28bfc92f446f913f7 Mon Sep 17 00:00:00 2001
From: J Bruni <joaohbruni@yahoo.com.br>
Date: Tue, 11 Oct 2016 14:33:51 -0300
Subject: [PATCH 355/877] Update production.md (#373) (#395)

---
 docs/en/workflow/production.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index 9642520c3..a54081095 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -3,7 +3,7 @@
 There are two things to do when building our bundle for production:
 
 1. Minify our application code;
-2. Use the [setup described in the Vue.js guide](http://vuejs.org/guide/single-file-components.html#Deploying-for-Production) to strip all the warnings from Vue.js source code.
+2. Use the [setup described in the Vue.js guide](https://vuejs.org/guide/deployment.html) to strip all the warnings from Vue.js source code.
 
 Here's an example config:
 

From 90dbaeb02bff428157a81ba894875857d3d5f852 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 13:46:13 -0400
Subject: [PATCH 356/877] rename docs deploy script

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f7c5986e..9403610cb 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "lint": "eslint lib",
     "test": "eslint lib && mocha --slow 5000 --timeout 10000",
     "docs": "cd docs && gitbook serve",
-    "deploy-docs": "bash ./docs/deploy.sh"
+    "docs:deploy": "bash ./docs/deploy.sh"
   },
   "dependencies": {
     "consolidate": "^0.14.0",

From 488a078413e6a05c551d456f589446a64d19401d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 13:48:14 -0400
Subject: [PATCH 357/877] use hash-sum for module id generation

---
 lib/gen-id.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gen-id.js b/lib/gen-id.js
index 25281aec5..8c9621dbf 100644
--- a/lib/gen-id.js
+++ b/lib/gen-id.js
@@ -1,8 +1,8 @@
 // utility for generating a uid for each component file
 // used in scoped CSS rewriting
-var fileUid = 1
-var fileRegistry = Object.create(null)
+var hash = require('hash-sum')
+var cache = Object.create(null)
 
 module.exports = function genId (file) {
-  return fileRegistry[file] || (fileRegistry[file] = fileUid++)
+  return cache[file] || (cache[file] = hash(file))
 }

From 8b0520e33fae2d4977250c2480c90ef458863432 Mon Sep 17 00:00:00 2001
From: Joshua Bemenderfer <tribex10@gmail.com>
Date: Tue, 11 Oct 2016 12:54:58 -0500
Subject: [PATCH 358/877] [Fix for Webpack 2 Beta 24+] Get loader options from
 query instead of raw this.options (#361)

* Get options from query instead of this.options. In Webpack 2, query can be passed an object and this.options is mounted to this.query

* Prioritize Query, re-add this.vue
---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index ee14c74c0..011a01826 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -41,8 +41,8 @@ module.exports = function (content) {
   this.cacheable()
   var isServer = this.options.target === 'node'
   var loaderContext = this
-  var options = this.vue || this.options.vue || {}
   var query = loaderUtils.parseQuery(this.query)
+  var options = this.query ? query : this.vue || this.options.vue || {}
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = 'data-v-' + genId(filePath)

From fcc02bd8cb1a38ee463696f41d7578a0a389eef8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 13:57:42 -0400
Subject: [PATCH 359/877] merge query and old config options

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 011a01826..7bcebcaab 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -42,7 +42,7 @@ module.exports = function (content) {
   var isServer = this.options.target === 'node'
   var loaderContext = this
   var query = loaderUtils.parseQuery(this.query)
-  var options = this.query ? query : this.vue || this.options.vue || {}
+  var options = Object.assign({}, this.options.vue, this.vue, query)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = 'data-v-' + genId(filePath)

From 336a4c096d523bb86dc092e1157111c9b6aff9e7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 14:03:20 -0400
Subject: [PATCH 360/877] update docs for webpack 2 new option usage

---
 docs/en/configurations/advanced.md    | 26 +++++++++++++++-----------
 docs/en/configurations/extract-css.md | 27 ++++++++++++++++-----------
 docs/en/options.md                    | 18 +++++++++++-------
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 1578a3133..2dae6aca4 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -30,22 +30,26 @@ module.exports = {
 }
 ```
 
-Webpack 2.x:
+Webpack 2.x (^2.1.0-beta.25):
 
 ``` js
-var webpack = require('webpack')
-
 module.exports = {
-  // ...
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      vue: {
-        loaders: {
-          // ...
+  // other options...
+  module: {
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        // vue-loader options goes here
+        options: {
+          loaders: {
+            // ...
+          }
         }
       }
-    })
-  ]
+    ]
+  }
 }
 ```
 
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index a48ccf163..b0701a04b 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -35,7 +35,7 @@ module.exports = {
 }
 ```
 
-### Webpack 2.x
+### Webpack 2.x (^2.1.0-beta.25)
 
 ``` bash
 npm install extract-text-webpack-plugin@2.x --save-dev
@@ -43,22 +43,27 @@ npm install extract-text-webpack-plugin@2.x --save-dev
 
 ``` js
 // webpack.config.js
-var webpack = require('webpack')
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
   // other options...
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      vue: {
-        loaders: {
-          css: ExtractTextPlugin.extract({
-            loader: 'css-loader',
-            fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
-          })
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              loader: 'css-loader',
+              fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+            })
+          }
         }
       }
-    }),
+    ]
+  },
+  plugins: [
     new ExtractTextPlugin("style.css")
   ]
 }
diff --git a/docs/en/options.md b/docs/en/options.md
index 8fc66c111..701dc984a 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -13,18 +13,22 @@ module.exports = {
 }
 ```
 
-For Webpack 2: use `webpack.LoaderOptionsPlugin`:
+For Webpack 2 (^2.1.0-beta.25):
 
 ``` js
 module.exports = {
   // ...
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      vue: {
-        // vue-loader options
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          // vue-loader options
+        }
       }
-    })
-  ]
+    ]
+  }
 }
 ```
 

From eca04eb1f23a0c06250cf9fb0a663236239c2154 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 14:03:27 -0400
Subject: [PATCH 361/877] 9.5.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9403610cb..dc771fcd5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.5.1",
+  "version": "9.5.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From d310aa2c5f67748b64ab0fab473c5465a38e3be6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 17:37:49 -0400
Subject: [PATCH 362/877] include component file location during dev

---
 lib/loader.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 7bcebcaab..a91381fff 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -182,7 +182,9 @@ module.exports = function (content) {
     '  __vue_options__ = __vue_options__.options\n' +
     '}\n' +
     // add name based on filename if not already set
-    '__vue_options__.name = __vue_options__.name || "' + fileName.replace(/(\.vue|[^a-z0-9\-])/gi, '') + '"\n'
+    '__vue_options__.name = __vue_options__.name || ' + JSON.stringify(fileName.replace(/(\.vue|[^a-z0-9\-])/gi, '')) + '\n' +
+    // add filename in dev
+    (isProduction ? '' : ('__vue_options__.__file = ' + JSON.stringify(filePath))) + '\n'
 
   // add require for template
   var template = parts.template

From 9e0ad9b6e47ee828e1d37aad91ad97e1c93494fb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Oct 2016 17:37:58 -0400
Subject: [PATCH 363/877] 9.5.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc771fcd5..5357e3f61 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.5.2",
+  "version": "9.5.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From deee354071fee02df651fde2f39fdbab8805275f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Oct 2016 23:06:49 -0400
Subject: [PATCH 364/877] revert auto name-setting

---
 lib/loader.js                               |  2 --
 test/fixtures/named.vue                     |  9 ---------
 test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue |  3 ---
 test/fixtures/unnamed.vue                   |  3 ---
 test/test.js                                | 18 ++++--------------
 5 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 test/fixtures/named.vue
 delete mode 100644 test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue
 delete mode 100644 test/fixtures/unnamed.vue

diff --git a/lib/loader.js b/lib/loader.js
index a91381fff..72dae401a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -181,8 +181,6 @@ module.exports = function (content) {
     'if (typeof __vue_options__ === "function") {\n' +
     '  __vue_options__ = __vue_options__.options\n' +
     '}\n' +
-    // add name based on filename if not already set
-    '__vue_options__.name = __vue_options__.name || ' + JSON.stringify(fileName.replace(/(\.vue|[^a-z0-9\-])/gi, '')) + '\n' +
     // add filename in dev
     (isProduction ? '' : ('__vue_options__.__file = ' + JSON.stringify(filePath))) + '\n'
 
diff --git a/test/fixtures/named.vue b/test/fixtures/named.vue
deleted file mode 100644
index f2edcd883..000000000
--- a/test/fixtures/named.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-  <p>hi</p>
-</template>
-
-<script>
-export default {
-  name: 'custom-name'
-}
-</script>
diff --git a/test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue b/test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue
deleted file mode 100644
index 92122e949..000000000
--- a/test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <p>hi</p>
-</template>
diff --git a/test/fixtures/unnamed.vue b/test/fixtures/unnamed.vue
deleted file mode 100644
index 92122e949..000000000
--- a/test/fixtures/unnamed.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <p>hi</p>
-</template>
diff --git a/test/test.js b/test/test.js
index 61818d08f..c7327255f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -108,22 +108,12 @@ describe('vue-loader', function () {
     })
   })
 
-  it('automatic name setting based on filename', function (done) {
+  it('expose filename', function (done) {
     test({
-      entry: './test/fixtures/unnamed.vue'
+      entry: './test/fixtures/basic.vue'
     }, function (window, module, rawModule) {
-      expect(module.name).to.equal('unnamed')
-      test({
-        entry: './test/fixtures/named.vue'
-      }, function (window, module, rawModule) {
-        expect(module.name).to.equal('custom-name')
-        test({
-          entry: './test/fixtures/unnamed-5tr@ng3_f1l3n@me$.vue'
-        }, function (window, module, rawModule) {
-          expect(module.name).to.equal('unnamed-5trng3f1l3nme')
-          done()
-        })
-      })
+      expect(module.__file).to.equal(path.resolve(__dirname, './fixtures/basic.vue'))
+      done()
     })
   })
 

From 992d6a1e2a61d2c8a76d54408f3e9ff3548c2288 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Oct 2016 23:18:12 -0400
Subject: [PATCH 365/877] share options across all sub-loaders

---
 lib/loader.js            | 2 +-
 lib/style-rewriter.js    | 2 +-
 lib/template-compiler.js | 2 +-
 lib/template-loader.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 72dae401a..47a33560a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -42,7 +42,7 @@ module.exports = function (content) {
   var isServer = this.options.target === 'node'
   var loaderContext = this
   var query = loaderUtils.parseQuery(this.query)
-  var options = Object.assign({}, this.options.vue, this.vue, query)
+  var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = 'data-v-' + genId(filePath)
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 886a46306..814516e15 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -42,7 +42,7 @@ module.exports = function (css, map) {
   var cb = this.async()
 
   var query = loaderUtils.parseQuery(this.query)
-  var options = this.vue || this.options.vue || {}
+  var options = this.options.__vueOptions__
   var postcssOptions = options.postcss
 
   // postcss plugins
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 9bca81777..655de314c 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -49,7 +49,7 @@ module.exports = function (html) {
   this.cacheable()
   var query = loaderUtils.parseQuery(this.query)
   var isServer = this.options.target === 'node'
-  var vueOptions = this.vue || this.options.vue || {}
+  var vueOptions = this.options.__vueOptions__
   if (vueOptions.transformToRequire) {
     Object.assign(transformToRequire, vueOptions.transformToRequire)
   }
diff --git a/lib/template-loader.js b/lib/template-loader.js
index ce26b75b4..57a596870 100644
--- a/lib/template-loader.js
+++ b/lib/template-loader.js
@@ -6,7 +6,7 @@ module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
   var opt = loaderUtils.parseQuery(this.query)
-  var vue = this.options.vue
+  var vue = this.options.__vueOptions__
   if (vue && vue.template) {
     for (var key in vue.template) {
       opt[key] = vue.template[key]

From eeb3c43adf0585c11a4c4d0d285fd8d99517cbce Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Oct 2016 23:50:41 -0400
Subject: [PATCH 366/877] expose preserveWhitespace option

---
 lib/template-compiler.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 655de314c..9dd63cbf5 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -9,8 +9,8 @@ var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 var defaultTransformToRequire = {
   img: 'src'
 }
-var transformToRequire = Object.assign({}, defaultTransformToRequire)
-var options = {
+var transformToRequire = defaultTransformToRequire
+var defaultCompileOptions = {
   modules: [{
     postTransformNode (el) {
       for (var tag in transformToRequire) {
@@ -51,9 +51,15 @@ module.exports = function (html) {
   var isServer = this.options.target === 'node'
   var vueOptions = this.options.__vueOptions__
   if (vueOptions.transformToRequire) {
-    Object.assign(transformToRequire, vueOptions.transformToRequire)
+    transformToRequire = Object.assign(
+      {},
+      defaultTransformToRequire,
+      vueOptions.transformToRequire
+    )
   }
-  var compiled = compiler.compile(html, options)
+  var compiled = compiler.compile(html, Object.assign({
+    preserveWhitespace: vueOptions.preserveWhitespace
+  }, defaultCompileOptions))
   var code
   if (compiled.errors.length) {
     var self = this

From 8d1cb2fd283beaea228be835033505996a631c56 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Oct 2016 23:58:03 -0400
Subject: [PATCH 367/877] add documentation for additional options

---
 docs/en/options.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/en/options.md b/docs/en/options.md
index 701dc984a..2b63b3999 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -97,3 +97,17 @@ module.exports = {
 - default: `undefined`
 
   Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
+
+### preserveWhitespace
+
+- type: `Boolean`
+- default: `true`
+
+  If set to `false`, the whitespaces between HTML tags in templates will be ignored.
+
+### transformToRequire
+
+- type: `{ [tag: string]: string | Array<string> }`
+- default: `{ img: 'src' }`
+
+  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags.

From b422cfc945e2e293c17cde96d84001da3d4dcec9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Oct 2016 23:58:08 -0400
Subject: [PATCH 368/877] 9.6.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5357e3f61..bbb5678a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.5.3",
+  "version": "9.6.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 55113636ad0239ddc7d72a22a06cf236b40f37eb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Oct 2016 00:17:02 -0400
Subject: [PATCH 369/877] expose buble option

---
 lib/loader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 47a33560a..f2a61c005 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -55,10 +55,11 @@ module.exports = function (content) {
     this.sourceMap &&
     options.cssSourceMap !== false
 
+  var bubleOptions = hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
   var defaultLoaders = {
     html: templateCompilerPath + '?id=' + moduleId,
     css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
-    js: hasBuble ? 'buble-loader' : hasBabel ? 'babel-loader' : ''
+    js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
 
   // check if there are custom loaders specified via

From b4d3818a500f66ae61253b98cfc2186fedfe6876 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Oct 2016 00:18:44 -0400
Subject: [PATCH 370/877] add buble docs

---
 docs/en/options.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/en/options.md b/docs/en/options.md
index 2b63b3999..ee08ff1a9 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -111,3 +111,18 @@ module.exports = {
 - default: `{ img: 'src' }`
 
   During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags.
+
+### buble
+
+- type: `Object`
+- default: `{}`
+
+  Configure options for `buble-loader` (if present). For example, to enable Object spread operator:
+
+  ``` js
+  vue: {
+    buble: {
+      objectAssign: 'Object.assign'
+    }
+  }
+  ```

From 70ca3ff64c1ae69bb4b93a142e937fccd2f06c89 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Oct 2016 00:18:48 -0400
Subject: [PATCH 371/877] 9.7.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bbb5678a2..b2960264a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 123f4e2089cd91f7ed6b06f7875b05547d5c7e55 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Oct 2016 04:54:44 -0400
Subject: [PATCH 372/877] use pug instead of jade

---
 docs/en/configurations/pre-processors.md                    | 6 +++---
 package.json                                                | 2 +-
 test/fixtures/pre.vue                                       | 2 +-
 test/fixtures/{template-import.jade => template-import.pug} | 0
 test/fixtures/template-import.vue                           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename test/fixtures/{template-import.jade => template-import.pug} (100%)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index 737577bc8..dcc60e12f 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -34,14 +34,14 @@ npm install coffee-loader --save-dev
 
 ### Templates
 
-Processing templates is a little different, because most Webpack template loaders such as `jade-loader` return a template function instead of a compiled HTML string. Instead of using `jade-loader`, we can just install the original `jade`:
+Processing templates is a little different, because most Webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we can just install the original `pug`:
 
 ``` bash
-npm install jade --save-dev
+npm install pug --save-dev
 ```
 
 ``` html
-<template lang="jade">
+<template lang="pug">
 div
   h1 Hello world!
 </template>
diff --git a/package.json b/package.json
index b2960264a..acc1240e1 100644
--- a/package.json
+++ b/package.json
@@ -61,13 +61,13 @@
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
     "inject-loader": "^2.0.1",
-    "jade": "^1.11.0",
     "jsdom": "^9.2.1",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
     "postcss": "^5.0.21",
+    "pug": "^2.0.0-beta6",
     "rimraf": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
diff --git a/test/fixtures/pre.vue b/test/fixtures/pre.vue
index 238e1a2ee..ed1a86a6b 100644
--- a/test/fixtures/pre.vue
+++ b/test/fixtures/pre.vue
@@ -6,7 +6,7 @@ body
   color primary-color
 </style>
 
-<template lang="jade">
+<template lang="pug">
 div
   h1 This is the app
   comp-a
diff --git a/test/fixtures/template-import.jade b/test/fixtures/template-import.pug
similarity index 100%
rename from test/fixtures/template-import.jade
rename to test/fixtures/template-import.pug
diff --git a/test/fixtures/template-import.vue b/test/fixtures/template-import.vue
index ce534539b..461624104 100644
--- a/test/fixtures/template-import.vue
+++ b/test/fixtures/template-import.vue
@@ -1 +1 @@
-<template lang="jade" src="./template-import.jade"></template>
+<template lang="pug" src="./template-import.pug"></template>

From 2d955930c9615fe0da2a7d18842db9938747376e Mon Sep 17 00:00:00 2001
From: J Bruni <joaohbruni@yahoo.com.br>
Date: Wed, 2 Nov 2016 19:22:43 -0200
Subject: [PATCH 373/877] Update advanced.md - match style of extract-css.md
 (#429)

---
 docs/en/configurations/advanced.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 2dae6aca4..749c42b0f 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -2,7 +2,7 @@
 
 Sometimes you may want to apply a custom loader string to a language instead of letting `vue-loader` infer it. Or you may simply want to overwrite the built-in loader configuration for the default languages. To do that, add a `vue` block in your Webpack config file, and specify the `loaders` option.
 
-Webpack 1.x Example:
+### Webpack 1.x
 
 ``` js
 // webpack.config.js
@@ -30,7 +30,7 @@ module.exports = {
 }
 ```
 
-Webpack 2.x (^2.1.0-beta.25):
+### Webpack 2.x (^2.1.0-beta.25)
 
 ``` js
 module.exports = {

From 753159cb3027efb7ad992729056a7cbc1d3eb3a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Go=C5=9Bcicki?= <pawel.goscicki@gmail.com>
Date: Wed, 2 Nov 2016 22:22:52 +0100
Subject: [PATCH 374/877] Fix typo in README (#430)

---
 docs/en/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/README.md b/docs/en/README.md
index 5831686d9..2bb3116c8 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -26,7 +26,7 @@ If you are already familiar with Webpack, feel free to skip the following explan
 
 For a basic example, imagine we have a bunch of CommonJS modules. They cannot run directly inside the browser, so we need to "bundle" them into a single file that can be included via a `<script>` tag. Webpack can follow the dependencies of the `require()` calls and do that for us.
 
-But Webpack can do more than that. With "loaders", we can teach Webpack to transform all types of files in anyway we want before outputting the final bundle. Some examples include:
+But Webpack can do more than that. With "loaders", we can teach Webpack to transform all types of files in any way we want before outputting the final bundle. Some examples include:
 
 - Transpile ES2015, CoffeeScript or TypeScript modules into plain ES5 CommonJS modules;
 - Optionally you can pipe the source code through a linter before doing the compilation;

From 58a6c59e0f93dda714a44477b328a917ff67fde9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 2 Nov 2016 19:03:59 -0400
Subject: [PATCH 375/877] document template ES2015 features

---
 docs/en/features/es2015.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index f57542600..f1891bc27 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -24,6 +24,27 @@ export default {
 
 We are using ES2015's Object literal shorthand here to define the child components. `{ ComponentA }` is simply shorthand for `{ ComponentA: ComponentA }`. Vue will automatically convert the key to `component-a`, so you can use the imported component in the template as `<component-a>`.
 
+### ES2015 in Templates
+
+Note that expressions inside `<template>`s do not get processed by the same Babel (or Buble) configuration like the `<script>` parts, because some ES2015 features cannot be compiled into render-function-friendly code. However, `vue-loader` does process the generated render function to selectively support a few convenient ES2015 features:
+
+- [Template string interpolation](http://es6-features.org/#StringInterpolation)
+- [Object property shorthand](http://es6-features.org/#PropertyShorthand)
+- [Object method shorthand](http://es6-features.org/#MethodProperties)
+- [Computed property names](http://es6-features.org/#ComputedPropertyNames)
+
+These features are quite convenient in dynamic class bindings, for example:
+
+``` html
+<div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
+```
+
+can be simplified to:
+
+``` html
+<div :class="{ active, [`${prefix}-button`]: isButton }">
+```
+
 ### Transpiling Normal `.js` Files
 
 Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.

From 75ca421df31b69b807d5d5774235210e29fe1252 Mon Sep 17 00:00:00 2001
From: YiSiWang <yisi.wang@ele.me>
Date: Sat, 5 Nov 2016 11:02:10 +0800
Subject: [PATCH 376/877] [WIP]CSS modules (#422)

* add test

* add css module support with parser hack

* add localIdentName support

* add SSR support with test case

* use vue-template-compiler#dev and remove parse hack

* use vue#2.0.4
---
 lib/loader.js                 | 79 +++++++++++++++++++++++++++++++----
 package.json                  |  4 +-
 test/fixtures/css-modules.vue | 20 +++++++++
 test/test.js                  | 70 +++++++++++++++++++++++++++++++
 4 files changed, 164 insertions(+), 9 deletions(-)
 create mode 100644 test/fixtures/css-modules.vue

diff --git a/lib/loader.js b/lib/loader.js
index f2a61c005..6588600bf 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -58,7 +58,7 @@ module.exports = function (content) {
   var bubleOptions = hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
   var defaultLoaders = {
     html: templateCompilerPath + '?id=' + moduleId,
-    css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
+    css: (isServer ? '' : styleLoaderPath + '!') + 'css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
     js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
 
@@ -77,7 +77,7 @@ module.exports = function (content) {
       // disable all configuration loaders
       '!!' +
       // get loader string for pre-processors
-      getLoaderString(type, part, scoped) +
+      getLoaderString(type, part, index, scoped) +
       // select the corresponding part from the vue file
       getSelectorString(type, index || 0) +
       // the url to the actual vuefile
@@ -94,17 +94,42 @@ module.exports = function (content) {
   function getRequireForImportString (type, impt, scoped) {
     return loaderUtils.stringifyRequest(loaderContext,
       '!!' +
-      getLoaderString(type, impt, scoped) +
+      getLoaderString(type, impt, -1, scoped) +
       impt.src
     )
   }
 
-  function getLoaderString (type, part, scoped) {
+  function addCssModulesToLoader (loader, part, index) {
+    if (!part.module) return loader
+    var option = options.cssModules || {}
+    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
+      // $1: !css-loader
+      // $2: ?a=b
+      var query = loaderUtils.parseQuery($2)
+      query.modules = true
+      query.importLoaders = true
+      query.localIdentName = option.localIdentName || '[hash:base64]'
+      if (index !== -1) {
+        // Note:
+        //   Class name is generated according to its filename.
+        //   Different <style> tags in the same .vue file may generate same names.
+        //   Append `_[index]` to class name to avoid this.
+        query.localIdentName += '_' + index
+      }
+      return $1 + '?' + JSON.stringify(query)
+    })
+  }
+
+  function getLoaderString (type, part, index, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
     var injectString = (type === 'script' && query.inject) ? 'inject!' : ''
     if (loader !== undefined) {
+      // add css modules
+      if (type === 'styles') {
+        loader = addCssModulesToLoader(loader, part, index)
+      }
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
       if (rewriterInjectRE.test(loader)) {
@@ -121,7 +146,8 @@ module.exports = function (content) {
         case 'template':
           return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
-          return defaultLoaders.css + '!' + rewriter + lang + '!'
+          loader = addCssModulesToLoader(defaultLoaders.css, part, index)
+          return loader + '!' + rewriter + lang + '!'
         case 'script':
           return injectString + lang + '!'
       }
@@ -146,13 +172,42 @@ module.exports = function (content) {
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
   var output = 'var __vue_exports__, __vue_options__\n'
 
+  // css modules
+  output += 'var __vue_styles__ = {}\n'
+  var cssModules = {}
+
   // add requires for styles
-  if (!isServer && parts.styles.length) {
+  if (parts.styles.length) {
     output += '\n/* styles */\n'
     parts.styles.forEach(function (style, i) {
-      output += style.src
+      var moduleName = (style.module === true) ? '$style' : style.module
+
+      // require style
+      if (isServer && !moduleName) return
+      var requireString = style.src
         ? getRequireForImport('styles', style, style.scoped)
         : getRequire('styles', style, i, style.scoped)
+
+      // setCssModule
+      if (moduleName) {
+        if (moduleName in cssModules) {
+          loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
+          output += requireString
+        } else {
+          cssModules[moduleName] = true
+
+          // `style-loader` exposes the name-to-hash map directly
+          // `css-loader` exposes it in `.locals`
+          // We drop `style-loader` in SSR, and add `.locals` here.
+          if (isServer) {
+            requireString += '.locals'
+          }
+
+          output += '__vue_styles__["' + moduleName + '"] = ' + requireString + '\n'
+        }
+      } else {
+        output += requireString
+      }
     })
   }
 
@@ -205,6 +260,16 @@ module.exports = function (content) {
     exports += '__vue_options__._scopeId = "' + moduleId + '"\n'
   }
 
+  if (Object.keys(cssModules).length) {
+    // inject style modules as computed properties
+    exports +=
+      'if (!__vue_options__.computed) __vue_options__.computed = {}\n' +
+      'Object.keys(__vue_styles__).forEach(function (key) {\n' +
+        'var module = __vue_styles__[key]\n' +
+        '__vue_options__.computed[key] = function () { return module }\n' +
+      '})\n'
+  }
+
   if (!query.inject) {
     output += exports
     // hot reload
diff --git a/package.json b/package.json
index acc1240e1..780736554 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.0-rc.3",
+    "vue-template-compiler": "^2.0.4",
     "vue-template-es2015-compiler": "^1.0.0"
   },
   "peerDependencies": {
@@ -72,7 +72,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.1.3",
-    "vue": "^2.0.0-rc.4",
+    "vue": "^2.0.4",
     "webpack": "^1.12.2"
   }
 }
diff --git a/test/fixtures/css-modules.vue b/test/fixtures/css-modules.vue
new file mode 100644
index 000000000..8646cb868
--- /dev/null
+++ b/test/fixtures/css-modules.vue
@@ -0,0 +1,20 @@
+<style module="style">
+.red {
+  color: red;
+}
+@keyframes fade {
+  from { opacity: 1; } to { opacity: 0; }
+}
+.animate {
+  animation: fade 1s;
+}
+</style>
+
+<style scoped lang="stylus" module>
+.red
+  color: red
+</style>
+
+<script>
+module.exports = {}
+</script>
diff --git a/test/test.js b/test/test.js
index c7327255f..9b83eb3d5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -377,4 +377,74 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('css-modules', function (done) {
+    function testWithIdent (localIdentName, regexToMatch, cb) {
+      test({
+        entry: './test/fixtures/css-modules.vue',
+        vue: {
+          cssModules: {
+            localIdentName: localIdentName
+          }
+        }
+      }, function (window) {
+        var module = window.vueModule
+
+        // get local class name
+        var className = module.computed.style().red
+        expect(className).to.match(regexToMatch)
+
+        // class name in style
+        var style = [].slice.call(window.document.querySelectorAll('style')).map(function (style) {
+          return style.textContent
+        }).join('\n')
+        expect(style).to.contain('.' + className + ' {\n  color: red;\n}')
+
+        // animation name
+        var match = style.match(/@keyframes\s+(\S+)\s+{/)
+        expect(match).to.have.length(2)
+        var animationName = match[1]
+        expect(animationName).to.not.equal('fade')
+        expect(style).to.contain('animation: ' + animationName + ' 1s;')
+
+        // default module + pre-processor + scoped
+        var anotherClassName = module.computed.$style().red
+        expect(anotherClassName).to.match(regexToMatch).and.not.equal(className)
+        var id = 'data-v-' + genId(require.resolve('./fixtures/css-modules.vue'))
+        expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
+
+        cb()
+      })
+    }
+    // default localIdentName
+    testWithIdent(undefined, /^_\w{22}/, function () {
+      // specified localIdentName
+      var ident = '[path][name]---[local]---[hash:base64:5]'
+      var regex = /^test-fixtures-css-modules---red---\w{5}/
+      testWithIdent(ident, regex, done)
+    })
+  })
+
+  it('css-modules in SSR', function (done) {
+    bundle({
+      entry: './test/fixtures/css-modules.vue',
+      target: 'node',
+      output: Object.assign({}, globalConfig.output, {
+        libraryTarget: 'commonjs2'
+      })
+    }, function (code) {
+      // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
+      function requireFromString(src, filename) {
+        var Module = module.constructor;
+        var m = new Module();
+        m._compile(src, filename);
+        return m.exports;
+      }
+
+      var output = requireFromString(code, './test.build.js')
+      expect(output.computed.style().red).to.exist
+
+      done()
+    })
+  })
 })

From 1bca7dee7902def6b24e2c1931e76df2d54d0980 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 5 Nov 2016 13:46:13 -0400
Subject: [PATCH 377/877] docs for CSS modules

---
 docs/en/SUMMARY.md              |  1 +
 docs/en/features/css-modules.md | 83 +++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 docs/en/features/css-modules.md

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 50e9da249..96dd8c380 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -4,6 +4,7 @@
 - Features
   - [ES2015](features/es2015.md)
   - [Scoped CSS](features/scoped-css.md)
+  - [CSS Modules](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [Hot Reload](features/hot-reload.md)
 - Configurations
diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
new file mode 100644
index 000000000..e08f72faf
--- /dev/null
+++ b/docs/en/features/css-modules.md
@@ -0,0 +1,83 @@
+# CSS Modules
+
+> requires ^9.8.0
+
+[CSS Modules](https://github.com/css-modules/css-modules) is a popular system for modularizing and composing CSS. `vue-loader` provides first-class integration with CSS Modules as an alternative for simulated scoped CSS.
+
+### Usage
+
+Just add the `module` attribute to your `<style>`:
+
+``` html
+<style module>
+.red {
+  color: red;
+}
+</style>
+```
+
+This will turn on CSS Modules mode for `css-loader`, and the resulting class identifier object will be injected into the component as a computed property with the name `$style`. To use it in your templates, you need to use a dynamic class binding:
+
+``` html
+<template>
+  <p :class="$style.red">
+    This should be red
+  </p>
+</template>
+```
+
+Since it's a computed property, you can also access it from JavaScript:
+
+``` js
+<script>
+export default {
+  created () {
+    console.log(this.$style.red) // "_1VyoJ-uZOjlOxP7jWUy19_0"
+  }
+}
+</script>
+```
+
+Refer to the [CSS Modules spec](https://github.com/css-modules/css-modules) for mode details such as [global exceptions](https://github.com/css-modules/css-modules#exceptions) and [composition](https://github.com/css-modules/css-modules#composition).
+
+### Custom Inject Name
+
+You can have more than one `<style>` tags in a single `*.vue` component. To avoid injected styles to overwrite each other, you can customize the name of the injected computed property by giving the `module` attribute a value:
+
+``` html
+<style module="a">
+  /* identifiers injected as $a */
+</style>
+
+<style module="b">
+  /* identifiers injected as $b */
+</style>
+```
+
+### Configuring Local Indentifier Name
+
+By default, class names are transformed unique identifiers in the form of `[hash:base64]`, but you can configure it by providing the `cssModules.localIdentName` option to `vue-loader`:
+
+``` js
+// wepback 1
+vue: {
+  cssModules: {
+    localIdentName: '[path][name]---[local]---[hash:base64:5]'
+  }
+}
+
+// webpack 2
+module: {
+  rules: [
+    {
+      test: '\.vue$',
+      loader: 'vue',
+      options: {
+        cssModules: {
+          localIdentName: '[path][name]---[local]---[hash:base64:5]'
+        }
+      }
+    }
+  ]
+}
+```

From b333e095168ff4a674d19e807ffbd9e334eed799 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 5 Nov 2016 13:46:19 -0400
Subject: [PATCH 378/877] 9.8.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 780736554..e0a0cb2dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.7.0",
+  "version": "9.8.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From c120c0f850b409dfe60ee50bbec2c1a0911fb321 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 5 Nov 2016 13:55:33 -0400
Subject: [PATCH 379/877] improve css module docs

---
 docs/en/features/css-modules.md | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index e08f72faf..f61126612 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -13,10 +13,13 @@ Just add the `module` attribute to your `<style>`:
 .red {
   color: red;
 }
+.bold {
+  font-weight: bold;
+}
 </style>
 ```
 
-This will turn on CSS Modules mode for `css-loader`, and the resulting class identifier object will be injected into the component as a computed property with the name `$style`. To use it in your templates, you need to use a dynamic class binding:
+This will turn on CSS Modules mode for `css-loader`, and the resulting class identifier object will be injected into the component as a computed property with the name `$style`. You can use it in your templates with a dynamic class binding:
 
 ``` html
 <template>
@@ -26,13 +29,30 @@ This will turn on CSS Modules mode for `css-loader`, and the resulting class ide
 </template>
 ```
 
-Since it's a computed property, you can also access it from JavaScript:
+Since it's a computed property, it also works with the object/array syntax of `:class`:
 
-``` js
+``` html
+<template>
+  <div>
+    <p :class="{ [$style.red]: isRed }">
+      Am I red?
+    </p>
+    <p :class="[$style.red, $style.bold]">
+      Red and bold
+    </p>
+  </div>
+</template>
+```
+
+And you can also access it from JavaScript:
+
+``` html
 <script>
 export default {
   created () {
-    console.log(this.$style.red) // "_1VyoJ-uZOjlOxP7jWUy19_0"
+    console.log(this.$style.red)
+    // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
+    // an identifier generated based on filename and className.
   }
 }
 </script>

From 0aa8a6ebf3965d1cadfa6e9dc8c129aeebbdb8e1 Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Sun, 6 Nov 2016 22:05:04 +0800
Subject: [PATCH 380/877] use  to merge cssModules configuration  with (#446)

---
 .gitignore    |  2 ++
 lib/loader.js | 11 ++++++++---
 test/test.js  |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c2848eb9..e45d3c71e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ npm-debug.log
 test/output
 docs/_book
 .DS_Store
+.idea
+*.iml
diff --git a/lib/loader.js b/lib/loader.js
index 6588600bf..3cc485045 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -102,13 +102,18 @@ module.exports = function (content) {
   function addCssModulesToLoader (loader, part, index) {
     if (!part.module) return loader
     var option = options.cssModules || {}
+    var DEFAULT_OPTIONS = {
+      modules: true,
+      importLoaders: true
+    }
+    var OPTIONS = {
+      localIdentName: '[hash:base64]'
+    }
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
       // $1: !css-loader
       // $2: ?a=b
       var query = loaderUtils.parseQuery($2)
-      query.modules = true
-      query.importLoaders = true
-      query.localIdentName = option.localIdentName || '[hash:base64]'
+      Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
       if (index !== -1) {
         // Note:
         //   Class name is generated according to its filename.
diff --git a/test/test.js b/test/test.js
index 9b83eb3d5..c564f9b69 100644
--- a/test/test.js
+++ b/test/test.js
@@ -383,7 +383,7 @@ describe('vue-loader', function () {
       test({
         entry: './test/fixtures/css-modules.vue',
         vue: {
-          cssModules: {
+          cssModules: localIdentName && {
             localIdentName: localIdentName
           }
         }

From 1860a8febd60717302f09d57b8df8b83b4fe4333 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 6 Nov 2016 09:11:24 -0500
Subject: [PATCH 381/877] docs for cssModules options

---
 docs/en/features/css-modules.md | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index f61126612..2e825c371 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -74,15 +74,29 @@ You can have more than one `<style>` tags in a single `*.vue` component. To avoi
 </style>
 ```
 
-### Configuring Local Indentifier Name
+### Configuring `css-loader` Query
 
-By default, class names are transformed unique identifiers in the form of `[hash:base64]`, but you can configure it by providing the `cssModules.localIdentName` option to `vue-loader`:
+CSS Modules are processed via [css-loader](ttps://github.com/webpack/css-loader). With `<style module>`, the default query used for `css-loader` is:
+
+``` js
+{
+  modules: true,
+  importLoaders: true,
+  localIdentName: '[hash:base64]'
+}
+```
+
+You can use vue-loader
+s `cssModules` option to provide additional query options to `css-loader`:
 
 ``` js
 // wepback 1
 vue: {
   cssModules: {
-    localIdentName: '[path][name]---[local]---[hash:base64:5]'
+    // overwrite local ident name
+    localIdentName: '[path][name]---[local]---[hash:base64:5]',
+    // enable camelCase
+    camelCase: true
   }
 }
 
@@ -94,7 +108,8 @@ module: {
       loader: 'vue',
       options: {
         cssModules: {
-          localIdentName: '[path][name]---[local]---[hash:base64:5]'
+          localIdentName: '[path][name]---[local]---[hash:base64:5]',
+          camelCase: true
         }
       }
     }

From b5dde511320aa338a2f790df7d9181e6afc73584 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 6 Nov 2016 09:11:37 -0500
Subject: [PATCH 382/877] 9.8.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0a0cb2dc..8fe113f1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.8.0",
+  "version": "9.8.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 86fc3ea55877ef33252b6c7d69336e347598646a Mon Sep 17 00:00:00 2001
From: Dave Honneffer <pearofducks@gmail.com>
Date: Thu, 10 Nov 2016 17:27:21 +0100
Subject: [PATCH 383/877] [docs] Use new theme in documentation

---
 docs/book.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/book.json b/docs/book.json
index 8b295f41f..76d487115 100644
--- a/docs/book.json
+++ b/docs/book.json
@@ -1,6 +1,6 @@
 {
-  "gitbook": "2.x.x",
-  "plugins": ["edit-link", "github"],
+  "gitbook": ">3.0.0",
+  "plugins": ["edit-link", "theme-vuejs@git+https://github.com/pearofducks/gitbook-plugin-theme-vuejs.git", "-fontsettings", "github"],
   "pluginsConfig": {
     "edit-link": {
       "base": "https://github.com/vuejs/vue-loader/tree/master/docs",

From f84e9120ff50c96081883669e3e11da613125156 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 12 Nov 2016 10:14:56 -0500
Subject: [PATCH 384/877] pass templateBuble options to the
 template-es2015-compiler

---
 lib/template-compiler.js | 2 +-
 package.json             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 9dd63cbf5..e0d5c0def 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -71,7 +71,7 @@ module.exports = function (html) {
     code = transpile('module.exports={' +
       'render:' + toFunction(compiled.render) + ',' +
       'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-    '}')
+    '}', vueOptions.templateBuble)
   }
   // hot-reload
   if (!isServer &&
diff --git a/package.json b/package.json
index 8fe113f1d..b5da30a50 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.4",
-    "vue-template-es2015-compiler": "^1.0.0"
+    "vue-template-compiler": "^2.0.5",
+    "vue-template-es2015-compiler": "^1.2.2"
   },
   "peerDependencies": {
     "css-loader": "*"

From 7b10a0935e252a0040a6fd93f36b7fdd61074759 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 12 Nov 2016 10:26:28 -0500
Subject: [PATCH 385/877] docs about the templateBuble option

---
 docs/en/features/es2015.md |  2 ++
 docs/en/options.md         | 45 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index f1891bc27..21e5873e1 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -45,6 +45,8 @@ can be simplified to:
 <div :class="{ active, [`${prefix}-button`]: isButton }">
 ```
 
+You can also customize the features supported in tempaltes using the [`templateBuble` option](../options.md#templatebuble).
+
 ### Transpiling Normal `.js` Files
 
 Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.
diff --git a/docs/en/options.md b/docs/en/options.md
index ee08ff1a9..aa51eaad8 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -126,3 +126,48 @@ module.exports = {
     }
   }
   ```
+
+### templateBuble
+
+- type: `Object`
+- default:
+  ``` js
+  {
+    target: { chrome: 52 },
+    transforms: {
+      stripWith: true, // vue only
+      computedProperty: true,
+      conciseMethodProperty: true,
+      templateString: true
+    }
+  }
+  ```
+
+  Configure options for a [Buble](https://buble.surge.sh/) transpile pass applied to raw render functions. The purpose of this additional pass is to:
+
+  1. add selective support to a few ES2015 features that are handy in template expressions (whitelisted in default transforms);
+
+  2. remove the `with` block inside render functions to make it strict-mode compliant and a bit more performant. This is enabled by the custom `stripWith` transform, and applied only at build time so that the base template compiler can be extremely small and lightweight.
+
+  With this option you can turn on additional [transforms](https://buble.surge.sh/guide/#supported-features) (e.g. arrow functions) or turn off `with` removal based on your specific needs. Example config with Webpack 2:
+
+  ``` js
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          templateBuble: {
+            objectAssign: 'Object.assign',
+            // transforms object is merged with the defaults
+            transforms: {
+              stripWith: false,
+              arrow: true
+            }
+          }
+        }
+      }
+    ]
+  }
+  ```

From 8d2373223bbceab7414046a679c5e1ba04095cf4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 12 Nov 2016 10:26:33 -0500
Subject: [PATCH 386/877] 9.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b5da30a50..934122b56 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.8.1",
+  "version": "9.9.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 172b11c888451d565131812cf90f5bdae1d00575 Mon Sep 17 00:00:00 2001
From: Krisztian Horvath <horvatkrisz@gmail.com>
Date: Mon, 14 Nov 2016 22:17:03 +0100
Subject: [PATCH 387/877] [Fix for Webpack 2 Beta 26+] Explicitly declare
 inferred loaders by their full name (#464)

* In Webpack 2 loaders have to be explicitly declared, the "-loader" part of their name is no longer implied.
---
 lib/loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 3cc485045..ac16b2667 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -149,12 +149,12 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templateLoaderPath + '?raw-loader&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + rewriter + lang + '!'
+          return loader + '!' + rewriter + lang + '-loader!'
         case 'script':
-          return injectString + lang + '!'
+          return injectString + lang + '-loader!'
       }
     }
   }

From b7fece0f5b520f14b542663bc169bb60e147d8a5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 14 Nov 2016 16:32:19 -0500
Subject: [PATCH 388/877] 9.9.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 934122b56..2260d1c04 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.9.0",
+  "version": "9.9.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From b9eafc60aaadf71f3c4025eede9cf646e0d4d7d2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 10:00:18 -0500
Subject: [PATCH 389/877] fix template lang (fix #466)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index ac16b2667..ab362b875 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -149,7 +149,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templateLoaderPath + '?raw-loader&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
           return loader + '!' + rewriter + lang + '-loader!'

From 113f6b408e3de4234648774e9542e174ee1773d8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 10:00:21 -0500
Subject: [PATCH 390/877] 9.9.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2260d1c04..cb8b4fbc6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.9.1",
+  "version": "9.9.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 86b54f2973a3b7dd3705f624185488640758f1e9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 10:02:59 -0500
Subject: [PATCH 391/877] avoid duplicate -loader for custom langs

---
 lib/loader.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index ab362b875..294acec0b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -152,13 +152,21 @@ module.exports = function (content) {
           return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + rewriter + lang + '-loader!'
+          return loader + '!' + rewriter + ensureBang(ensureLoader(lang))
         case 'script':
-          return injectString + lang + '-loader!'
+          return injectString + ensureBang(ensureLoader(lang))
       }
     }
   }
 
+  function ensureLoader (lang) {
+    if (!/-loader$/.test(lang)) {
+      return lang + '-loader'
+    } else {
+      return lang
+    }
+  }
+
   function getSelectorString (type, index) {
     return selectorPath +
       '?type=' + type +

From 261bd07bfc7892616cbfeb5cfab57917bc48f116 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 10:03:03 -0500
Subject: [PATCH 392/877] 9.9.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb8b4fbc6..6ef21fdaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.9.2",
+  "version": "9.9.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From ddc233114919ff7cd147355378c7f01464db499e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 20:43:21 -0500
Subject: [PATCH 393/877] fix support for inline loader requests (fix #469)

---
 lib/loader.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 294acec0b..a19bc191e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -159,12 +159,15 @@ module.exports = function (content) {
     }
   }
 
+  // sass => sass-loader
+  // sass-loader => sass-loader
+  // sass?indentedsyntax!css => sass-loader?indentedSyntax!css-loader
   function ensureLoader (lang) {
-    if (!/-loader$/.test(lang)) {
-      return lang + '-loader'
-    } else {
-      return lang
-    }
+    return lang.split('!').map(loader => {
+      return loader.replace(/^([\w-]+)(\?.*)?/, (_, $1, $2) => {
+        return (/-loader$/.test($1) ? $1 : ($1 + '-loader')) + ($2 || '')
+      })
+    }).join('!')
   }
 
   function getSelectorString (type, index) {

From 2f0e231b1e95204f57507528f5904ea62f28aad8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 20:43:30 -0500
Subject: [PATCH 394/877] 9.9.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6ef21fdaf..aacf5fb50 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.9.3",
+  "version": "9.9.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 3b3b5bf9b8758bf2a52b67e93538129829ce643e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 20:47:50 -0500
Subject: [PATCH 395/877] use plain functions

---
 lib/loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index a19bc191e..70d34651e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -163,9 +163,9 @@ module.exports = function (content) {
   // sass-loader => sass-loader
   // sass?indentedsyntax!css => sass-loader?indentedSyntax!css-loader
   function ensureLoader (lang) {
-    return lang.split('!').map(loader => {
-      return loader.replace(/^([\w-]+)(\?.*)?/, (_, $1, $2) => {
-        return (/-loader$/.test($1) ? $1 : ($1 + '-loader')) + ($2 || '')
+    return lang.split('!').map(function (loader) {
+      return loader.replace(/^([\w-]+)(\?.*)?/, function (_, name, query) {
+        return (/-loader$/.test(name) ? name : (name + '-loader')) + (query || '')
       })
     }).join('!')
   }

From ed486cb5c6bec7062a66195ca831e63d6d75a426 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 15 Nov 2016 20:47:55 -0500
Subject: [PATCH 396/877] 9.9.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aacf5fb50..cc617c6b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.9.4",
+  "version": "9.9.5",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From d71a52c8abc65cfb42c4025dcc6920ddb99ef9f5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 18 Nov 2016 12:22:12 -0500
Subject: [PATCH 397/877] improve spec

---
 docs/en/start/spec.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index c69b6ebf2..c63f3cba0 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -44,15 +44,15 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - Each `*.vue` file can contain at most one `<template>` block at a time.
 
-- Contents will be extracted as a string and used as the `template` option for the compiled Vue component. 
+- Contents will be extracted as a string and used as the `template` option for the compiled Vue component.
 
 #### `<script>`
 
-- Default language: `js` (ES2015 is supported by default via Babel).
+- Default language: `js` (ES2015 is supported automatically if `babel-loader` or `buble-loader` is detected).
 
 - Each `*.vue` file can contain at most one `<script>` block at a time.
 
-- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via Webpack), which means you can `require()` other dependencies. And because ES2015 is supported by default, you can also use ES2015 `import` and `export` syntax.
+- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via Webpack), which means you can `require()` other dependencies. And with ES2015 support, you can also use the `import` and `export` syntax.
 
 - The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
 
@@ -62,6 +62,8 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - Multiple `<style>` tags are supported in a single `*.vue` file.
 
+- A `<style>` tag can have `scoped` or `module` attributes (see [Scoped CSS](../features/scoped-css.md) and [CSS Modules](../features/css-modules.md)) to help encapsulating the styles to the current component. Multiple `<style>` tags with different encapsulation modes can be mixed in the same component.
+
 - By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
 
 ### Src Imports

From 826f444b9a8ebc91c18f6ee44790de30161e0d12 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Nov 2016 11:33:57 -0500
Subject: [PATCH 398/877] make vue-template-compiler a peer dep

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index cc617c6b8..87464c525 100644
--- a/package.json
+++ b/package.json
@@ -40,11 +40,11 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.0.5",
     "vue-template-es2015-compiler": "^1.2.2"
   },
   "peerDependencies": {
-    "css-loader": "*"
+    "css-loader": "*",
+    "vue-template-compiler": "^2.0.0"
   },
   "devDependencies": {
     "babel-core": "^6.8.0",

From d0fd27acb1588aa1abde832ecff670ed1cb5338f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Nov 2016 11:34:06 -0500
Subject: [PATCH 399/877] merge buble/templateBuble options

---
 docs/en/features/es2015.md | 27 +++++++++++++-------
 docs/en/options.md         | 50 ++++++++++++--------------------------
 lib/template-compiler.js   |  2 +-
 3 files changed, 35 insertions(+), 44 deletions(-)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index 21e5873e1..80fc3d19d 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -26,14 +26,7 @@ We are using ES2015's Object literal shorthand here to define the child componen
 
 ### ES2015 in Templates
 
-Note that expressions inside `<template>`s do not get processed by the same Babel (or Buble) configuration like the `<script>` parts, because some ES2015 features cannot be compiled into render-function-friendly code. However, `vue-loader` does process the generated render function to selectively support a few convenient ES2015 features:
-
-- [Template string interpolation](http://es6-features.org/#StringInterpolation)
-- [Object property shorthand](http://es6-features.org/#PropertyShorthand)
-- [Object method shorthand](http://es6-features.org/#MethodProperties)
-- [Computed property names](http://es6-features.org/#ComputedPropertyNames)
-
-These features are quite convenient in dynamic class bindings, for example:
+`<template>` in `*.vue` files are compiled into JavaScript render functions and then processed by a custom build of [Buble](https://buble.surge.sh/guide/) to support ES2015 features. This allows you to use features such as [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) and [computed properties](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
 
 ``` html
 <div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
@@ -45,7 +38,23 @@ can be simplified to:
 <div :class="{ active, [`${prefix}-button`]: isButton }">
 ```
 
-You can also customize the features supported in tempaltes using the [`templateBuble` option](../options.md#templatebuble).
+**vue@^2.1.0 only:** You can even use parameter destructuring with `v-for` or scoped slots:
+
+``` html
+<li v-for="{ id, text } in items">
+  {{ id }} {{ text }}
+</li>
+```
+
+``` html
+<my-component>
+  <template scope="{ id, text }">
+    <span>{{ id }} {{ text }}</span>
+  </template>
+</my-component>
+```
+
+You can also customize the features supported in tempaltes using the [`buble` option](../options.md#buble).
 
 ### Transpiling Normal `.js` Files
 
diff --git a/docs/en/options.md b/docs/en/options.md
index aa51eaad8..4a347fef0 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -117,54 +117,36 @@ module.exports = {
 - type: `Object`
 - default: `{}`
 
-  Configure options for `buble-loader` (if present). For example, to enable Object spread operator:
+  Configure options for `buble-loader` (if present), AND the buble compilation pass for template render functions.
+
+  The template render functions compilation supports a special transform `stripWith` (enabled by default), which removes the `with` usage in generated render functions to make them strict-mode compliant.
+
+  Example configuration:
 
   ``` js
+  // webpack 1
   vue: {
     buble: {
-      objectAssign: 'Object.assign'
-    }
-  }
-  ```
-
-### templateBuble
+      // enable object spread operator
+      // NOTE: you need to provide Object.assign polyfill yourself!
+      objectAssign: 'Object.assign',
 
-- type: `Object`
-- default:
-  ``` js
-  {
-    target: { chrome: 52 },
-    transforms: {
-      stripWith: true, // vue only
-      computedProperty: true,
-      conciseMethodProperty: true,
-      templateString: true
+      // turn off the `with` removal
+      transforms: {
+        stripWith: false
+      }
     }
   }
-  ```
-
-  Configure options for a [Buble](https://buble.surge.sh/) transpile pass applied to raw render functions. The purpose of this additional pass is to:
-
-  1. add selective support to a few ES2015 features that are handy in template expressions (whitelisted in default transforms);
 
-  2. remove the `with` block inside render functions to make it strict-mode compliant and a bit more performant. This is enabled by the custom `stripWith` transform, and applied only at build time so that the base template compiler can be extremely small and lightweight.
-
-  With this option you can turn on additional [transforms](https://buble.surge.sh/guide/#supported-features) (e.g. arrow functions) or turn off `with` removal based on your specific needs. Example config with Webpack 2:
-
-  ``` js
+  // webpack 2
   module: {
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue',
         options: {
-          templateBuble: {
-            objectAssign: 'Object.assign',
-            // transforms object is merged with the defaults
-            transforms: {
-              stripWith: false,
-              arrow: true
-            }
+          buble: {
+            // same options
           }
         }
       }
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index e0d5c0def..ea85f3fea 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -71,7 +71,7 @@ module.exports = function (html) {
     code = transpile('module.exports={' +
       'render:' + toFunction(compiled.render) + ',' +
       'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-    '}', vueOptions.templateBuble)
+    '}', vueOptions.buble)
   }
   // hot-reload
   if (!isServer &&

From 5254537addbd89bc946d368aba5a1498bcd68147 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Nov 2016 11:34:11 -0500
Subject: [PATCH 400/877] 10.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 87464c525..2de42e191 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "9.9.5",
+  "version": "10.0.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 2903828f2502fe64443a2e976c4ceec946c82402 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 21 Nov 2016 11:59:51 -0500
Subject: [PATCH 401/877] add version notice

---
 docs/en/options.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/en/options.md b/docs/en/options.md
index 4a347fef0..6789e7c71 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -119,6 +119,8 @@ module.exports = {
 
   Configure options for `buble-loader` (if present), AND the buble compilation pass for template render functions.
 
+  > version note: in version 9.x, the template expressions are configured separately via the now removed `templateBuble` option.
+
   The template render functions compilation supports a special transform `stripWith` (enabled by default), which removes the `with` usage in generated render functions to make them strict-mode compliant.
 
   Example configuration:

From 7bd9dd87eea9cd958f7732e1658d3c39cdf16571 Mon Sep 17 00:00:00 2001
From: panshao <1016432619@qq.com>
Date: Tue, 22 Nov 2016 11:19:14 +0800
Subject: [PATCH 402/877] module="a"  => this.a

when i test , i add a keyword `module = "a"` to the style, i find that it is on the instance with `a` not `$a`
---
 docs/en/features/css-modules.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index 2e825c371..a4553986a 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -66,11 +66,11 @@ You can have more than one `<style>` tags in a single `*.vue` component. To avoi
 
 ``` html
 <style module="a">
-  /* identifiers injected as $a */
+  /* identifiers injected as a */
 </style>
 
 <style module="b">
-  /* identifiers injected as $b */
+  /* identifiers injected as b */
 </style>
 ```
 

From c4974f6ebd7914ece530883ba7ca3a238ea1ebb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Tue, 22 Nov 2016 11:50:00 +0100
Subject: [PATCH 403/877] update Postcss example for Webpack 2

---
 docs/en/features/postcss.md | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index 9a6d9b03d..4dbd8e1b7 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -20,15 +20,22 @@ For Webpack 2.x:
 ``` js
 // webpack.config.js
 module.exports = {
-  // other configs...
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      vue: {
-        // use custom postcss plugins
-        postcss: [require('postcss-cssnext')()]
+  // other options...
+  module: {
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        // vue-loader options goes here
+        options: {
+          // ...
+          postcss: [require('postcss-cssnext')()]
+          }
+        }
       }
-    })
-  ]
+    ]
+  }
 }
 ```
 

From 26bf5533cb09a37fd72c8f623f3cf6200ad6cfee Mon Sep 17 00:00:00 2001
From: liang feng <anhulife@gmail.com>
Date: Wed, 23 Nov 2016 16:22:23 +0800
Subject: [PATCH 404/877] amend css-loader's url

---
 docs/en/features/css-modules.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index 2e825c371..bc7a07b4c 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -76,7 +76,7 @@ You can have more than one `<style>` tags in a single `*.vue` component. To avoi
 
 ### Configuring `css-loader` Query
 
-CSS Modules are processed via [css-loader](ttps://github.com/webpack/css-loader). With `<style module>`, the default query used for `css-loader` is:
+CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader). With `<style module>`, the default query used for `css-loader` is:
 
 ``` js
 {

From 64b3d1317efb040f7a38ca7224910648f2422c83 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 23 Nov 2016 17:59:36 -0500
Subject: [PATCH 405/877] mark render functions with _withStripped in dev mode

---
 lib/template-compiler.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index ea85f3fea..8870631f8 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -47,6 +47,7 @@ function rewrite (attr, name) {
 
 module.exports = function (html) {
   this.cacheable()
+  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
   var query = loaderUtils.parseQuery(this.query)
   var isServer = this.options.target === 'node'
   var vueOptions = this.options.__vueOptions__
@@ -68,10 +69,19 @@ module.exports = function (html) {
     })
     code = 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
+    var bubleOptions = vueOptions.buble
     code = transpile('module.exports={' +
       'render:' + toFunction(compiled.render) + ',' +
       'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-    '}', vueOptions.buble)
+    '}', bubleOptions)
+    // mark with stripped (this enables Vue to use correct runtime proxy detection)
+    if (!isProduction && (
+      !bubleOptions ||
+      !bubleOptions.transforms ||
+      bubleOptions.transforms.stripWith !== false
+    )) {
+      code += `\nmodule.exports.render._withStripped = true`
+    }
   }
   // hot-reload
   if (!isServer &&

From 92d97a60e84ef5b96ea27aba71e44953ca369551 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 23 Nov 2016 17:59:39 -0500
Subject: [PATCH 406/877] 10.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2de42e191..2b7c4c7ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 0843d40676bde960bed5923f68ace9fe4f1be2e9 Mon Sep 17 00:00:00 2001
From: Andre Asselin <andre.asselin@pointsource.com>
Date: Fri, 25 Nov 2016 15:28:30 -0500
Subject: [PATCH 407/877] Normalize line endings to LF for unit tests

---
 package.json | 1 +
 test/test.js | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/package.json b/package.json
index 2b7c4c7ad..0730b2627 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
+    "normalize-newline": "^3.0.0",
     "postcss": "^5.0.21",
     "pug": "^2.0.0-beta6",
     "rimraf": "^2.4.0",
diff --git a/test/test.js b/test/test.js
index c564f9b69..5cd482d88 100644
--- a/test/test.js
+++ b/test/test.js
@@ -10,6 +10,7 @@ var genId = require('../lib/gen-id')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('../lib/template-compiler')
+var normalizeNewline = require('normalize-newline')
 
 var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
 var mfs = new MemoryFS()
@@ -103,6 +104,7 @@ describe('vue-loader', function () {
 
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
       expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
       done()
     })
@@ -161,6 +163,7 @@ describe('vue-loader', function () {
       expect(vnode.children[4][0].data.staticClass).to.equal('test')
 
       var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
       expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
       expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
       expect(style).to.contain('h1[' + id + '] {\n  color: green;\n}')
@@ -235,6 +238,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/media-query.vue'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
       var id = 'data-v-' + genId(require.resolve('./fixtures/media-query.vue'))
       expect(style).to.contain('@media print {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
       done()
@@ -255,6 +259,7 @@ describe('vue-loader', function () {
       ]
     }), function () {
       var css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
       expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
       done()
     })
@@ -322,6 +327,7 @@ describe('vue-loader', function () {
       }
     }, function (window) {
       var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
       expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
       done()
     })
@@ -398,6 +404,7 @@ describe('vue-loader', function () {
         var style = [].slice.call(window.document.querySelectorAll('style')).map(function (style) {
           return style.textContent
         }).join('\n')
+        style = normalizeNewline(style)
         expect(style).to.contain('.' + className + ' {\n  color: red;\n}')
 
         // animation name

From 612c40aff8fa66db8a24a098452504e668e1b21d Mon Sep 17 00:00:00 2001
From: Andre Asselin <andre.asselin@pointsource.com>
Date: Fri, 25 Nov 2016 15:35:32 -0500
Subject: [PATCH 408/877] Fix bug in RE that specifies the format of scoped
 identifier Discovered when fixing unit tests to pass on Windows

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 5cd482d88..817b7865d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -424,7 +424,7 @@ describe('vue-loader', function () {
       })
     }
     // default localIdentName
-    testWithIdent(undefined, /^_\w{22}/, function () {
+    testWithIdent(undefined, /^\w{23}/, function () {
       // specified localIdentName
       var ident = '[path][name]---[local]---[hash:base64:5]'
       var regex = /^test-fixtures-css-modules---red---\w{5}/

From 56d0e7bb8598b29b59411dd99e4dd5a8dc908a0e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 26 Nov 2016 23:12:42 -0500
Subject: [PATCH 409/877] update readme note

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c10c312aa..3e5a37f2c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 > Vue.js component loader for [Webpack](http://webpack.github.io).
 
-**NOTE: the master branch now hosts 9.x which only works with Vue 2.0. For version 8.x which works with Vue 1.x, see the [8.x branch](https://github.com/vuejs/vue-loader/tree/8.x).**
+**NOTE: the master branch (9.0+) only works with Vue 2.x. For usage with Vue 1.x, see the [8.x branch](https://github.com/vuejs/vue-loader/tree/8.x).**
 
 It allows you to write your components in this format:
 

From c323cf7652a79ca8fc0e3ffa79d404977966b27c Mon Sep 17 00:00:00 2001
From: Scott Leung <scottleung@qq.com>
Date: Mon, 28 Nov 2016 23:16:12 +0800
Subject: [PATCH 410/877] fix typos in css-modules.md (#479)

---
 docs/en/features/css-modules.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index 6f9e16466..09ebb20ad 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -90,7 +90,7 @@ You can use vue-loader
 s `cssModules` option to provide additional query options to `css-loader`:
 
 ``` js
-// wepback 1
+// webpack 1
 vue: {
   cssModules: {
     // overwrite local ident name

From 912ec9c14cf7b44b03fdfaabf7995b4c5f149350 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 Nov 2016 10:54:48 -0500
Subject: [PATCH 411/877] update tests to use Webpack 2

---
 lib/loader.js |  2 +-
 package.json  | 17 ++++++++++-------
 test/test.js  | 21 ++++++++++++++++-----
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 70d34651e..77d1a7854 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -129,7 +129,7 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
-    var injectString = (type === 'script' && query.inject) ? 'inject!' : ''
+    var injectString = (type === 'script' && query.inject) ? 'inject-loader!' : ''
     if (loader !== undefined) {
       // add css modules
       if (type === 'styles') {
diff --git a/package.json b/package.json
index 0730b2627..3d5a06e37 100644
--- a/package.json
+++ b/package.json
@@ -53,27 +53,30 @@
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
-    "css-loader": "^0.23.1",
+    "css-loader": "^0.26.0",
     "eslint": "^2.9.0",
     "eslint-config-vue": "^1.0.0",
     "eslint-plugin-html": "^1.5.2",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.5",
-    "inject-loader": "^2.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-beta.4",
+    "file-loader": "^0.9.0",
+    "inject-loader": "^2.0.0",
     "jsdom": "^9.2.1",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.2.5",
     "node-libs-browser": "^1.0.0",
+    "mocha": "^3.2.0",
+    "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",
     "postcss": "^5.0.21",
     "pug": "^2.0.0-beta6",
     "rimraf": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
-    "sugarss": "^0.1.3",
-    "vue": "^2.0.4",
-    "webpack": "^1.12.2"
+    "sugarss": "^0.2.0",
+    "vue": "^2.1.0",
+    "vue-template-compiler": "^2.1.0",
+    "webpack": "^2.1.0-beta.27"
   }
 }
diff --git a/test/test.js b/test/test.js
index 817b7865d..a9eea3d9f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -12,7 +12,7 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
 
-var loaderPath = 'expose?vueModule!' + path.resolve(__dirname, '../')
+var loaderPath = 'expose-loader?vueModule!' + path.resolve(__dirname, '../index.js')
 var mfs = new MemoryFS()
 var globalConfig = {
   output: {
@@ -20,7 +20,7 @@ var globalConfig = {
     filename: 'test.build.js'
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
         loader: loaderPath
@@ -30,7 +30,17 @@ var globalConfig = {
 }
 
 function bundle (options, cb) {
+  var vueOptions = options.vue
+  delete options.vue
   var config = Object.assign({}, globalConfig, options)
+
+  // assign vue Options
+  if (vueOptions) {
+    config.plugins = (config.plugins || []).concat(new webpack.LoaderOptionsPlugin({
+      vue: vueOptions
+    }))
+  }
+
   var webpackCompiler = webpack(config)
   webpackCompiler.outputFileSystem = mfs
   webpackCompiler.run(function (err, stats) {
@@ -250,8 +260,8 @@ describe('vue-loader', function () {
       entry: './test/fixtures/extract-css.vue',
       vue: {
         loaders: {
-          css: ExtractTextPlugin.extract('css'),
-          stylus: ExtractTextPlugin.extract('css?sourceMap!stylus')
+          css: ExtractTextPlugin.extract('css-loader'),
+          stylus: ExtractTextPlugin.extract('css-loader?sourceMap!stylus-loader')
         }
       },
       plugins: [
@@ -269,6 +279,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/inject.js'
     }, function (window) {
+      // console.log(window.injector.toString())
       var module = interopDefault(window.injector({
         './service': {
           msg: 'Hello from mocked service!'
@@ -292,7 +303,7 @@ describe('vue-loader', function () {
         }
       },
       module: {
-        loaders: [
+        rules: [
           { test: /\.vue$/, loader: loaderPath },
           { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
         ]

From c3a1e2fc9cab0fb7f94303f0fb0e066222c09515 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 Nov 2016 10:56:21 -0500
Subject: [PATCH 412/877] add note about inject-loader version

---
 docs/en/workflow/testing-with-mocks.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/en/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
index 10ee2fbe5..b1a17838f 100644
--- a/docs/en/workflow/testing-with-mocks.md
+++ b/docs/en/workflow/testing-with-mocks.md
@@ -28,8 +28,10 @@ export default {
 
 Here's how to import it with mocks:
 
+> Note: inject-loader@3.x is currently unstable.
+
 ``` bash
-npm install inject-loader --save-dev
+npm install inject-loader@^2.0.0 --save-dev
 ```
 
 ``` js

From 168a3f11dabb78119c66d40713fb47fc6839a4ce Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 Nov 2016 10:58:38 -0500
Subject: [PATCH 413/877] 10.0.2

---
 package.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3d5a06e37..9a547412d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.0.1",
+  "version": "10.0.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {
@@ -64,8 +64,6 @@
     "jsdom": "^9.2.1",
     "memory-fs": "^0.3.0",
     "mkdirp": "^0.5.1",
-    "mocha": "^2.2.5",
-    "node-libs-browser": "^1.0.0",
     "mocha": "^3.2.0",
     "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",

From 39978d8df2ebd2b299d523f552c96ca6ffe82679 Mon Sep 17 00:00:00 2001
From: Blake Newman <blakenoodles@gmail.com>
Date: Fri, 9 Dec 2016 18:16:20 +0000
Subject: [PATCH 414/877] Change check for functional components for use with
 templates (#390)

---
 lib/loader.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 77d1a7854..0b482a469 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -310,13 +310,13 @@ module.exports = function (content) {
         '  }\n' +
         '})()}\n'
     }
-    // check functional
+    // check functional components used with templates
     if (!isProduction) {
       output +=
-        'if (__vue_options__.functional) {console.error("' +
-          '[vue-loader] ' + fileName + ': functional components are not ' +
-          'supported and should be defined in plain js files using render ' +
-          'functions.' +
+        'if (__vue_options__.functional && typeof __vue_template__ !== "undefined") {' +
+          'console.error("' +
+          `[vue-loader] ${fileName}: functional components are not ` +
+          'supported with templates, they should use render functions.' +
         '")}\n'
     }
     // final export

From 39f471c0e629df18e3b87a0fce76ccad4ee682da Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Wed, 14 Dec 2016 17:30:34 +0900
Subject: [PATCH 415/877] Add Korean language and translate introduction

---
 docs/LANGS.md                            |   1 +
 docs/ko/README.md                        |  37 ++++++
 docs/ko/SUMMARY.md                       |  20 +++
 docs/ko/configurations/advanced.md       |  56 ++++++++
 docs/ko/configurations/asset-url.md      |  23 ++++
 docs/ko/configurations/extract-css.md    |  70 ++++++++++
 docs/ko/configurations/pre-processors.md |  62 +++++++++
 docs/ko/features/css-modules.md          | 118 +++++++++++++++++
 docs/ko/features/es2015.md               |  65 ++++++++++
 docs/ko/features/hot-reload.md           |   7 +
 docs/ko/features/postcss.md              |  55 ++++++++
 docs/ko/features/scoped-css.md           |  51 ++++++++
 docs/ko/options.md                       | 157 +++++++++++++++++++++++
 docs/ko/start/setup.md                   |  17 +++
 docs/ko/start/spec.md                    |  92 +++++++++++++
 docs/ko/workflow/linting.md              |  93 ++++++++++++++
 docs/ko/workflow/production.md           |  39 ++++++
 docs/ko/workflow/testing-with-mocks.md   |  70 ++++++++++
 docs/ko/workflow/testing.md              | 101 +++++++++++++++
 19 files changed, 1134 insertions(+)
 create mode 100644 docs/ko/README.md
 create mode 100644 docs/ko/SUMMARY.md
 create mode 100644 docs/ko/configurations/advanced.md
 create mode 100644 docs/ko/configurations/asset-url.md
 create mode 100644 docs/ko/configurations/extract-css.md
 create mode 100644 docs/ko/configurations/pre-processors.md
 create mode 100644 docs/ko/features/css-modules.md
 create mode 100644 docs/ko/features/es2015.md
 create mode 100644 docs/ko/features/hot-reload.md
 create mode 100644 docs/ko/features/postcss.md
 create mode 100644 docs/ko/features/scoped-css.md
 create mode 100644 docs/ko/options.md
 create mode 100644 docs/ko/start/setup.md
 create mode 100644 docs/ko/start/spec.md
 create mode 100644 docs/ko/workflow/linting.md
 create mode 100644 docs/ko/workflow/production.md
 create mode 100644 docs/ko/workflow/testing-with-mocks.md
 create mode 100644 docs/ko/workflow/testing.md

diff --git a/docs/LANGS.md b/docs/LANGS.md
index 25b60e8a0..00ad8924e 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1 +1,2 @@
 * [English](en/)
+* [한국어](ko/)
diff --git a/docs/ko/README.md b/docs/ko/README.md
new file mode 100644
index 000000000..35881e16a
--- /dev/null
+++ b/docs/ko/README.md
@@ -0,0 +1,37 @@
+# 소개
+
+### `vue-loader`는 무엇인가요?
+
+`vue-loader`는 다음과 같은 형태로 작성된 Vue 컴포넌트를 일반적인 자바스크립트 모듈로 변환할 수 있는 Webpack 로더입니다.
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+다음은 `vue-loader`가 제공하는 여러가지 유용한 기능입니다.
+
+- 기본적으로 ES2015를 지원합니다.
+- Vue 컴포넌트 각 요소에 따라 서로 다른 Webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 SASS, `<template>`에 Jade로 각각 설정 가능합니다.
+- `<style>`과 `<template>`에서 참조된 정적 Asset 파일을 모듈로 취급하고 Webpack 로더로 처리합니다.
+- 각 컴포넌트마다 지정된 CSS를 시뮬레이트 할 수 있습니다.
+- 개발 중에 컴포넌트 hot-reloading을 지원합니다.
+
+한 마디로 Webpack과 `vue-loader`의 결합은 Vue.js 어플리케이션을 제작하기위한 현대적이고 유연하며 매우 강력한 작업환경을 제공합니다.
+
+### Webpack이 뭔가요?
+
+이미 Webpack에 익숙하다면 이 설명을 건너뛰어도 됩니다. 하지만 Webpack을 처음 사용하는 사람들에게는 다음과 같은 간단한 소개를 읽어보세요.
+
+[Webpack](http://webpack.github.io/)은 모듈의 묶음입니다. 각 파일을 모듈로 간주하고 파일 간의 종속성을 파악한 다음 정적 Asset으로 묶어서 배포합니다.
+
+![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+
+간단한 예를 들어보자면, 우리가 많은 CommonJS 모듈을 가지고 있다고 가정해봅시다. 모듈들은 브라우저 내부에서 바로 실행될 수 없기에 `<script>` 태그를 통해 불러올 수 있도록 하나의 파일로 "묶어"야 합니다. Webpack은 `require()` 호출을 통해 의존되어 있는 각 파일을 하나로 묶을 수 있습니다.
+
+여기서 Webpack은 묶는일 외에도 더 많은 일을 할 수 있습니다. "로더들"을 사용하면 최종 Bundle(묶음)을 출력하기 전에 원하는 방식으로 모든 유형의 파일을 변환할 수 있도록 Webpack에 지시할 수 있습니다. 몇 가지 예를 봅시다.
+
+- ES2015 또는 CoffeeScript, TypeScript 모듈을 ES5 CommonJS 모듈로 변환
+- Optionally you can pipe the source code through a linter before doing the compilation;
+- Jade 템플릿을 일반 HTML로 변경하고 Javascript 문자열로 반환합니다.
+- SASS 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 Javascript 스니펫으로 변환합니다.
+- HTML 또는 CSS에서 참조된 이미지 파일을 처리하고 경로 구성에 따라 이동한 후 md5 해시를 사용하여 이름을 지정합니다.
+
+Webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 단점은 장황하고 복잡한 구성입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 Webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
\ No newline at end of file
diff --git a/docs/ko/SUMMARY.md b/docs/ko/SUMMARY.md
new file mode 100644
index 000000000..96dd8c380
--- /dev/null
+++ b/docs/ko/SUMMARY.md
@@ -0,0 +1,20 @@
+- Getting Started
+  - [Vue Component Spec](start/spec.md)
+  - [Setting Up a Project](start/setup.md)
+- Features
+  - [ES2015](features/es2015.md)
+  - [Scoped CSS](features/scoped-css.md)
+  - [CSS Modules](features/css-modules.md)
+  - [PostCSS](features/postcss.md)
+  - [Hot Reload](features/hot-reload.md)
+- Configurations
+  - [Pre-Processors](configurations/pre-processors.md)
+  - [Asset URL Handling](configurations/asset-url.md)
+  - [Advanced Loader Configuration](configurations/advanced.md)
+  - [Extracting CSS File](configurations/extract-css.md)
+- Workflow
+  - [Production Build](workflow/production.md)
+  - [Linting](workflow/linting.md)
+  - [Testing](workflow/testing.md)
+  - [Testing with Mocks](workflow/testing-with-mocks.md)
+- [Options Reference](options.md)
diff --git a/docs/ko/configurations/advanced.md b/docs/ko/configurations/advanced.md
new file mode 100644
index 000000000..749c42b0f
--- /dev/null
+++ b/docs/ko/configurations/advanced.md
@@ -0,0 +1,56 @@
+# Advanced Loader Configuration
+
+Sometimes you may want to apply a custom loader string to a language instead of letting `vue-loader` infer it. Or you may simply want to overwrite the built-in loader configuration for the default languages. To do that, add a `vue` block in your Webpack config file, and specify the `loaders` option.
+
+### Webpack 1.x
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // vue-loader configurations
+  vue: {
+    // ... other vue options
+    loaders: {
+      // load all <script> without "lang" attribute with coffee-loader
+      js: 'coffee',
+      // load <template> directly as HTML string, without piping it
+      // through vue-html-loader first
+      html: 'raw'
+    }
+  }
+}
+```
+
+### Webpack 2.x (^2.1.0-beta.25)
+
+``` js
+module.exports = {
+  // other options...
+  module: {
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        // vue-loader options goes here
+        options: {
+          loaders: {
+            // ...
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+A more practical usage of the advanced loader configuration is [extracting CSS inside components into a single file](./extract-css.md).
diff --git a/docs/ko/configurations/asset-url.md b/docs/ko/configurations/asset-url.md
new file mode 100644
index 000000000..938e258fb
--- /dev/null
+++ b/docs/ko/configurations/asset-url.md
@@ -0,0 +1,23 @@
+# Asset URL Handling
+
+By default, `vue-loader` automatically processes your style and template files with [css-loader](https://github.com/webpack/css-loader) and the Vue template compiler. In this compilation process, all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+
+For example, `url(./image.png)` will be translated into `require('./image.png')`, and
+
+``` html
+<img src="../image.png">
+```
+
+will be compiled into:
+
+``` js
+createElement('img', { attrs: { src: require('../image.png') }})
+```
+
+Because `.png` is not a JavaScript file, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. The project scaffolded with `vue-cli` has also configured this for you.
+
+The benefits of all this are:
+
+1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreoever, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, Webpack will auto-rewrite the file paths into correct URLs in the bundled output.
+
+2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.
diff --git a/docs/ko/configurations/extract-css.md b/docs/ko/configurations/extract-css.md
new file mode 100644
index 000000000..b0701a04b
--- /dev/null
+++ b/docs/ko/configurations/extract-css.md
@@ -0,0 +1,70 @@
+# Extracting CSS into a Single File
+
+Example config to extract all the processed CSS in all Vue components into a single CSS file:
+
+### Webpack 1.x
+
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // you can also include <style lang="less"> or other langauges
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+### Webpack 2.x (^2.1.0-beta.25)
+
+``` bash
+npm install extract-text-webpack-plugin@2.x --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              loader: 'css-loader',
+              fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+            })
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
diff --git a/docs/ko/configurations/pre-processors.md b/docs/ko/configurations/pre-processors.md
new file mode 100644
index 000000000..dcc60e12f
--- /dev/null
+++ b/docs/ko/configurations/pre-processors.md
@@ -0,0 +1,62 @@
+# Using Pre-Processors
+
+In Webpack, all pre-processors need to be applied with a corresponding loader. `vue-loader` allows you to use other Webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
+
+### CSS
+
+For example, let's compile our `<style>` tag with SASS:
+
+``` bash
+npm install sass-loader node-sass --save-dev
+```
+
+``` html
+<style lang="sass">
+  /* write sass here */
+</style>
+```
+
+Under the hood, the text content inside the `<style>` tag will be first compiled by `sass-loader` before being passed on for further processing.
+
+### JavaScript
+
+All JavaScript inside Vue components are processed by `babel-loader` by default. But you can of course change it:
+
+``` bash
+npm install coffee-loader --save-dev
+```
+
+``` html
+<script lang="coffee">
+  # Write coffeescript!
+</script>
+```
+
+### Templates
+
+Processing templates is a little different, because most Webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we can just install the original `pug`:
+
+``` bash
+npm install pug --save-dev
+```
+
+``` html
+<template lang="pug">
+div
+  h1 Hello world!
+</template>
+```
+
+> **Important:** If you are using `vue-loader@<8.2.0`, you also need to install `template-html-loader`.
+
+### Inline Loader Requests
+
+You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) in the `lang` attribute:
+
+``` html
+<style lang="sass?outputStyle=expanded">
+  /* use sass here with expanded output */
+</style>
+```
+
+However, note this makes your Vue component Webpack-specific and not compatible with Browserify and [vueify](https://github.com/vuejs/vueify). **If you intend to ship your Vue component as a reusable 3rd-party component, avoid using this syntax.**
diff --git a/docs/ko/features/css-modules.md b/docs/ko/features/css-modules.md
new file mode 100644
index 000000000..09ebb20ad
--- /dev/null
+++ b/docs/ko/features/css-modules.md
@@ -0,0 +1,118 @@
+# CSS Modules
+
+> requires ^9.8.0
+
+[CSS Modules](https://github.com/css-modules/css-modules) is a popular system for modularizing and composing CSS. `vue-loader` provides first-class integration with CSS Modules as an alternative for simulated scoped CSS.
+
+### Usage
+
+Just add the `module` attribute to your `<style>`:
+
+``` html
+<style module>
+.red {
+  color: red;
+}
+.bold {
+  font-weight: bold;
+}
+</style>
+```
+
+This will turn on CSS Modules mode for `css-loader`, and the resulting class identifier object will be injected into the component as a computed property with the name `$style`. You can use it in your templates with a dynamic class binding:
+
+``` html
+<template>
+  <p :class="$style.red">
+    This should be red
+  </p>
+</template>
+```
+
+Since it's a computed property, it also works with the object/array syntax of `:class`:
+
+``` html
+<template>
+  <div>
+    <p :class="{ [$style.red]: isRed }">
+      Am I red?
+    </p>
+    <p :class="[$style.red, $style.bold]">
+      Red and bold
+    </p>
+  </div>
+</template>
+```
+
+And you can also access it from JavaScript:
+
+``` html
+<script>
+export default {
+  created () {
+    console.log(this.$style.red)
+    // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
+    // an identifier generated based on filename and className.
+  }
+}
+</script>
+```
+
+Refer to the [CSS Modules spec](https://github.com/css-modules/css-modules) for mode details such as [global exceptions](https://github.com/css-modules/css-modules#exceptions) and [composition](https://github.com/css-modules/css-modules#composition).
+
+### Custom Inject Name
+
+You can have more than one `<style>` tags in a single `*.vue` component. To avoid injected styles to overwrite each other, you can customize the name of the injected computed property by giving the `module` attribute a value:
+
+``` html
+<style module="a">
+  /* identifiers injected as a */
+</style>
+
+<style module="b">
+  /* identifiers injected as b */
+</style>
+```
+
+### Configuring `css-loader` Query
+
+CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader). With `<style module>`, the default query used for `css-loader` is:
+
+``` js
+{
+  modules: true,
+  importLoaders: true,
+  localIdentName: '[hash:base64]'
+}
+```
+
+You can use vue-loader
+s `cssModules` option to provide additional query options to `css-loader`:
+
+``` js
+// webpack 1
+vue: {
+  cssModules: {
+    // overwrite local ident name
+    localIdentName: '[path][name]---[local]---[hash:base64:5]',
+    // enable camelCase
+    camelCase: true
+  }
+}
+
+// webpack 2
+module: {
+  rules: [
+    {
+      test: '\.vue$',
+      loader: 'vue',
+      options: {
+        cssModules: {
+          localIdentName: '[path][name]---[local]---[hash:base64:5]',
+          camelCase: true
+        }
+      }
+    }
+  ]
+}
+```
diff --git a/docs/ko/features/es2015.md b/docs/ko/features/es2015.md
new file mode 100644
index 000000000..80fc3d19d
--- /dev/null
+++ b/docs/ko/features/es2015.md
@@ -0,0 +1,65 @@
+# ES2015
+
+When `vue-loader` detects the presence of `babel-loader` or `buble-loader` in the same project, it will use them to process the `<script>` parts of all `*.vue` files, allowing us to use ES2015 in our Vue components. If you haven't picked up the new language features yet, you definitely should. Some good learning resources:
+
+- [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+- [ES6 Features](https://github.com/lukehoban/es6features)
+- [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
+
+Here's a typical pattern you will see when importing other Vue components:
+
+``` html
+<script>
+import ComponentA from './ComponentA.vue'
+import ComponentB from './ComponentB.vue'
+
+export default {
+  components: {
+    ComponentA,
+    ComponentB
+  }
+}
+</script>
+```
+
+We are using ES2015's Object literal shorthand here to define the child components. `{ ComponentA }` is simply shorthand for `{ ComponentA: ComponentA }`. Vue will automatically convert the key to `component-a`, so you can use the imported component in the template as `<component-a>`.
+
+### ES2015 in Templates
+
+`<template>` in `*.vue` files are compiled into JavaScript render functions and then processed by a custom build of [Buble](https://buble.surge.sh/guide/) to support ES2015 features. This allows you to use features such as [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) and [computed properties](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
+
+``` html
+<div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
+```
+
+can be simplified to:
+
+``` html
+<div :class="{ active, [`${prefix}-button`]: isButton }">
+```
+
+**vue@^2.1.0 only:** You can even use parameter destructuring with `v-for` or scoped slots:
+
+``` html
+<li v-for="{ id, text } in items">
+  {{ id }} {{ text }}
+</li>
+```
+
+``` html
+<my-component>
+  <template scope="{ id, text }">
+    <span>{{ id }} {{ text }}</span>
+  </template>
+</my-component>
+```
+
+You can also customize the features supported in tempaltes using the [`buble` option](../options.md#buble).
+
+### Transpiling Normal `.js` Files
+
+Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.
+
+### Configuring Babel with `.babelrc`
+
+`babel-loader` respects [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), so it is the recommended approach to configure the Babel presets and plugins.
diff --git a/docs/ko/features/hot-reload.md b/docs/ko/features/hot-reload.md
new file mode 100644
index 000000000..6ce6f8389
--- /dev/null
+++ b/docs/ko/features/hot-reload.md
@@ -0,0 +1,7 @@
+# Hot Reload
+
+"Hot Reload" is not simply reloading the page when you edit a file. With hot reload enabled, when you edit a `*.vue` file, all instances of that component will be swapped in **without reloading the page**. It even preserves the current state of your app and these swapped components! This dramatically improves the development experience when you are tweaking the templates or styling of your components.
+
+![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
+
+When scaffolding the project with `vue-cli`, Hot Reload is enabled out-of-the-box.
diff --git a/docs/ko/features/postcss.md b/docs/ko/features/postcss.md
new file mode 100644
index 000000000..4dbd8e1b7
--- /dev/null
+++ b/docs/ko/features/postcss.md
@@ -0,0 +1,55 @@
+# PostCSS
+
+Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for scoped CSS rewriting. You can also add custom PostCSS plugins to the process, for example [autoprefixer](https://github.com/postcss/autoprefixer) or [CSSNext](http://cssnext.io/).
+
+Example usage in Webpack 1.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  vue: {
+    // use custom postcss plugins
+    postcss: [require('postcss-cssnext')()]
+  }
+}
+```
+
+For Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options...
+  module: {
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        // vue-loader options goes here
+        options: {
+          // ...
+          postcss: [require('postcss-cssnext')()]
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+In addition to providing an Array of plugins, the `postcss` option also accepts:
+
+- A function that returns an array of plugins;
+
+- An object that contains options to be passed to the PostCSS processor. This is useful when you are using PostCSS projects that relies on custom parser/stringifiers:
+
+  ``` js
+  postcss: {
+    plugins: [...], // list of plugins
+    options: {
+      parser: sugarss // use sugarss parser
+    }
+  }
+  ```
diff --git a/docs/ko/features/scoped-css.md b/docs/ko/features/scoped-css.md
new file mode 100644
index 000000000..4a1f19709
--- /dev/null
+++ b/docs/ko/features/scoped-css.md
@@ -0,0 +1,51 @@
+# Scoped CSS
+
+When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM. It comes with some caveats, but doesn't require any polyfills. It is achieved by using PostCSS to transform the following:
+
+``` html
+<style scoped>
+.example {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+Into the following:
+
+``` html
+<style>
+.example[_v-f3f3eg9] {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example" _v-f3f3eg9>hi</div>
+</template>
+```
+
+#### Notes
+
+1. You can include both scoped and non-scoped styles in the same component:
+
+  ``` html
+  <style>
+  /* global styles */
+  </style>
+
+  <style scoped>
+  /* local styles */
+  </style>
+  ```
+
+2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
+
+3. Partials are not affected by scoped styles.
+
+4. **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
+
+5. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
diff --git a/docs/ko/options.md b/docs/ko/options.md
new file mode 100644
index 000000000..6789e7c71
--- /dev/null
+++ b/docs/ko/options.md
@@ -0,0 +1,157 @@
+# Options Reference
+
+## Usage Difference Between Webpack 1 & 2
+
+For Webpack 1.x: add a root `vue` block in your Webpack config:
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader options
+  }
+}
+```
+
+For Webpack 2 (^2.1.0-beta.25):
+
+``` js
+module.exports = {
+  // ...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          // vue-loader options
+        }
+      }
+    ]
+  }
+}
+```
+
+### loaders
+
+- type: `Object`
+
+  An object specifying Webpack loaders to use for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+
+  - `<template>`: `html`
+  - `<script>`: `js`
+  - `<style>`: `css`
+
+  For example, to use `babel-loader` and `eslint-loader` to process all `<script>` blocks:
+
+  ``` js
+  // ...
+  vue: {
+    loaders: {
+      js: 'babel!eslint'
+    }
+  }
+  ```
+
+### postcss
+
+- type: `Array` or `Function` or `Object`
+- `Object` format only supported in ^8.5.0
+
+  Specify custom PostCSS plugins to be applied to CSS inside `*.vue` files. If using a function, the function will called using the same loader context and should return an Array of plugins.
+
+  ``` js
+  // ...
+  vue: {
+    // note: do not nest the `postcss` option under `loaders`
+    postcss: [require('postcss-cssnext')()],
+    loaders: {
+      // ...
+    }
+  }
+  ```
+
+  This option can also be an object that contains options to be passed to the PostCSS processor. This is useful when you are using PostCSS projects that relies on custom parser/stringifiers:
+
+  ``` js
+  postcss: {
+    plugins: [...], // list of plugins
+    options: {
+      parser: sugarss // use sugarss parser
+    }
+  }
+  ```
+
+### cssSourceMap
+
+- type: `Boolean`
+- default: `true`
+
+  Whether to enable source maps for CSS. Disabling this can avoid some relative path related bugs in `css-loader` and make the build a bit faster.
+
+  Note this is automatically set to `false` if the `devtool` option is not present in the main Webpack config.
+
+### esModule
+
+- type: `Boolean`
+- default: `undefined`
+
+  Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
+
+### preserveWhitespace
+
+- type: `Boolean`
+- default: `true`
+
+  If set to `false`, the whitespaces between HTML tags in templates will be ignored.
+
+### transformToRequire
+
+- type: `{ [tag: string]: string | Array<string> }`
+- default: `{ img: 'src' }`
+
+  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags.
+
+### buble
+
+- type: `Object`
+- default: `{}`
+
+  Configure options for `buble-loader` (if present), AND the buble compilation pass for template render functions.
+
+  > version note: in version 9.x, the template expressions are configured separately via the now removed `templateBuble` option.
+
+  The template render functions compilation supports a special transform `stripWith` (enabled by default), which removes the `with` usage in generated render functions to make them strict-mode compliant.
+
+  Example configuration:
+
+  ``` js
+  // webpack 1
+  vue: {
+    buble: {
+      // enable object spread operator
+      // NOTE: you need to provide Object.assign polyfill yourself!
+      objectAssign: 'Object.assign',
+
+      // turn off the `with` removal
+      transforms: {
+        stripWith: false
+      }
+    }
+  }
+
+  // webpack 2
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          buble: {
+            // same options
+          }
+        }
+      }
+    ]
+  }
+  ```
diff --git a/docs/ko/start/setup.md b/docs/ko/start/setup.md
new file mode 100644
index 000000000..761e281d2
--- /dev/null
+++ b/docs/ko/start/setup.md
@@ -0,0 +1,17 @@
+# Setting Up a Project
+
+### Syntax Highlighting
+
+First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+
+### Using `vue-cli`
+
+It's recommended to scaffold a project using `vue-loader` with `vue-cli`:
+
+``` bash
+npm install -g vue-cli
+vue init webpack-simple hello-vue
+cd hello-vue
+npm install
+npm run dev # ready to go!
+```
diff --git a/docs/ko/start/spec.md b/docs/ko/start/spec.md
new file mode 100644
index 000000000..c63f3cba0
--- /dev/null
+++ b/docs/ko/start/spec.md
@@ -0,0 +1,92 @@
+# Vue Component Spec
+
+A `*.vue` file is a custom file format that uses HTML-like syntax to describe a Vue component. Each `*.vue` file consists of three types of top-level language blocks: `<template>`, `<script>` and `<style>`:
+
+``` html
+<template>
+  <div class="example">{{ msg }}</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello world!'
+    }
+  }
+}
+</script>
+
+<style>
+.example {
+  color: red;
+}
+</style>
+```
+
+`vue-loader` will parse the file, extract each language block, pipe them through other loaders if necessary, and finally assemble them back into a CommonJS module whose `module.exports` is a Vue.js component options object.
+
+`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. For example, you can use SASS for the style of your component like this:
+
+``` html
+<style lang="sass">
+  /* write SASS! */
+</style>
+```
+
+More details can be found in [Using Pre-Processors](../configurations/pre-processors.md).
+
+### Language Blocks
+
+#### `<template>`
+
+- Default language: `html`.
+
+- Each `*.vue` file can contain at most one `<template>` block at a time.
+
+- Contents will be extracted as a string and used as the `template` option for the compiled Vue component.
+
+#### `<script>`
+
+- Default language: `js` (ES2015 is supported automatically if `babel-loader` or `buble-loader` is detected).
+
+- Each `*.vue` file can contain at most one `<script>` block at a time.
+
+- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via Webpack), which means you can `require()` other dependencies. And with ES2015 support, you can also use the `import` and `export` syntax.
+
+- The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
+
+#### `<style>`
+
+- Default Language: `css`.
+
+- Multiple `<style>` tags are supported in a single `*.vue` file.
+
+- A `<style>` tag can have `scoped` or `module` attributes (see [Scoped CSS](../features/scoped-css.md) and [CSS Modules](../features/css-modules.md)) to help encapsulating the styles to the current component. Multiple `<style>` tags with different encapsulation modes can be mixed in the same component.
+
+- By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
+
+### Src Imports
+
+If you prefer splitting up your `*.vue` components into multiple files, you can use the `src` attribute to import an external file for a language block:
+
+``` html
+<template src="./template.html"></template>
+<style src="./style.css"></style>
+<script src="./script.js"></script>
+```
+
+Beware that `src` imports follow the same path resolution rules to CommonJS `require()` calls, which means for relative paths you need to start with `./`, and you can import resources directly from installed NPM packages, e.g:
+
+``` html
+<!-- import a file from the installed "todomvc-app-css" npm package -->
+<style src="todomvc-app-css/index.css">
+```
+
+### Syntax Highlighting
+
+Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+
+### Comments
+
+Inside each block you shall use the comment syntax of the language being used (HTML, CSS, JavaScript, Jade, etc). For top-level comments, use HTML comment syntax: `<!-- comment contents here -->`
diff --git a/docs/ko/workflow/linting.md b/docs/ko/workflow/linting.md
new file mode 100644
index 000000000..431047436
--- /dev/null
+++ b/docs/ko/workflow/linting.md
@@ -0,0 +1,93 @@
+# Linting
+
+You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
+
+You will also need the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) with supports extracting and linting the JavaScript inside `*.vue` files.
+
+Make sure to include the plugin in your ESLint config:
+
+``` json
+"plugins": [
+  "html"
+]
+```
+
+Then from the command line:
+
+``` bash
+eslint --ext js,vue MyComponent.vue
+```
+
+Another option is using [eslint-loader](https://github.com/MoOx/eslint-loader) so that your `*.vue` files are automatically linted on save during development:
+
+``` bash
+npm install eslint eslint-loader --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue!eslint'
+      }
+    ]
+  }
+}
+```
+
+Note that Webpack loader chains are applied **right-first**. Make sure to apply `eslint` before `vue` so we are linting the pre-compile source code.
+
+One thing we need to consider is using third party `*.vue` components shipped in NPM packages. In such case, we want to use `vue-loader` to process the third party component, but do not want to lint it. We can separate the linting into Webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order):
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    // only lint local *.vue files
+    preLoaders: [
+      {
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      }
+    ],
+    // but use vue-loader for all *.vue files
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```
+
+For Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    rules: [
+      // only lint local *.vue files
+      {
+        enforce: 'pre',
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      },
+      // but use vue-loader for all *.vue files
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```
diff --git a/docs/ko/workflow/production.md b/docs/ko/workflow/production.md
new file mode 100644
index 000000000..a54081095
--- /dev/null
+++ b/docs/ko/workflow/production.md
@@ -0,0 +1,39 @@
+# Production Build
+
+There are two things to do when building our bundle for production:
+
+1. Minify our application code;
+2. Use the [setup described in the Vue.js guide](https://vuejs.org/guide/deployment.html) to strip all the warnings from Vue.js source code.
+
+Here's an example config:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  plugins: [
+    // short-circuits all Vue.js warning code
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    // minify with dead-code elimination
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    // optimize module ids by occurence count
+    new webpack.optimize.OccurenceOrderPlugin()
+  ]
+}
+```
+
+Obviously we don't want to use this config during development, so there are several ways to approach this:
+
+1. Dynamically build up the configuration object based on an environment variable;
+
+2. Or, use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+
+It's really up to you as long as it achieves the goal.
diff --git a/docs/ko/workflow/testing-with-mocks.md b/docs/ko/workflow/testing-with-mocks.md
new file mode 100644
index 000000000..b1a17838f
--- /dev/null
+++ b/docs/ko/workflow/testing-with-mocks.md
@@ -0,0 +1,70 @@
+# Testing with Mocks
+
+In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
+
+`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
+
+Suppose we have a component like this:
+
+``` html
+<!-- example.vue -->
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+// this dependency needs to be mocked
+import SomeService from '../service'
+
+export default {
+  data () {
+    return {
+      msg: SomeService.msg
+    }
+  }
+}
+</script>
+```
+
+Here's how to import it with mocks:
+
+> Note: inject-loader@3.x is currently unstable.
+
+``` bash
+npm install inject-loader@^2.0.0 --save-dev
+```
+
+``` js
+// example.spec.js
+const ExampleInjector = require('!!vue?inject!./example.vue')
+```
+
+Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
+
+- `!!` at the start means "disable all loaders from the global config";
+- `vue?inject!` means "use the `vue` loader, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
+
+The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
+
+``` js
+const ExampleWithMocks = ExampleInjector({
+  // mock it
+  '../service': {
+    msg: 'Hello from a mocked service!'
+  }
+})
+```
+
+Finally, we can test the component like usual:
+
+``` js
+it('should render', () => {
+  const vm = new Vue({
+    template: '<div><test></test></div>',
+    components: {
+      'test': ExampleWithMocks
+    }
+  }).$mount()
+  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
+})
+```
diff --git a/docs/ko/workflow/testing.md b/docs/ko/workflow/testing.md
new file mode 100644
index 000000000..03c0a64c5
--- /dev/null
+++ b/docs/ko/workflow/testing.md
@@ -0,0 +1,101 @@
+# Testing
+
+> The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
+
+When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+
+Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:
+
+``` bash
+npm install\
+  karma karma-webpack\
+  karma-jasmine jasmine-core\
+  karma-phantomjs-launcher phantomjs\
+  --save-dev
+```
+
+``` js
+// we can just use the exact same webpack config by requiring it
+// however, remember to delete the original entry since we don't
+// need it during tests
+var webpackConfig = require('./webpack.config.js')
+delete webpackConfig.entry
+
+// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    browsers: ['PhantomJS'],
+    frameworks: ['jasmine'],
+    // this is the entry file for all our tests.
+    files: ['test/index.js'],
+    // we will pass the entry file to webpack for bundling.
+    preprocessors: {
+      'test/index.js': ['webpack']
+    },
+    // use the webpack config
+    webpack: webpackConfig,
+    // avoid walls of useless text
+    webpackMiddleware: {
+      noInfo: true
+    },
+    singleRun: true
+  })
+}
+```
+
+And for the entry `test/index.js` file:
+
+``` js
+// test/index.js
+// require all test files using special Webpack feature
+// https://webpack.github.io/docs/context.html#require-context
+var testsContext = require.context('.', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+```
+
+This entry file simply requires all other files that ends in `.spec.js` in the same folder. Now we can actually write some tests:
+
+``` js
+// test/component-a.spec.js
+var Vue = require('vue')
+var ComponentA = require('../../src/components/a.vue')
+
+describe('a.vue', function () {
+
+  // asserting JavaScript options
+  it('should have correct message', function () {
+    expect(ComponentA.data().msg).toBe('Hello from Component A!')
+  })
+
+  // asserting rendered result by actually rendering the component
+  it('should render correct message', function () {
+    var vm = new Vue({
+      template: '<div><test></test></div>',
+      components: {
+        'test': ComponentA
+      }
+    }).$mount()
+    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
+  })
+})
+```
+
+To run the tests, add the following NPM script:
+
+``` js
+// package.json
+...
+"scripts": {
+  ...
+  "test": "karma start karma.conf.js"
+}
+...
+```
+
+Finally, run:
+
+``` bash
+npm test
+```
+
+Again, [webpack vue-cli template](https://github.com/vuejs-templates/webpack) contains a fully working example with tests.

From 6a67ea7770842b6b26111afebd4cbedd07dac6d8 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Wed, 14 Dec 2016 18:05:42 +0900
Subject: [PATCH 416/877] translate spec.md

---
 docs/ko/start/spec.md | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/ko/start/spec.md b/docs/ko/start/spec.md
index c63f3cba0..0e657a754 100644
--- a/docs/ko/start/spec.md
+++ b/docs/ko/start/spec.md
@@ -1,6 +1,6 @@
-# Vue Component Spec
+# Vue 컴포넌트 스펙
 
-A `*.vue` file is a custom file format that uses HTML-like syntax to describe a Vue component. Each `*.vue` file consists of three types of top-level language blocks: `<template>`, `<script>` and `<style>`:
+`*.vue` 파일은 HTML과 유사한 문법을 사용하여 Vue 컴포넌트를 작성하는 사용자 정의 파일입니다. 각 `*.vue` 파일은 `<template>`와 `<script>`, `<style>` 세 가지 유형의 최상위 language block으로 구성됩니다.
 
 ``` html
 <template>
@@ -24,51 +24,51 @@ export default {
 </style>
 ```
 
-`vue-loader` will parse the file, extract each language block, pipe them through other loaders if necessary, and finally assemble them back into a CommonJS module whose `module.exports` is a Vue.js component options object.
+`vue-loader`는 파일을 파싱하고 각 language block을 추출한 다음 필요한 경우 다른 로더를 통해 파이프를 구성하고 `module.exports`가 Vue.js 옵션 객체인 CommonJS 모듈로 다시 합쳐줍니다.
 
-`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. For example, you can use SASS for the style of your component like this:
+`vue-loader`는 language block에 `lang` 속성을 지정하여 CSS 전처리기 혹은 HTML 컴파일 언어를 사용할 수 있습니다. 예를 들어, 다음과 같이 컴포넌트에 SASS를 사용할 수 있습니다.
 
 ``` html
 <style lang="sass">
-  /* write SASS! */
+  /* SASS를 사용하세요! */
 </style>
 ```
 
-More details can be found in [Using Pre-Processors](../configurations/pre-processors.md).
+자세한 내용은 [전처리기 사용하기](../configurations/pre-processors.md)에서 확인할 수 있습니다.
 
-### Language Blocks
+### Language Block
 
 #### `<template>`
 
-- Default language: `html`.
+- 기본 언어: `html`.
 
-- Each `*.vue` file can contain at most one `<template>` block at a time.
+- 각 `*.vue` 파일은 하나의 `<template>` 블럭을 포함 할 수 있습니다.
 
-- Contents will be extracted as a string and used as the `template` option for the compiled Vue component.
+- 내용은 문자열로 출력되어 컴파일된 Vue 컴포넌트의 `template` 옵션에 사용됩니다.
 
 #### `<script>`
 
-- Default language: `js` (ES2015 is supported automatically if `babel-loader` or `buble-loader` is detected).
+- 기본 언어: `js` (만약 `babel-loader` 또는 `buble-loader`를 사용한다면 ES2015를 자동으로 지원합니다).
 
-- Each `*.vue` file can contain at most one `<script>` block at a time.
+- 각 `*.vue` 파일은 하나의 `<script>` 블럭을 포함 할 수 있습니다.
 
-- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via Webpack), which means you can `require()` other dependencies. And with ES2015 support, you can also use the `import` and `export` syntax.
+- 이 스크립트는 CommonJS와 같은 환경(Webpack을 통해 번들로 제공되는 `.js` 모듈처럼)에서 실행되기 때문에 다른 파일을 `require()` 할 수 있습니다. 또한 ES2015을 지원하면 `import`와 `export`를 사용할 수 있습니다.
 
-- The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
+- 스크립트는 Vue.js 컴포넌트 옵션 객체를 내보내야 합니다. `Vue.extend()`에 의해 생선된 확장 생성자를 내보내는 것도 가능하지만, 평범한 객체를 선호합니다.
 
 #### `<style>`
 
-- Default Language: `css`.
+- 기본 언어: `css`.
 
-- Multiple `<style>` tags are supported in a single `*.vue` file.
+- 여러 개의 `<style>` 태그가 하나의 `*.vue` 파일에 포함될 수 있습니다.
 
-- A `<style>` tag can have `scoped` or `module` attributes (see [Scoped CSS](../features/scoped-css.md) and [CSS Modules](../features/css-modules.md)) to help encapsulating the styles to the current component. Multiple `<style>` tags with different encapsulation modes can be mixed in the same component.
+- `<style>` 태그는 컴포넌트에 스타일을 캡슐화 할 수 있도록 `scoped` 또는 `module` 속성을 사용할 수 있습니다. ([범위 CSS](../features/scoped-css.md)와 [CSS 모듈](../features/css-modules.md)를 참고하세요)  여러 개의 `<style>` 태그로 동일한 컴포넌트에 캡슐화 모드를 혼합하여 사용 할 수 있습니다.
 
-- By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
+- 기본적으로 내용은 추출되고 `style-loader`를 사용하여 문서의 `<head>`에서 `<style>`태그로 동적으로 삽입됩니다. 또한 모든 [컴포넌트의 스타일이 단일 CSS 파일로 추출되도록](../configurations/extract-css.md) Webpack을 구성할 수 있습니다. 
 
-### Src Imports
+### Src로 가져오기
 
-If you prefer splitting up your `*.vue` components into multiple files, you can use the `src` attribute to import an external file for a language block:
+`*.vue` 컴포넌트를 여러 파일로 분할하려 할 경우 `src` 속성을 사용하여 language block에 대한 외부 파일을 가져올 수 있습니다.
 
 ``` html
 <template src="./template.html"></template>
@@ -76,17 +76,17 @@ If you prefer splitting up your `*.vue` components into multiple files, you can
 <script src="./script.js"></script>
 ```
 
-Beware that `src` imports follow the same path resolution rules to CommonJS `require()` calls, which means for relative paths you need to start with `./`, and you can import resources directly from installed NPM packages, e.g:
+`src`로 가져오기가 CommonJS `require()` 호출과 동일한 경로 확인 규칙을 따르기 때문에 주의해야 합니다. 즉, `./`로 시작해야하는 상대 경로를 의미하며 설치된 NPM 패키지에서 직접 리소스를 가져올 수 있습니다.
 
 ``` html
-<!-- import a file from the installed "todomvc-app-css" npm package -->
+<!-- 설치된 NPM 패키지 "todomvc-app-css"에서 파일을 불러옵니다 -->
 <style src="todomvc-app-css/index.css">
 ```
 
 ### Syntax Highlighting
 
-Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm 등)에 Syntax Highlighting 기능이 있습니다. 다른 에디터/IDE에 컨트리뷰션 해주신다면 경우 매우 고맙습니다! 만약 에디터/IDE에서 Syntax Highlighting을 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
 
-### Comments
+### 주석
 
-Inside each block you shall use the comment syntax of the language being used (HTML, CSS, JavaScript, Jade, etc). For top-level comments, use HTML comment syntax: `<!-- comment contents here -->`
+각 블럭 안에는 사용되는 언어의 주석 처리 방법을 사용해야 합니다. 최상위 수준의 주석은 HTML 주석 처리 방법을 사용해주세요. `<!-- 주석 내용을 여기에 적어주세요 -->`
\ No newline at end of file

From 29f0168f0ccea4d51bc00c966c111f62123fa540 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Wed, 14 Dec 2016 18:25:25 +0900
Subject: [PATCH 417/877] translate summary.md

---
 docs/ko/SUMMARY.md | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/docs/ko/SUMMARY.md b/docs/ko/SUMMARY.md
index 96dd8c380..845c59301 100644
--- a/docs/ko/SUMMARY.md
+++ b/docs/ko/SUMMARY.md
@@ -1,20 +1,21 @@
-- Getting Started
-  - [Vue Component Spec](start/spec.md)
-  - [Setting Up a Project](start/setup.md)
-- Features
+- [소개](README.md)
+- 시작하기
+  - [Vue 컴포넌트 스펙](start/spec.md)
+  - [프로젝트 세팅하기](start/setup.md)
+- 기능
   - [ES2015](features/es2015.md)
-  - [Scoped CSS](features/scoped-css.md)
-  - [CSS Modules](features/css-modules.md)
+  - [범위 CSS](features/scoped-css.md)
+  - [CSS 모듈](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [Hot Reload](features/hot-reload.md)
-- Configurations
-  - [Pre-Processors](configurations/pre-processors.md)
-  - [Asset URL Handling](configurations/asset-url.md)
-  - [Advanced Loader Configuration](configurations/advanced.md)
-  - [Extracting CSS File](configurations/extract-css.md)
-- Workflow
-  - [Production Build](workflow/production.md)
+- 설정
+  - [전처리기](configurations/pre-processors.md)
+  - [Asset URL 핸들링](configurations/asset-url.md)
+  - [고급 로더 설정](configurations/advanced.md)
+  - [CSS 파일 추출하기](configurations/extract-css.md)
+- 개발 환경
+  - [실환경 빌드](workflow/production.md)
   - [Linting](workflow/linting.md)
   - [Testing](workflow/testing.md)
-  - [Testing with Mocks](workflow/testing-with-mocks.md)
-- [Options Reference](options.md)
+  - [목업을 이용한 Testing](workflow/testing-with-mocks.md)
+- [옵션 레퍼런스](options.md)

From 5a8b94bae52d1dc6bb87dad09253d46ab1244954 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Wed, 14 Dec 2016 18:28:57 +0900
Subject: [PATCH 418/877] translate setup.md

---
 docs/ko/start/setup.md | 10 +++++-----
 docs/ko/start/spec.md  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/ko/start/setup.md b/docs/ko/start/setup.md
index 761e281d2..accb5beea 100644
--- a/docs/ko/start/setup.md
+++ b/docs/ko/start/setup.md
@@ -1,12 +1,12 @@
-# Setting Up a Project
+# 프로젝트 세팅하기
 
 ### Syntax Highlighting
 
-First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+먼저 `*.vue` 컴포넌트에 대한 Syntax Highlighting 올바른 표시가 필요할 것입니다. 현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue) 등이 Syntax Highlighting이 지원됩니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 Syntax Highlighting을 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
 
-### Using `vue-cli`
+### `vue-cli` 사용하기
 
-It's recommended to scaffold a project using `vue-loader` with `vue-cli`:
+`vue-loader`와 `vue-cli`를 사용하여 프로젝트를 진행하는 것을 추천합니다.
 
 ``` bash
 npm install -g vue-cli
@@ -14,4 +14,4 @@ vue init webpack-simple hello-vue
 cd hello-vue
 npm install
 npm run dev # ready to go!
-```
+```
\ No newline at end of file
diff --git a/docs/ko/start/spec.md b/docs/ko/start/spec.md
index 0e657a754..a55026a00 100644
--- a/docs/ko/start/spec.md
+++ b/docs/ko/start/spec.md
@@ -85,7 +85,7 @@ export default {
 
 ### Syntax Highlighting
 
-현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm 등)에 Syntax Highlighting 기능이 있습니다. 다른 에디터/IDE에 컨트리뷰션 해주신다면 경우 매우 고맙습니다! 만약 에디터/IDE에서 Syntax Highlighting을 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
+현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm 등)에 Syntax Highlighting 기능이 있습니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 Syntax Highlighting을 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
 
 ### 주석
 

From 873913e38590d31ae64b24615497e89e1ae25b84 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Wed, 14 Dec 2016 18:41:38 +0900
Subject: [PATCH 419/877] translate es2015.md

---
 docs/ko/features/es2015.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/ko/features/es2015.md b/docs/ko/features/es2015.md
index 80fc3d19d..fefbc917a 100644
--- a/docs/ko/features/es2015.md
+++ b/docs/ko/features/es2015.md
@@ -1,12 +1,12 @@
 # ES2015
 
-When `vue-loader` detects the presence of `babel-loader` or `buble-loader` in the same project, it will use them to process the `<script>` parts of all `*.vue` files, allowing us to use ES2015 in our Vue components. If you haven't picked up the new language features yet, you definitely should. Some good learning resources:
+`vue-loader`가 `babel-loader` 또는 `buble-loader`을 같은 프로젝트 내에서 감지된다면 모든 `*.vue` 파일들의 `<script>` 부분에서 ES2015를 사용합니다. 아직 ES2015에 대해서 잘 모른다면 여기 좋은 링크가 있습니다.
 
 - [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
 - [ES6 Features](https://github.com/lukehoban/es6features)
 - [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
 
-Here's a typical pattern you will see when importing other Vue components:
+다음은 다른 Vue 컴포넌트를 가져올 때 볼 수 있는 기본적인 패턴입니다.
 
 ``` html
 <script>
@@ -22,23 +22,23 @@ export default {
 </script>
 ```
 
-We are using ES2015's Object literal shorthand here to define the child components. `{ ComponentA }` is simply shorthand for `{ ComponentA: ComponentA }`. Vue will automatically convert the key to `component-a`, so you can use the imported component in the template as `<component-a>`.
+여기서는 ES2015의 오브젝트 리터럴을 사용하여 하위 컴포넌트를 구성합니다. `{ ComponentA }`는 `{ ComponentA: ComponentA }`의 줄임말 입니다. Vue는 키를 자동으로 `component-a`로 변환하기 때문에 당신은 템플릿에서 가져온 컴포넌트롤 `<component-a>`로 사용할 수 있습니다.
 
-### ES2015 in Templates
+### 템플릿의 ES2015
 
-`<template>` in `*.vue` files are compiled into JavaScript render functions and then processed by a custom build of [Buble](https://buble.surge.sh/guide/) to support ES2015 features. This allows you to use features such as [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) and [computed properties](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
+`*.vue`파일의 `<template>`는 Javascript 렌더링 함수로 컴파일 된 다음 [Buble](https://buble.surge.sh/guide/)의 사용자 정의 빌드로 처리되어 ES2015 기능을 지원합니다. 이를 통해 [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-)과 [computed properties](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)과 같은 기능을 이용할 수 있습니다.
 
 ``` html
 <div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
 ```
 
-can be simplified to:
+다음과 같이 간단하게 사용 가능합니다.
 
 ``` html
 <div :class="{ active, [`${prefix}-button`]: isButton }">
 ```
 
-**vue@^2.1.0 only:** You can even use parameter destructuring with `v-for` or scoped slots:
+**vue@^2.1.0 only:** `v-for` 또는 scoped slot을 사용하여 매개 변수 소멸을 사용할 수도 있습니다.
 
 ``` html
 <li v-for="{ id, text } in items">
@@ -54,12 +54,12 @@ can be simplified to:
 </my-component>
 ```
 
-You can also customize the features supported in tempaltes using the [`buble` option](../options.md#buble).
+[`buble` 옵션](../options.md#buble)을 사용하여 템플릿에서 지원되는 기능을 커스터마이징 할 수 있습니다.
 
-### Transpiling Normal `.js` Files
+### 일반적인 `.js` 파일로 변환하기
 
-Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.
+`vue-loader`는 오직 `*.vue` 파일만 처리하기 때문에 Webpack config 파일에 `babel-loader` 또는 `buble-loader`를 사용하여 보통 `*.js` 파일을 처리하도록 지시해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트는 이미 당신을 위해 그렇게 설정되어 있습니다.
 
-### Configuring Babel with `.babelrc`
+### `.babelrc`로 Babel 설정하기
 
-`babel-loader` respects [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), so it is the recommended approach to configure the Babel presets and plugins.
+`babel-loader`는 [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)를 존중하므로 Babel 설정과 플로그인을 구성하는데 권장되는 방법입니다.

From 0f38bde323b81ec7f52ec155867fda9070bb5efb Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Wed, 14 Dec 2016 19:02:30 +0900
Subject: [PATCH 420/877] translate scoped-css.md

---
 docs/ko/features/scoped-css.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/ko/features/scoped-css.md b/docs/ko/features/scoped-css.md
index 4a1f19709..6c17f2544 100644
--- a/docs/ko/features/scoped-css.md
+++ b/docs/ko/features/scoped-css.md
@@ -1,6 +1,6 @@
-# Scoped CSS
+# 범위 CSS
 
-When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements of the current component only. This is similar to the style encapsulation found in Shadow DOM. It comes with some caveats, but doesn't require any polyfills. It is achieved by using PostCSS to transform the following:
+`<style>` 태그가 `scoped` 속성을 가지고있을 때, CSS는 현재 컴포넌트의 요소에만 적용됩니다. 이는 Shadow DOM에 있는 스타일 캡슐화와 유사합니다. 여기에는 몇 가지 주의사항이 있지만 polyfills는 필요 없습니다. PostCSS를 사용한다면 다음과 같이 변환할 수 있습니다.
 
 ``` html
 <style scoped>
@@ -10,11 +10,11 @@ When a `<style>` tag has the `scoped` attribute, its CSS will apply to elements
 </style>
 
 <template>
-  <div class="example">hi</div>
+  <div class="example">안녕</div>
 </template>
 ```
 
-Into the following:
+다음과 같이 변환됩니다.
 
 ``` html
 <style>
@@ -24,13 +24,13 @@ Into the following:
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>hi</div>
+  <div class="example" _v-f3f3eg9>안녕</div>
 </template>
 ```
 
-#### Notes
+#### 메모
 
-1. You can include both scoped and non-scoped styles in the same component:
+1. 범위가 지정된 스타일과 범위가 지정되지 않은 스타일은 동일한 컴포넌트에 포함 할 수 있습니다.
 
   ``` html
   <style>
@@ -42,10 +42,10 @@ Into the following:
   </style>
   ```
 
-2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
+2. 하위 컴포넌트의 루트 노드는 상위 범위 CSS와 하위 범위 CSS의 영향을 받습니다.
 
-3. Partials are not affected by scoped styles.
+3. Partial은 범위가 지정된 스타일의 영향을 받지 않습니다.
 
-4. **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
+4. **범위가 지정된 스타일은 클래스의 필요성을 제거하는 것이 아닙니다**. 브라우저가 다양한 CSS 셀렉터를 렌더링하는 방식 때문에 `p { color: red }`는 범위(즉 속성 선택자와 결합될 때)가 지정될 때 몇 배는 더 느려집니다. `.example { color: red }`와 같이 클래스 또는 id를 대신 사용한다면 성능 이슈를 해결할 수 있습니다. [여기 플레이그라운드](http://stevesouders.com/efws/css-selectors/csscreate.php)에서 차이점을 테스트 할 수 있습니다.
 
-5. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
+5. **하위 컴포넌트의 선택자 사용을 조심하세요!** 선택자 `.a .b`가 있는 CSS 규칙의 경우 `.a`와 일치하는 요소에 하위 컴포넌트가 포함되어 있을 경우 해당 하위 컴포넌트의 모든 `.b`가 CSS 규칙에 적용됩니다.

From b8dacca1e49ab4344c1e3630c86dd9287e4796d9 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 15:55:04 +0900
Subject: [PATCH 421/877] translate css-modules.md

---
 docs/ko/SUMMARY.md              |  2 +-
 docs/ko/features/css-modules.md | 25 ++++++++++++-------------
 docs/ko/start/spec.md           |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/ko/SUMMARY.md b/docs/ko/SUMMARY.md
index 845c59301..43ed5e3bd 100644
--- a/docs/ko/SUMMARY.md
+++ b/docs/ko/SUMMARY.md
@@ -5,7 +5,7 @@
 - 기능
   - [ES2015](features/es2015.md)
   - [범위 CSS](features/scoped-css.md)
-  - [CSS 모듈](features/css-modules.md)
+  - [CSS Modules](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [Hot Reload](features/hot-reload.md)
 - 설정
diff --git a/docs/ko/features/css-modules.md b/docs/ko/features/css-modules.md
index 09ebb20ad..949a2f4b8 100644
--- a/docs/ko/features/css-modules.md
+++ b/docs/ko/features/css-modules.md
@@ -2,11 +2,11 @@
 
 > requires ^9.8.0
 
-[CSS Modules](https://github.com/css-modules/css-modules) is a popular system for modularizing and composing CSS. `vue-loader` provides first-class integration with CSS Modules as an alternative for simulated scoped CSS.
+[CSS Modules](https://github.com/css-modules/css-modules)은 CSS을 모듈화하고 구성하는데 널리 사용되는 시스템입니다. `vue-loader`는 스뮬레이트된 범위 CSS의 대안으로 CSS Modules와 함께 first-class intergration을 제공합니다.
 
-### Usage
+### 사용법
 
-Just add the `module` attribute to your `<style>`:
+`<style>`에 `moudle` 속성을 삽입하니다.
 
 ``` html
 <style module>
@@ -19,7 +19,7 @@ Just add the `module` attribute to your `<style>`:
 </style>
 ```
 
-This will turn on CSS Modules mode for `css-loader`, and the resulting class identifier object will be injected into the component as a computed property with the name `$style`. You can use it in your templates with a dynamic class binding:
+이렇게하면 `css-loader`에 대한 CSS Modules 모드가 켜지고 결과적으로 클래스 식별자 오브젝트는 `$style` 이름의 계산된 속성으로 컴포넌트에 주입됩니다. 당신은 동적 클래스 바인딩을 사용하여 템플릿에서 이를 사용할 수 있습니다.
 
 ``` html
 <template>
@@ -29,7 +29,7 @@ This will turn on CSS Modules mode for `css-loader`, and the resulting class ide
 </template>
 ```
 
-Since it's a computed property, it also works with the object/array syntax of `:class`:
+그것은 계산된 속성이기 때문에 `:class`의 오브젝트/배열 문법에도 작동합니다.
 
 ``` html
 <template>
@@ -44,7 +44,7 @@ Since it's a computed property, it also works with the object/array syntax of `:
 </template>
 ```
 
-And you can also access it from JavaScript:
+또한 Javascript에서도 접근할 수 있습니다.
 
 ``` html
 <script>
@@ -58,11 +58,11 @@ export default {
 </script>
 ```
 
-Refer to the [CSS Modules spec](https://github.com/css-modules/css-modules) for mode details such as [global exceptions](https://github.com/css-modules/css-modules#exceptions) and [composition](https://github.com/css-modules/css-modules#composition).
+[global exceptions](https://github.com/css-modules/css-modules#exceptions)과 [composition](https://github.com/css-modules/css-modules#composition) 같은 자세한 정보는 [CSS Modules 스펙](https://github.com/css-modules/css-modules)을 참고하세요.
 
-### Custom Inject Name
+### 속성 이름 커스터마이징
 
-You can have more than one `<style>` tags in a single `*.vue` component. To avoid injected styles to overwrite each other, you can customize the name of the injected computed property by giving the `module` attribute a value:
+하나의 `*.vue` 컴포넌트 내에 하나 이상의 `<style>` 태그를 가질 수 있습니다. 삽입된 스타일이 서로 덮어 쓰지 않게하려면 `module` 속성에 값을 지정하여 계산된 속성의 이름을 커스터마이징할 수 있습니다.
 
 ``` html
 <style module="a">
@@ -74,9 +74,9 @@ You can have more than one `<style>` tags in a single `*.vue` component. To avoi
 </style>
 ```
 
-### Configuring `css-loader` Query
+### `css-loader` 쿼리 설정
 
-CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader). With `<style module>`, the default query used for `css-loader` is:
+CSS Modules는 [css-loader](https://github.com/webpack/css-loader)를 통해 처리됩니다. `<style module>`을 사용하면 `css-loader`에 사용되는 기본적인 쿼리는 다음과 같습니다.
 
 ``` js
 {
@@ -86,8 +86,7 @@ CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader
 }
 ```
 
-You can use vue-loader
-s `cssModules` option to provide additional query options to `css-loader`:
+당신은 vue-loader의 `cssModules` 옵션을 사용하여 `css-loader`에 추가적인 쿼리 옵션을 제공할 수 있습니다.
 
 ``` js
 // webpack 1
diff --git a/docs/ko/start/spec.md b/docs/ko/start/spec.md
index a55026a00..a93feb1bc 100644
--- a/docs/ko/start/spec.md
+++ b/docs/ko/start/spec.md
@@ -62,7 +62,7 @@ export default {
 
 - 여러 개의 `<style>` 태그가 하나의 `*.vue` 파일에 포함될 수 있습니다.
 
-- `<style>` 태그는 컴포넌트에 스타일을 캡슐화 할 수 있도록 `scoped` 또는 `module` 속성을 사용할 수 있습니다. ([범위 CSS](../features/scoped-css.md)와 [CSS 모듈](../features/css-modules.md)를 참고하세요)  여러 개의 `<style>` 태그로 동일한 컴포넌트에 캡슐화 모드를 혼합하여 사용 할 수 있습니다.
+- `<style>` 태그는 컴포넌트에 스타일을 캡슐화 할 수 있도록 `scoped` 또는 `module` 속성을 사용할 수 있습니다. ([범위 CSS](../features/scoped-css.md)와 [CSS Modules](../features/css-modules.md)를 참고하세요)  여러 개의 `<style>` 태그로 동일한 컴포넌트에 캡슐화 모드를 혼합하여 사용 할 수 있습니다.
 
 - 기본적으로 내용은 추출되고 `style-loader`를 사용하여 문서의 `<head>`에서 `<style>`태그로 동적으로 삽입됩니다. 또한 모든 [컴포넌트의 스타일이 단일 CSS 파일로 추출되도록](../configurations/extract-css.md) Webpack을 구성할 수 있습니다. 
 

From 7b6a58d41d7e4a216711c7d1772676f60404673a Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 16:01:59 +0900
Subject: [PATCH 422/877] translate postcss.md

---
 docs/ko/features/postcss.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/ko/features/postcss.md b/docs/ko/features/postcss.md
index 4dbd8e1b7..4bcf1f76f 100644
--- a/docs/ko/features/postcss.md
+++ b/docs/ko/features/postcss.md
@@ -1,8 +1,8 @@
 # PostCSS
 
-Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for scoped CSS rewriting. You can also add custom PostCSS plugins to the process, for example [autoprefixer](https://github.com/postcss/autoprefixer) or [CSSNext](http://cssnext.io/).
+`vue-loader`에 의해서 처리된 모든 CSS 아웃풋은 범위가 지정된 CSS의 재작성을 위해 [PostCSS](https://github.com/postcss/postcss)를 통해 파이프됩니다. 당신은 프로세스에 [autoprefixer](https://github.com/postcss/autoprefixer) 또는 [CSSNext](http://cssnext.io/)와 같은 사용자 정의 PostCSS 플러그인을 추가할 수 있습니다.
 
-Example usage in Webpack 1.x:
+Webpack 1.x의 예제입니다.
 
 ``` js
 // webpack.config.js
@@ -15,7 +15,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2.x:
+Webpack 2.x의 예제입니다.
 
 ``` js
 // webpack.config.js
@@ -40,10 +40,11 @@ module.exports = {
 ```
 
 In addition to providing an Array of plugins, the `postcss` option also accepts:
+`postcss` 옵션은 플러그인의 배열을 제공하는 것 외에도 다음 옵션을 사용할 수 있습니다.
 
-- A function that returns an array of plugins;
+- 플러그인 배열을 반환하는 함수.
 
-- An object that contains options to be passed to the PostCSS processor. This is useful when you are using PostCSS projects that relies on custom parser/stringifiers:
+- PostCSS 프로세서에 전달할 옵션을 포함하는 객체. 이것은 사용자 정의 parser/stringifiers에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
 
   ``` js
   postcss: {

From 2c3cbf18303b0f423b03004731f3603497acb673 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 16:06:52 +0900
Subject: [PATCH 423/877] translate hot-reload.md

---
 docs/ko/features/hot-reload.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ko/features/hot-reload.md b/docs/ko/features/hot-reload.md
index 6ce6f8389..cc9a34e41 100644
--- a/docs/ko/features/hot-reload.md
+++ b/docs/ko/features/hot-reload.md
@@ -1,7 +1,7 @@
 # Hot Reload
 
-"Hot Reload" is not simply reloading the page when you edit a file. With hot reload enabled, when you edit a `*.vue` file, all instances of that component will be swapped in **without reloading the page**. It even preserves the current state of your app and these swapped components! This dramatically improves the development experience when you are tweaking the templates or styling of your components.
+"Hot Reload"는 파일을 편집 할 때 단순히 페이지를 다시 로드하는 것이 아닙니다. Hot Reload 기능을 사용하면 `*.vue` 파일을 편집 할 때 해당 컴포넌트의 모든 인스턴스가 **페이지를 리로딩하지 않고** 변경됩니다. 심지어 앱의 현재 상태와 변경된 컴포넌트를 보존합니다. 이것은 템플릿 또는 컴포넌트의 스타일을 조정할 때 개발 환경이 크게 개선됩니다.
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
-When scaffolding the project with `vue-cli`, Hot Reload is enabled out-of-the-box.
+Hot Reload는 `vue-cli`로 프로젝트를 스캐폴딩했다면 바로 사용할 수 있습니다.

From ac34d3f55a328c829360c4b2a434a36edac7ad20 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 16:16:53 +0900
Subject: [PATCH 424/877] translate pre-processors.md

---
 docs/ko/configurations/pre-processors.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/ko/configurations/pre-processors.md b/docs/ko/configurations/pre-processors.md
index dcc60e12f..4aa5f5e0e 100644
--- a/docs/ko/configurations/pre-processors.md
+++ b/docs/ko/configurations/pre-processors.md
@@ -1,10 +1,10 @@
-# Using Pre-Processors
+# 전처리기 사용하기
 
-In Webpack, all pre-processors need to be applied with a corresponding loader. `vue-loader` allows you to use other Webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
+Webpack에서는 모든 전처리기가 해당 로더와 함께 적용되어야 합니다. `vue-loader`는 다른 Webpack 로더를 사용하여 Vue 컴포넌트의 일부를 처리 할 수 있게합니다. language block의 `lang` 속성에서 사용할 적절한 로더를 자동으로 유추합니다.
 
 ### CSS
 
-For example, let's compile our `<style>` tag with SASS:
+예를 들어, SASS로 `<style>`을 컴파일해봅시다.
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -16,11 +16,11 @@ npm install sass-loader node-sass --save-dev
 </style>
 ```
 
-Under the hood, the text content inside the `<style>` tag will be first compiled by `sass-loader` before being passed on for further processing.
+내부적으로, `<style>` 태그 안의 텍스트 내용은 후처리를 위해서 전달되기 전에 `sass-loader`에 의해 먼저 컴파일됩니다.
 
-### JavaScript
+### Javascript
 
-All JavaScript inside Vue components are processed by `babel-loader` by default. But you can of course change it:
+Vue 컴포넌트 내의 모든 Javascript는 기본적으로 `babel-loader`에 의해서 처리됩니다. 물론 당신은 그것을 변경할 수 있습니다.
 
 ``` bash
 npm install coffee-loader --save-dev
@@ -34,7 +34,7 @@ npm install coffee-loader --save-dev
 
 ### Templates
 
-Processing templates is a little different, because most Webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we can just install the original `pug`:
+`pug-loader`와 같은 대부분의 Webpack 템플릿 로더는 컴파일된 HTML 문자열 대신 템플릿 함수를 반환하기 때문에 템플릿 처리 앞서 처리한 방법과는 약간 다릅니다. `pug-loader` 대신 원래의 `pug` 파일을 설치하여 사용할 수 있습니다.
 
 ``` bash
 npm install pug --save-dev
@@ -47,11 +47,11 @@ div
 </template>
 ```
 
-> **Important:** If you are using `vue-loader@<8.2.0`, you also need to install `template-html-loader`.
+> **중요:** 만약 당신이 `vue-loader@<8.2.0`을 사용한다면, 당신은 `template-html-loader`도 설치해야 합니다.
 
-### Inline Loader Requests
+### 인라인 로더 요청
 
-You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) in the `lang` attribute:
+당신은 `lang` 속성에서 [Webpack 로더 요청](https://webpack.github.io/docs/loaders.html#introduction)을 할 수 있습니다.
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -59,4 +59,4 @@ You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.htm
 </style>
 ```
 
-However, note this makes your Vue component Webpack-specific and not compatible with Browserify and [vueify](https://github.com/vuejs/vueify). **If you intend to ship your Vue component as a reusable 3rd-party component, avoid using this syntax.**
+그러나 이것은 Vue 컴포넌트가 Webpack에 한정되어 있고 Browserify 및 [vueify](https://github.com/vuejs/vueify)와 호환되지 않습니다. **Vue 컴포넌트를 재사용 가능한 써드파티로 제공하려면 이 구문을 사용하지 마십시오.**
\ No newline at end of file

From ac8f8efb27449969a992888d05f8d156f19e31c7 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 17:52:39 +0900
Subject: [PATCH 425/877] translate asset-url.md

---
 docs/ko/configurations/asset-url.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/ko/configurations/asset-url.md b/docs/ko/configurations/asset-url.md
index 938e258fb..a0520f9d2 100644
--- a/docs/ko/configurations/asset-url.md
+++ b/docs/ko/configurations/asset-url.md
@@ -1,23 +1,23 @@
-# Asset URL Handling
+# Asset URL 핸들링
 
-By default, `vue-loader` automatically processes your style and template files with [css-loader](https://github.com/webpack/css-loader) and the Vue template compiler. In this compilation process, all asset URLs such as `<img src="...">`, `background: url(...)` and CSS `@import` are **resolved as module dependencies**.
+기본적으로, `vue-loader`는 [css-loader](https://github.com/webpack/css-loader)와 Vue 템플릿 컴파일러로 스타일과 템플릿을 자동으로 처리합니다. 이 컴파일 과정에서 `<img src="...">`, `background: url(...)`, CSS `@import`와 같은 모든 Asset URL은 **모듈 종속성**으로 해결됩니다.
 
-For example, `url(./image.png)` will be translated into `require('./image.png')`, and
+예를 들어, `url(./image.png)`는 `require('./image.png')`로 변환되어,
 
 ``` html
 <img src="../image.png">
 ```
 
-will be compiled into:
+다음과 같이 컴파일 될 것입니다.
 
 ``` js
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-Because `.png` is not a JavaScript file, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. The project scaffolded with `vue-cli` has also configured this for you.
+왜냐하면 `.png`는 Javscript 파일이 아니기 때문에 [file-loader](https://github.com/webpack/file-loader) 또는 [url-loader](https://github.com/webpack/url-loader)를 사용하여 Webpack을 처리하도록 Webpack을 구성해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트도 이것을 구성했습니다.
 
-The benefits of all this are:
+이것을 사용하는 이점은 다음과 같습니다.
 
-1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreoever, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, Webpack will auto-rewrite the file paths into correct URLs in the bundled output.
+1. `file-loader`는 당신이 Asset 파일을 복사하여 붙여넣을 곳을 지정하고 더 나은 캐싱을 위해 버전 해시를 사용하여 이름을 지정하는 방법을 사용합니다. 더 나아가 **이것은 `*.vue` 파일 옆에 이미지를 놓고 배포 URL에 대해 걱정하지 않으면서 폴더 구조를 기반으로 상대 경로를 사용할 수 있습니다**. 올바른 설정을 사용하면 Webpack은 파일 경로를 번들 아웃풋을 올바른 URL로 자동으로 재작성합니다.
 
-2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.
+2. `url-loader`는 파일이 주어진 값보다 작은 경우 조건부로 파일을 base-64 데이터 URL로 인라인 할 수 있도록 합니다. 이렇게하면 사소한 파일들에 대한 HTTP 요청의 양을 줄일 수 있습니다. 파일이 주어진 값보다 크면 자동으로 `file-loader`로 돌아갑니다.
\ No newline at end of file

From c9b55fd9ad8e93c55b6ddfd5e1d2ecb634ee5c9b Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 18:05:59 +0900
Subject: [PATCH 426/877] translate advanced.md

---
 docs/ko/configurations/advanced.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/ko/configurations/advanced.md b/docs/ko/configurations/advanced.md
index 749c42b0f..a94657992 100644
--- a/docs/ko/configurations/advanced.md
+++ b/docs/ko/configurations/advanced.md
@@ -1,6 +1,6 @@
-# Advanced Loader Configuration
+# 고급 로더 설정
 
-Sometimes you may want to apply a custom loader string to a language instead of letting `vue-loader` infer it. Or you may simply want to overwrite the built-in loader configuration for the default languages. To do that, add a `vue` block in your Webpack config file, and specify the `loaders` option.
+때로는 `vue-loader`가 그것을 추론하는 대신 언어에 커스텀 로더 스트링을 적용하기를 원할 수도 있습니다. 또는 디폴트 언어에서 기본적으로 제공되는 로더 설정을 덮어쓰고 싶을 수도 있습니다. 이를 위해서 Webpack 설정 파일에 `vue` 블럭을 추가하고 `loaders` 옵션을 지정하세요.
 
 ### Webpack 1.x
 
@@ -53,4 +53,4 @@ module.exports = {
 }
 ```
 
-A more practical usage of the advanced loader configuration is [extracting CSS inside components into a single file](./extract-css.md).
+고급 로더 설정을 보다 실용적으로 사용하면 [컴포넌트 내부의 CSS를 단일 파일로 추출할 수 있습니다](./extract-css.md).
\ No newline at end of file

From 59553cf6207d8242beebdb494e0733bb82d61f67 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 18:07:59 +0900
Subject: [PATCH 427/877] translate extract-css.md

---
 docs/ko/SUMMARY.md                    | 2 +-
 docs/ko/configurations/extract-css.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/ko/SUMMARY.md b/docs/ko/SUMMARY.md
index 43ed5e3bd..7c3237553 100644
--- a/docs/ko/SUMMARY.md
+++ b/docs/ko/SUMMARY.md
@@ -12,7 +12,7 @@
   - [전처리기](configurations/pre-processors.md)
   - [Asset URL 핸들링](configurations/asset-url.md)
   - [고급 로더 설정](configurations/advanced.md)
-  - [CSS 파일 추출하기](configurations/extract-css.md)
+  - [CSS 단일 파일로 추출하기](configurations/extract-css.md)
 - 개발 환경
   - [실환경 빌드](workflow/production.md)
   - [Linting](workflow/linting.md)
diff --git a/docs/ko/configurations/extract-css.md b/docs/ko/configurations/extract-css.md
index b0701a04b..a659e096e 100644
--- a/docs/ko/configurations/extract-css.md
+++ b/docs/ko/configurations/extract-css.md
@@ -1,6 +1,6 @@
-# Extracting CSS into a Single File
+# CSS 단일 파일로 추출하기
 
-Example config to extract all the processed CSS in all Vue components into a single CSS file:
+다음 예제 설정을 사용하여 모든 Vue 컴포넌트의 처리된 CSS를 단일 CSS 파일로 추출할 수 있습니다.
 
 ### Webpack 1.x
 

From ffef1be0d3238312c35c5d2e333c365c3335460c Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 18:12:35 +0900
Subject: [PATCH 428/877] translate production.md

---
 docs/ko/workflow/production.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/ko/workflow/production.md b/docs/ko/workflow/production.md
index a54081095..ad15f7d7e 100644
--- a/docs/ko/workflow/production.md
+++ b/docs/ko/workflow/production.md
@@ -1,11 +1,11 @@
-# Production Build
+# 실환경 빌드
 
-There are two things to do when building our bundle for production:
+실환경을 위해 번들을 제작할 때는 다음 두 가지 작업을 수행해야 합니다.
 
-1. Minify our application code;
-2. Use the [setup described in the Vue.js guide](https://vuejs.org/guide/deployment.html) to strip all the warnings from Vue.js source code.
+1. 어플리케이션 코드를 Minify합니다.
+2. Vue.js 소스 코드의 모든 경고를 제거하려면 [Vue.js 가이드에 설명된 설정](https://vuejs.org/guide/deployment.html)을 사용하세요.
 
-Here's an example config:
+여기 예제 설정이 있습니다.
 
 ``` js
 // webpack.config.js
@@ -30,10 +30,10 @@ module.exports = {
 }
 ```
 
-Obviously we don't want to use this config during development, so there are several ways to approach this:
+우리는 개발 중에 이 설정을 사용하고 싶지 않을 것이기 때문에 이것을 해결하는 몇 가지 방법이 있습니다.
 
-1. Dynamically build up the configuration object based on an environment variable;
+1. 환경변수 기반으로 설정 오브젝트를 동적으로 빌드할 수 있습니다.
 
-2. Or, use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+2. 또는 개발용 Webpack 설정 파일과 실환경용 설정 파일을 분리하여 사용합니다. 그리고 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)에 표시 된 것처럼 세 번째 파일에서 공통 옵션을 공유할 수도 있습니다.
 
-It's really up to you as long as it achieves the goal.
+목표의 달성은 당신에게 달려있습니다.
\ No newline at end of file

From 10b23a6d3c474ef4dc3cc3280d9d11654be95f67 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Thu, 15 Dec 2016 18:20:40 +0900
Subject: [PATCH 429/877] translate linting.md

---
 docs/ko/workflow/linting.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/ko/workflow/linting.md b/docs/ko/workflow/linting.md
index 431047436..a99eb0edf 100644
--- a/docs/ko/workflow/linting.md
+++ b/docs/ko/workflow/linting.md
@@ -1,10 +1,10 @@
 # Linting
 
-You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
+`*.vue` 파일은 Javascript가 아니기 때문에 내부 코드를 어떻게 lint하는지 궁금했을 겁니다. 우리는 당신이 [ESLint](http://eslint.org/)를 사용하고 있다고 가정 할 것입니다. (그렇지 않다면 당신은 사용해야합니다!)
 
-You will also need the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) with supports extracting and linting the JavaScript inside `*.vue` files.
+당신은 `*.vue` 파일 내에서 Javascript를 추출하고 linting하는 것과 동시에 [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html)이 필요합니다.
 
-Make sure to include the plugin in your ESLint config:
+그리고 ESLint 설정에 플러그인을 포함해야 합니다.
 
 ``` json
 "plugins": [
@@ -12,13 +12,13 @@ Make sure to include the plugin in your ESLint config:
 ]
 ```
 
-Then from the command line:
+그 다음 커맨드 라인에서 다음과 같이 입력합니다.
 
 ``` bash
 eslint --ext js,vue MyComponent.vue
 ```
 
-Another option is using [eslint-loader](https://github.com/MoOx/eslint-loader) so that your `*.vue` files are automatically linted on save during development:
+또 다른 옵션은 [eslint-loader](https://github.com/MoOx/eslint-loader)를 사용하여 개발 중에 `*.vue` 파일이 저장될 때 자동으로 lint되도록 할 수 있습니다.
 
 ``` bash
 npm install eslint eslint-loader --save-dev
@@ -39,9 +39,9 @@ module.exports = {
 }
 ```
 
-Note that Webpack loader chains are applied **right-first**. Make sure to apply `eslint` before `vue` so we are linting the pre-compile source code.
+Webpack 로더 체인은 **가장 먼저** 적용됩니다. `vue` 전에 `eslint`를 적용하여 컴파일 전 소스코드를 lint하세요.
 
-One thing we need to consider is using third party `*.vue` components shipped in NPM packages. In such case, we want to use `vue-loader` to process the third party component, but do not want to lint it. We can separate the linting into Webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order):
+우리가 고려해야할 한 가지는 NPM 패키지에 포함 된 써드파티 `*.vue` 컴포넌트를 사용하는 것 입니다. 이 경우에 우리는 써드파티 컴포넌트를 처리하기 위해 `vue-loader`를 사용하려고 하지만 그것을 lint하고 싶지는 않습니다. 우리는 lint를 Webpack의 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order)로 분리할 수 있습니다.
 
 ``` js
 // webpack.config.js
@@ -67,7 +67,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2.x:
+Webpack 2.x에서는 다음과 같이 처리합니다.
 
 ``` js
 // webpack.config.js

From cc8943a913fdeb9fc15848c06c912b73c0ae88aa Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Fri, 16 Dec 2016 00:03:03 +0900
Subject: [PATCH 430/877] translate testing.md

---
 docs/ko/SUMMARY.md          |  4 ++--
 docs/ko/workflow/testing.md | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/ko/SUMMARY.md b/docs/ko/SUMMARY.md
index 7c3237553..5a035ba80 100644
--- a/docs/ko/SUMMARY.md
+++ b/docs/ko/SUMMARY.md
@@ -16,6 +16,6 @@
 - 개발 환경
   - [실환경 빌드](workflow/production.md)
   - [Linting](workflow/linting.md)
-  - [Testing](workflow/testing.md)
-  - [목업을 이용한 Testing](workflow/testing-with-mocks.md)
+  - [테스트](workflow/testing.md)
+  - [목업을 이용한 테스트](workflow/testing-with-mocks.md)
 - [옵션 레퍼런스](options.md)
diff --git a/docs/ko/workflow/testing.md b/docs/ko/workflow/testing.md
index 03c0a64c5..92043e8f8 100644
--- a/docs/ko/workflow/testing.md
+++ b/docs/ko/workflow/testing.md
@@ -1,10 +1,10 @@
-# Testing
+# 테스트
 
-> The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
+> [webpack vue-cli template](https://github.com/vuejs-templates/webpack)은 유닛 테스트 및 e2e 테스트 설정을 사전에 제공합니다.
 
-When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+`*.vue` 파일을 테스트할 때 `*.vue` 파일 처리 방법을 알지 못하기 때문에 CommonJS 기반 테스트 러너를 사용할 수 없습니다. 대신 Webpack + vue-loader를 사용하여 테스트 파일을 번들로 제공합니다. [Karma](http://karma-runner.github.io/0.13/index.html) 및 [karma-webpack](https://github.com/webpack/karma-webpack)을 사용하는 것을 추천합니다.
 
-Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:
+Karma는 브라우저를 실행하고 테스트를 실행하는 테스트 러너입니다. 테스트할 브라우저와 사용할 테스트 프레임워크(Mocha 또는 Jasmine)를 선택할 수 있습니다. 다음은 [PhantomJS](http://phantomjs.org/) 내부에서 [Jasmine](http://jasmine.github.io/edge/introduction.html)을 사용하여 테스트를 실행하는 Karma 설정의 예입니다.
 
 ``` bash
 npm install\
@@ -43,7 +43,7 @@ module.exports = function (config) {
 }
 ```
 
-And for the entry `test/index.js` file:
+그리고 엔트리 파일`test/index.js`을 작성합니다.
 
 ``` js
 // test/index.js
@@ -53,7 +53,7 @@ var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
 ```
 
-This entry file simply requires all other files that ends in `.spec.js` in the same folder. Now we can actually write some tests:
+이 엔트리 파일은 같은 폴더에 있는 `.spec.js`로 끝나는 다른 모든 파일을 요구합니다. 이제 우리는 실제로 몇 가지 테스트를 작성할 수 있습니다.
 
 ``` js
 // test/component-a.spec.js
@@ -80,7 +80,7 @@ describe('a.vue', function () {
 })
 ```
 
-To run the tests, add the following NPM script:
+테스트를 추가하려면 다음 NPM 스크립트를 추가하세요.
 
 ``` js
 // package.json
@@ -92,10 +92,10 @@ To run the tests, add the following NPM script:
 ...
 ```
 
-Finally, run:
+마지막으로 실행해봅시다.
 
 ``` bash
 npm test
 ```
 
-Again, [webpack vue-cli template](https://github.com/vuejs-templates/webpack) contains a fully working example with tests.
+다시 말하자면, [webpack vue-cli 템플릿](https://github.com/vuejs-templates/webpack)에는 테스트에 대한 완전한 예제가 들어 있습니다.

From 75cc5bdd702463a8fd5d29ce8cf420313fea2b21 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Fri, 16 Dec 2016 00:34:20 +0900
Subject: [PATCH 431/877] translate testing-with-mocks.md

---
 docs/ko/workflow/testing-with-mocks.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/ko/workflow/testing-with-mocks.md b/docs/ko/workflow/testing-with-mocks.md
index b1a17838f..ec4e23a24 100644
--- a/docs/ko/workflow/testing-with-mocks.md
+++ b/docs/ko/workflow/testing-with-mocks.md
@@ -1,10 +1,10 @@
-# Testing with Mocks
+# 목업을 위한 테스트
 
-In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
+리얼 월드 어플리케이션에서는 컴포넌트에 외부 의존성이 있을 가능성이 큽니다. 컴포넌트에 대한 유닛 테스트를 작성할 때 테스트가 테스트 중인 컴포넌트의 동작에만 의존하도록 mock을 만드는 것이 이상적 입니다.
 
-`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
+`vue-loader`는 [inject-loader](https://github.com/plasticine/inject-loader)를 사용하여 임의의 의존성을 `*.vue` 컴포넌트에 주입 할 수 있는 기능을 제공합니다. 일반적인 아이디어로 컴포넌트 모듈을 직접 가져오는 대신 `inject-loader`를 사용하여 해당 모듈에 대한 "모듈 팩토리" 함수를 생성하는 것 입니다. 이 함수가 mock 객체와 함께 호출되면 mock 객체가 삽입된 모듈의 인스턴트를 반환합니다.
 
-Suppose we have a component like this:
+다음과 같은 컴포넌트가 이싿고 가정해봅시다.
 
 ``` html
 <!-- example.vue -->
@@ -26,9 +26,9 @@ export default {
 </script>
 ```
 
-Here's how to import it with mocks:
+mock을 가져오는 방법은 다음과 같습니다.
 
-> Note: inject-loader@3.x is currently unstable.
+> 주의: `inject-loader@3.x`는 현재 불안정합니다.
 
 ``` bash
 npm install inject-loader@^2.0.0 --save-dev
@@ -39,12 +39,12 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
+Notice that crazy require string. 여기에는 인라인 [webpack loader requests](https://webpack.github.io/docs/loaders.html)이 사용됩니다. 간단한 설명을 하겠습니다.
 
-- `!!` at the start means "disable all loaders from the global config";
-- `vue?inject!` means "use the `vue` loader, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
+- `!!`는 "글로벌 설정에서 모든 로더를 사용하지 못하게 함"을 의미합니다.
+- `vue?inject!`는 `vue` 로더를 사용하고 `?inject` 쿼리를 전달한다는 것을 의미합니다. 이것은 `vue-loader`에게 의존성 주입 모드로 컴퍼넌트를 컴파일하도록 알려줍니다.
 
-The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
+반환된 `ExampleInjector`는 `example.vue` 모듈의 인스턴스를 생성하기 위해 호출 될 수 있는 팩토리 함수입니다.
 
 ``` js
 const ExampleWithMocks = ExampleInjector({
@@ -55,7 +55,7 @@ const ExampleWithMocks = ExampleInjector({
 })
 ```
 
-Finally, we can test the component like usual:
+마지막으로 우리는 컴포넌트를 평상시에 테스트 할 수 있습니다.
 
 ``` js
 it('should render', () => {

From 093b92c51f2feb33430f8029526b70d7d55168f3 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Fri, 16 Dec 2016 00:50:24 +0900
Subject: [PATCH 432/877] translate options.md

---
 docs/ko/options.md | 59 +++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/docs/ko/options.md b/docs/ko/options.md
index 6789e7c71..235f7a1de 100644
--- a/docs/ko/options.md
+++ b/docs/ko/options.md
@@ -1,8 +1,8 @@
-# Options Reference
+# 옵션 레퍼런스
 
-## Usage Difference Between Webpack 1 & 2
+## Webpack 1 & 2 사용 방법의 차이점
 
-For Webpack 1.x: add a root `vue` block in your Webpack config:
+Webpack 1.x의 경우 Webpack 설정에 루트 `vue` 블럭을 추가합니다.
 
 ``` js
 module.exports = {
@@ -13,7 +13,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2 (^2.1.0-beta.25):
+Webpack 2 (^2.1.0-beta.25)는 다음과 같습니다.
 
 ``` js
 module.exports = {
@@ -34,15 +34,15 @@ module.exports = {
 
 ### loaders
 
-- type: `Object`
+- 타입: `Object`
 
-  An object specifying Webpack loaders to use for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+  `*.vue` 파일의 language block에 사용할 Webpack 로더를 지정하는 객체입니다. 이 키는 특별히 지정된 경우 language block에 대한 `lang` 속성에 해당합니다. 각 타입에 대한 기본적인 `lang`은 다음과 같습니다.
 
   - `<template>`: `html`
   - `<script>`: `js`
   - `<style>`: `css`
 
-  For example, to use `babel-loader` and `eslint-loader` to process all `<script>` blocks:
+  예를 들어, `babel-loader`와 `eslint-loader`를 사용하여 모든 `<script>` 블럭을 처리하려면 다음과 같이 사용합니다.
 
   ``` js
   // ...
@@ -55,15 +55,15 @@ module.exports = {
 
 ### postcss
 
-- type: `Array` or `Function` or `Object`
-- `Object` format only supported in ^8.5.0
+- 타입: `Array` 또는 `Function`, `Object`
+- `Object` 타입은 오직 ^8.5.0에서 지원됩니다.
 
-  Specify custom PostCSS plugins to be applied to CSS inside `*.vue` files. If using a function, the function will called using the same loader context and should return an Array of plugins.
+  `*.vue` 파일 안에 CSS에 적용할 PostCSS 플러그인을 지정합니다. 함수를 사용하는 경우 함수는 동일한 로더 컨텍스트를 사용하여 호출되며 플러그인의 배열을 반환해야 합니다.
 
   ``` js
   // ...
   vue: {
-    // note: do not nest the `postcss` option under `loaders`
+    // 주의: `loaders`에서 `postcss` 옵션을 중첩하면 안됩니다.
     postcss: [require('postcss-cssnext')()],
     loaders: {
       // ...
@@ -71,7 +71,7 @@ module.exports = {
   }
   ```
 
-  This option can also be an object that contains options to be passed to the PostCSS processor. This is useful when you are using PostCSS projects that relies on custom parser/stringifiers:
+  이 옵션은 PostCSS 프로세서에 전달할 옵션을 포함하는 객체일 수 있습니다. 이것은 사용자 정의 parser/stringifiers에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
 
   ``` js
   postcss: {
@@ -84,46 +84,47 @@ module.exports = {
 
 ### cssSourceMap
 
-- type: `Boolean`
-- default: `true`
+- 타입: `Boolean`
+- 디폴트: `true`
 
-  Whether to enable source maps for CSS. Disabling this can avoid some relative path related bugs in `css-loader` and make the build a bit faster.
+  CSS 소스 맵을 사용할지 여부를 정합니다. 이 기능을 끄면 `css-loader`에서 상대 경로와 관련된 버그를 피할 수 있고 빌드를 좀 더 빠르게 할 수 있습니다.
 
-  Note this is automatically set to `false` if the `devtool` option is not present in the main Webpack config.
+  `devtool` 옵션이 메인 Webpack 설정에 없으면 자동으로 `false`로 설정됩니다.
 
 ### esModule
 
-- type: `Boolean`
-- default: `undefined`
+- 타입: `Boolean`
+- 디폴트: `undefined`
 
   Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
 
 ### preserveWhitespace
 
-- type: `Boolean`
-- default: `true`
+- 타입: `Boolean`
+- 디폴트: `true`
 
-  If set to `false`, the whitespaces between HTML tags in templates will be ignored.
+  만약 `false`로 설정하면 템플릿의 HTML 태그 사이의 공백이 무시됩니다.
 
 ### transformToRequire
 
-- type: `{ [tag: string]: string | Array<string> }`
-- default: `{ img: 'src' }`
+- 타입: `{ [tag: string]: string | Array<string> }`
+- 디폴트: `{ img: 'src' }`
 
-  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags.
+  템플릿 컴파일 중에 컴파일러는 `src` URL과 같은 특정 속성을 `require` 호출로 변환하여 대상 Asset을 Webpack에서 처리할 수 있습니다. 기본 설정은 `<img>` 태그에 `src` 속성을 변환합니다.
 
 ### buble
 
-- type: `Object`
-- default: `{}`
+- 타입: `Object`
+- 디폴트: `{}`
 
   Configure options for `buble-loader` (if present), AND the buble compilation pass for template render functions.
+  `buble-loader`가 존재한다면 `buble-loader`에 대한 옵션을 설정하고, 템플릿 렌더링 함수를 위한 buble 컴파일 패스를 설정하세요.
 
-  > version note: in version 9.x, the template expressions are configured separately via the now removed `templateBuble` option.
+  > 버전 노트: 버전 9.x에서 템플릿 표현식은 이제 제거된 `templateBuble` 옵션을 통해 별도로 설정됩니다.
 
-  The template render functions compilation supports a special transform `stripWith` (enabled by default), which removes the `with` usage in generated render functions to make them strict-mode compliant.
+  템플릿 렌더링 함수 컴파일은 특수 변환 `stripWith`(기본적으로 활성화됨)을 지원합니다. 이 함수는 생성된 렌더링 함수에서 `with` 사용을 제거하여 strict 모드를 준수합니다.
 
-  Example configuration:
+  다음은 설정 예 입니다.
 
   ``` js
   // webpack 1

From 8362c168058fb03b1d5994d92a5c5947e5e84014 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Fri, 16 Dec 2016 18:15:02 +0900
Subject: [PATCH 433/877] Fixed translate document with @ChangJoo-Park's
 feedback.

---
 docs/ko/SUMMARY.md                     | 2 +-
 docs/ko/options.md                     | 1 -
 docs/ko/workflow/production.md         | 6 +++---
 docs/ko/workflow/testing-with-mocks.md | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/ko/SUMMARY.md b/docs/ko/SUMMARY.md
index 5a035ba80..7b5d0fc85 100644
--- a/docs/ko/SUMMARY.md
+++ b/docs/ko/SUMMARY.md
@@ -14,7 +14,7 @@
   - [고급 로더 설정](configurations/advanced.md)
   - [CSS 단일 파일로 추출하기](configurations/extract-css.md)
 - 개발 환경
-  - [실환경 빌드](workflow/production.md)
+  - [배포용 빌드](workflow/production.md)
   - [Linting](workflow/linting.md)
   - [테스트](workflow/testing.md)
   - [목업을 이용한 테스트](workflow/testing-with-mocks.md)
diff --git a/docs/ko/options.md b/docs/ko/options.md
index 235f7a1de..cc80cc3ac 100644
--- a/docs/ko/options.md
+++ b/docs/ko/options.md
@@ -117,7 +117,6 @@ module.exports = {
 - 타입: `Object`
 - 디폴트: `{}`
 
-  Configure options for `buble-loader` (if present), AND the buble compilation pass for template render functions.
   `buble-loader`가 존재한다면 `buble-loader`에 대한 옵션을 설정하고, 템플릿 렌더링 함수를 위한 buble 컴파일 패스를 설정하세요.
 
   > 버전 노트: 버전 9.x에서 템플릿 표현식은 이제 제거된 `templateBuble` 옵션을 통해 별도로 설정됩니다.
diff --git a/docs/ko/workflow/production.md b/docs/ko/workflow/production.md
index ad15f7d7e..ce9064225 100644
--- a/docs/ko/workflow/production.md
+++ b/docs/ko/workflow/production.md
@@ -1,6 +1,6 @@
-# 실환경 빌드
+# 배포용 빌드
 
-실환경을 위해 번들을 제작할 때는 다음 두 가지 작업을 수행해야 합니다.
+배포 환경을 위해 번들을 제작할 때는 다음 두 가지 작업을 수행해야 합니다.
 
 1. 어플리케이션 코드를 Minify합니다.
 2. Vue.js 소스 코드의 모든 경고를 제거하려면 [Vue.js 가이드에 설명된 설정](https://vuejs.org/guide/deployment.html)을 사용하세요.
@@ -34,6 +34,6 @@ module.exports = {
 
 1. 환경변수 기반으로 설정 오브젝트를 동적으로 빌드할 수 있습니다.
 
-2. 또는 개발용 Webpack 설정 파일과 실환경용 설정 파일을 분리하여 사용합니다. 그리고 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)에 표시 된 것처럼 세 번째 파일에서 공통 옵션을 공유할 수도 있습니다.
+2. 또는 개발용 Webpack 설정 파일과 배포용 설정 파일을 분리하여 사용합니다. 그리고 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)에 표시 된 것처럼 세 번째 파일에서 공통 옵션을 공유할 수도 있습니다.
 
 목표의 달성은 당신에게 달려있습니다.
\ No newline at end of file
diff --git a/docs/ko/workflow/testing-with-mocks.md b/docs/ko/workflow/testing-with-mocks.md
index ec4e23a24..e1ed5e80a 100644
--- a/docs/ko/workflow/testing-with-mocks.md
+++ b/docs/ko/workflow/testing-with-mocks.md
@@ -4,7 +4,7 @@
 
 `vue-loader`는 [inject-loader](https://github.com/plasticine/inject-loader)를 사용하여 임의의 의존성을 `*.vue` 컴포넌트에 주입 할 수 있는 기능을 제공합니다. 일반적인 아이디어로 컴포넌트 모듈을 직접 가져오는 대신 `inject-loader`를 사용하여 해당 모듈에 대한 "모듈 팩토리" 함수를 생성하는 것 입니다. 이 함수가 mock 객체와 함께 호출되면 mock 객체가 삽입된 모듈의 인스턴트를 반환합니다.
 
-다음과 같은 컴포넌트가 이싿고 가정해봅시다.
+다음과 같은 컴포넌트가 있다고 가정해봅시다.
 
 ``` html
 <!-- example.vue -->
@@ -39,7 +39,7 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-Notice that crazy require string. 여기에는 인라인 [webpack loader requests](https://webpack.github.io/docs/loaders.html)이 사용됩니다. 간단한 설명을 하겠습니다.
+위 코드의 require 문자열은 미친 것 같습니다. 여기에는 인라인 [webpack loader requests](https://webpack.github.io/docs/loaders.html)이 사용됩니다. 위 코드에 대해서 간단한 설명을 하겠습니다.
 
 - `!!`는 "글로벌 설정에서 모든 로더를 사용하지 못하게 함"을 의미합니다.
 - `vue?inject!`는 `vue` 로더를 사용하고 `?inject` 쿼리를 전달한다는 것을 의미합니다. 이것은 `vue-loader`에게 의존성 주입 모드로 컴퍼넌트를 컴파일하도록 알려줍니다.

From ecd8521f831c5cec6871384451d8e8a12f1d7cb5 Mon Sep 17 00:00:00 2001
From: Lee Sun-Hyoup <kciter@naver.com>
Date: Sat, 17 Dec 2016 13:02:18 +0900
Subject: [PATCH 434/877] Translate comment and fixed translate document with
 @ChangJoo-Park's feedback.

---
 docs/ko/README.md                        | 10 +++++-----
 docs/ko/configurations/advanced.md       | 18 +++++++++---------
 docs/ko/configurations/extract-css.md    |  8 ++++----
 docs/ko/configurations/pre-processors.md |  2 +-
 docs/ko/features/css-modules.md          | 16 ++++++++--------
 docs/ko/features/postcss.md              | 15 +++++++--------
 docs/ko/features/scoped-css.md           |  4 ++--
 docs/ko/options.md                       | 18 +++++++++---------
 docs/ko/workflow/linting.md              | 14 +++++++-------
 docs/ko/workflow/production.md           |  8 ++++----
 docs/ko/workflow/testing-with-mocks.md   |  6 +++---
 11 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/docs/ko/README.md b/docs/ko/README.md
index 35881e16a..7af94c305 100644
--- a/docs/ko/README.md
+++ b/docs/ko/README.md
@@ -16,7 +16,7 @@
 
 한 마디로 Webpack과 `vue-loader`의 결합은 Vue.js 어플리케이션을 제작하기위한 현대적이고 유연하며 매우 강력한 작업환경을 제공합니다.
 
-### Webpack이 뭔가요?
+### Webpack이 무엇인가요?
 
 이미 Webpack에 익숙하다면 이 설명을 건너뛰어도 됩니다. 하지만 Webpack을 처음 사용하는 사람들에게는 다음과 같은 간단한 소개를 읽어보세요.
 
@@ -28,10 +28,10 @@
 
 여기서 Webpack은 묶는일 외에도 더 많은 일을 할 수 있습니다. "로더들"을 사용하면 최종 Bundle(묶음)을 출력하기 전에 원하는 방식으로 모든 유형의 파일을 변환할 수 있도록 Webpack에 지시할 수 있습니다. 몇 가지 예를 봅시다.
 
-- ES2015 또는 CoffeeScript, TypeScript 모듈을 ES5 CommonJS 모듈로 변환
-- Optionally you can pipe the source code through a linter before doing the compilation;
-- Jade 템플릿을 일반 HTML로 변경하고 Javascript 문자열로 반환합니다.
-- SASS 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 Javascript 스니펫으로 변환합니다.
+- ES2015 또는 CoffeeScript, TypeScript 모듈을 ES5 CommonJS 모듈로 변환할 수 있습니다.
+- 선택 사항으로 컴파일 전에 linter를 이용하여 소스 코드를 연결 할 수 있습니다.
+- Jade 템플릿을 일반 HTML로 변경하고 JavaScript 문자열로 반환합니다.
+- SASS 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 JavaScript 스니펫으로 변환합니다.
 - HTML 또는 CSS에서 참조된 이미지 파일을 처리하고 경로 구성에 따라 이동한 후 md5 해시를 사용하여 이름을 지정합니다.
 
 Webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 단점은 장황하고 복잡한 구성입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 Webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
\ No newline at end of file
diff --git a/docs/ko/configurations/advanced.md b/docs/ko/configurations/advanced.md
index a94657992..c88186b96 100644
--- a/docs/ko/configurations/advanced.md
+++ b/docs/ko/configurations/advanced.md
@@ -7,7 +7,7 @@
 ``` js
 // webpack.config.js
 module.exports = {
-  // other options...
+  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
   module: {
     loaders: [
       {
@@ -16,14 +16,14 @@ module.exports = {
       }
     ]
   },
-  // vue-loader configurations
+  // vue-loader 설정
   vue: {
-    // ... other vue options
+    // 이 부분엔 다른 Vue 옵션도 들어 갈 수 있습니다.
     loaders: {
-      // load all <script> without "lang" attribute with coffee-loader
+      // coffee-loader에 "lang" 속성이 없는 모든 <script>를 로드하세요.
       js: 'coffee',
-      // load <template> directly as HTML string, without piping it
-      // through vue-html-loader first
+      // <template>을 HTML 문자열로 직접 로드하면
+      // vue-html-loader를 통해 파이핑하지 않아도 됩니다.
       html: 'raw'
     }
   }
@@ -34,14 +34,14 @@ module.exports = {
 
 ``` js
 module.exports = {
-  // other options...
+  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
   module: {
-    // module.rules is the same as module.loaders in 1.x
+    // module.rules는 1.x의 module.loaders와 동일합니다.
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue',
-        // vue-loader options goes here
+        // vue-loader 옵션은 이곳에 옵니다.
         options: {
           loaders: {
             // ...
diff --git a/docs/ko/configurations/extract-css.md b/docs/ko/configurations/extract-css.md
index a659e096e..7c90a0e13 100644
--- a/docs/ko/configurations/extract-css.md
+++ b/docs/ko/configurations/extract-css.md
@@ -13,7 +13,7 @@ npm install extract-text-webpack-plugin --save-dev
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
-  // other options...
+  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
   module: {
     loaders: [
       {
@@ -25,7 +25,7 @@ module.exports = {
   vue: {
     loaders: {
       css: ExtractTextPlugin.extract("css"),
-      // you can also include <style lang="less"> or other langauges
+      // 당신은 <style lang="less"> 또는 다른 언어도 포함할 수 있습니다.
       less: ExtractTextPlugin.extract("css!less")
     }
   },
@@ -46,7 +46,7 @@ npm install extract-text-webpack-plugin@2.x --save-dev
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
-  // other options...
+  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
   module: {
     rules: [
       {
@@ -56,7 +56,7 @@ module.exports = {
           loaders: {
             css: ExtractTextPlugin.extract({
               loader: 'css-loader',
-              fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+              fallbackLoader: 'vue-style-loader' // <- 이것은 vue-loader가 필요 없으므로 npm3를 사용하는 경우 명시적으로 설치할 필요가 없습니다.
             })
           }
         }
diff --git a/docs/ko/configurations/pre-processors.md b/docs/ko/configurations/pre-processors.md
index 4aa5f5e0e..ccadeddfe 100644
--- a/docs/ko/configurations/pre-processors.md
+++ b/docs/ko/configurations/pre-processors.md
@@ -55,7 +55,7 @@ div
 
 ``` html
 <style lang="sass?outputStyle=expanded">
-  /* use sass here with expanded output */
+  /* 여기에 SASS를 사용하세요! */
 </style>
 ```
 
diff --git a/docs/ko/features/css-modules.md b/docs/ko/features/css-modules.md
index 949a2f4b8..bbfb76fc9 100644
--- a/docs/ko/features/css-modules.md
+++ b/docs/ko/features/css-modules.md
@@ -24,7 +24,7 @@
 ``` html
 <template>
   <p :class="$style.red">
-    This should be red
+    이것은 빨간색이야
   </p>
 </template>
 ```
@@ -35,16 +35,16 @@
 <template>
   <div>
     <p :class="{ [$style.red]: isRed }">
-      Am I red?
+      나는 빨간색이야?
     </p>
     <p :class="[$style.red, $style.bold]">
-      Red and bold
+      나는 빨간색이면서 볼드야
     </p>
   </div>
 </template>
 ```
 
-또한 Javascript에서도 접근할 수 있습니다.
+또한 JavaScript에서도 접근할 수 있습니다.
 
 ``` html
 <script>
@@ -52,7 +52,7 @@ export default {
   created () {
     console.log(this.$style.red)
     // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
-    // an identifier generated based on filename and className.
+    // 파일 이름과 className을 기반으로 생성된 식별자
   }
 }
 </script>
@@ -66,11 +66,11 @@ export default {
 
 ``` html
 <style module="a">
-  /* identifiers injected as a */
+  /* a로 주입된 식별자 */
 </style>
 
 <style module="b">
-  /* identifiers injected as b */
+  /* b로 주입된 식별자 */
 </style>
 ```
 
@@ -92,7 +92,7 @@ CSS Modules는 [css-loader](https://github.com/webpack/css-loader)를 통해 처
 // webpack 1
 vue: {
   cssModules: {
-    // overwrite local ident name
+    // 로컬 ID값을 덮어씌웁니다.
     localIdentName: '[path][name]---[local]---[hash:base64:5]',
     // enable camelCase
     camelCase: true
diff --git a/docs/ko/features/postcss.md b/docs/ko/features/postcss.md
index 4bcf1f76f..b226eb0b3 100644
--- a/docs/ko/features/postcss.md
+++ b/docs/ko/features/postcss.md
@@ -7,9 +7,9 @@ Webpack 1.x의 예제입니다.
 ``` js
 // webpack.config.js
 module.exports = {
-  // other configs...
+  // 여기에 다른 옵션이 올 수 있습니다.
   vue: {
-    // use custom postcss plugins
+    // 커스텀 PostCSS 플러그인을 사용하세요.
     postcss: [require('postcss-cssnext')()]
   }
 }
@@ -20,14 +20,14 @@ Webpack 2.x의 예제입니다.
 ``` js
 // webpack.config.js
 module.exports = {
-  // other options...
+  // 여기에 다른 옵션이 올 수 있습니다.
   module: {
-    // module.rules is the same as module.loaders in 1.x
+    // module.rules는 1.x의 module,loaders와 같습니다.
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue',
-        // vue-loader options goes here
+        // vue-loader 옵션은 이곳에 옵니다.
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
@@ -39,7 +39,6 @@ module.exports = {
 }
 ```
 
-In addition to providing an Array of plugins, the `postcss` option also accepts:
 `postcss` 옵션은 플러그인의 배열을 제공하는 것 외에도 다음 옵션을 사용할 수 있습니다.
 
 - 플러그인 배열을 반환하는 함수.
@@ -48,9 +47,9 @@ In addition to providing an Array of plugins, the `postcss` option also accepts:
 
   ``` js
   postcss: {
-    plugins: [...], // list of plugins
+    plugins: [...], // 플러그인의 리스트
     options: {
-      parser: sugarss // use sugarss parser
+      parser: sugarss // sugarss parser 사용
     }
   }
   ```
diff --git a/docs/ko/features/scoped-css.md b/docs/ko/features/scoped-css.md
index 6c17f2544..43aa1ef99 100644
--- a/docs/ko/features/scoped-css.md
+++ b/docs/ko/features/scoped-css.md
@@ -34,11 +34,11 @@
 
   ``` html
   <style>
-  /* global styles */
+  /* 전역 스타일 */
   </style>
 
   <style scoped>
-  /* local styles */
+  /* 로컬 스타일 */
   </style>
   ```
 
diff --git a/docs/ko/options.md b/docs/ko/options.md
index cc80cc3ac..f87fa4e6c 100644
--- a/docs/ko/options.md
+++ b/docs/ko/options.md
@@ -8,7 +8,7 @@ Webpack 1.x의 경우 Webpack 설정에 루트 `vue` 블럭을 추가합니다.
 module.exports = {
   // ...
   vue: {
-    // vue-loader options
+    // vue-loader 옵션
   }
 }
 ```
@@ -24,7 +24,7 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue',
         options: {
-          // vue-loader options
+          // vue-loader 옵션
         }
       }
     ]
@@ -75,9 +75,9 @@ module.exports = {
 
   ``` js
   postcss: {
-    plugins: [...], // list of plugins
+    plugins: [...], // 플러그인 리스트
     options: {
-      parser: sugarss // use sugarss parser
+      parser: sugarss // sugarss parser를 사용합니다.
     }
   }
   ```
@@ -96,7 +96,7 @@ module.exports = {
 - 타입: `Boolean`
 - 디폴트: `undefined`
 
-  Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
+  esModule 호환 코드를 사용할지 여부입니다. 기본적으로 vue-loader는 `module.exports = ....`와 같은 CommonJS 형식으로 내보냅니다. `esModule`이 true로 설정되면 내보내기는 `exports.__esModule = true; exports = ...`로 변환됩니다. TypeScript와 같은 Babel 이외의 변환툴과의 연동에 유용합니다.
 
 ### preserveWhitespace
 
@@ -129,11 +129,11 @@ module.exports = {
   // webpack 1
   vue: {
     buble: {
-      // enable object spread operator
-      // NOTE: you need to provide Object.assign polyfill yourself!
+      // Object spread 연산자를 허용합니다.
+      // 참고: 직접 Object.assign polyfill을 제공해야합니다!
       objectAssign: 'Object.assign',
 
-      // turn off the `with` removal
+      // `with` 제거 옵션을 끄십시오.
       transforms: {
         stripWith: false
       }
@@ -148,7 +148,7 @@ module.exports = {
         loader: 'vue',
         options: {
           buble: {
-            // same options
+            // 같은 옵션입니다.
           }
         }
       }
diff --git a/docs/ko/workflow/linting.md b/docs/ko/workflow/linting.md
index a99eb0edf..f3a88a021 100644
--- a/docs/ko/workflow/linting.md
+++ b/docs/ko/workflow/linting.md
@@ -27,7 +27,7 @@ npm install eslint eslint-loader --save-dev
 ``` js
 // webpack.config.js
 module.exports = {
-  // ... other options
+  // 여기에 다른 옵션이 올 수 있습니다.
   module: {
     loaders: [
       {
@@ -46,9 +46,9 @@ Webpack 로더 체인은 **가장 먼저** 적용됩니다. `vue` 전에 `eslint
 ``` js
 // webpack.config.js
 module.exports = {
-  // ... other options
+  // 여기에 다른 옵션이 올 수 있습니다.
   module: {
-    // only lint local *.vue files
+    // 오직 로컬 *.vue 파일만 lint합니다.
     preLoaders: [
       {
         test: /.vue$/,
@@ -56,7 +56,7 @@ module.exports = {
         exclude: /node_modules/
       }
     ],
-    // but use vue-loader for all *.vue files
+    // 하지만 모든 *.vue 파일에 대해 vue-loader를 사용하세요.
     loaders: [
       {
         test: /.vue$/,
@@ -72,17 +72,17 @@ Webpack 2.x에서는 다음과 같이 처리합니다.
 ``` js
 // webpack.config.js
 module.exports = {
-  // ... other options
+  // 여기에 다른 옵션이 올 수 있습니다.
   module: {
     rules: [
-      // only lint local *.vue files
+      // 오직 로컬 *.vue 파일만 lint합니다.
       {
         enforce: 'pre',
         test: /.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       },
-      // but use vue-loader for all *.vue files
+      // 하지만 모든 *.vue 파일에 대해 vue-loader를 사용하세요.
       {
         test: /.vue$/,
         loader: 'vue'
diff --git a/docs/ko/workflow/production.md b/docs/ko/workflow/production.md
index ce9064225..d500ec5c6 100644
--- a/docs/ko/workflow/production.md
+++ b/docs/ko/workflow/production.md
@@ -10,21 +10,21 @@
 ``` js
 // webpack.config.js
 module.exports = {
-  // ... other options
+  // 여기에 다른 옵션이 올 수 있습니다.
   plugins: [
-    // short-circuits all Vue.js warning code
+    // 모든 Vue.js 경고 코드를 숨깁니다.
     new webpack.DefinePlugin({
       'process.env': {
         NODE_ENV: '"production"'
       }
     }),
-    // minify with dead-code elimination
+    // 불필요한 코드를 제거하여 minify합니다.
     new webpack.optimize.UglifyJsPlugin({
       compress: {
         warnings: false
       }
     }),
-    // optimize module ids by occurence count
+    // 발생 횟수에 따라 모듈 ID를 최적화합니다.
     new webpack.optimize.OccurenceOrderPlugin()
   ]
 }
diff --git a/docs/ko/workflow/testing-with-mocks.md b/docs/ko/workflow/testing-with-mocks.md
index e1ed5e80a..df23e93d0 100644
--- a/docs/ko/workflow/testing-with-mocks.md
+++ b/docs/ko/workflow/testing-with-mocks.md
@@ -2,7 +2,7 @@
 
 리얼 월드 어플리케이션에서는 컴포넌트에 외부 의존성이 있을 가능성이 큽니다. 컴포넌트에 대한 유닛 테스트를 작성할 때 테스트가 테스트 중인 컴포넌트의 동작에만 의존하도록 mock을 만드는 것이 이상적 입니다.
 
-`vue-loader`는 [inject-loader](https://github.com/plasticine/inject-loader)를 사용하여 임의의 의존성을 `*.vue` 컴포넌트에 주입 할 수 있는 기능을 제공합니다. 일반적인 아이디어로 컴포넌트 모듈을 직접 가져오는 대신 `inject-loader`를 사용하여 해당 모듈에 대한 "모듈 팩토리" 함수를 생성하는 것 입니다. 이 함수가 mock 객체와 함께 호출되면 mock 객체가 삽입된 모듈의 인스턴트를 반환합니다.
+`vue-loader`는 [inject-loader](https://github.com/plasticine/inject-loader)를 사용하여 임의의 의존성을 `*.vue` 컴포넌트에 주입 할 수 있는 기능을 제공합니다. 일반적인 아이디어로 컴포넌트 모듈을 직접 가져오는 대신 `inject-loader`를 사용하여 해당 모듈에 대한 "모듈 팩토리" 함수를 생성하는 것 입니다. 이 함수가 목업 객체와 함께 호출되면 목업 객체가 삽입된 모듈의 인스턴트를 반환합니다.
 
 다음과 같은 컴포넌트가 있다고 가정해봅시다.
 
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-// this dependency needs to be mocked
+// 이 의존성은 목업이 되야 합니다.
 import SomeService from '../service'
 
 export default {
@@ -26,7 +26,7 @@ export default {
 </script>
 ```
 
-mock을 가져오는 방법은 다음과 같습니다.
+목업을 가져오는 방법은 다음과 같습니다.
 
 > 주의: `inject-loader@3.x`는 현재 불안정합니다.
 

From 8b257470e157f2d2861bac17f9b9a2e2b4facf36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangJoo=20Park=28=EB=B0=95=EC=B0=BD=EC=A3=BC=29?=
 <pcjpcj2@gmail.com>
Date: Tue, 20 Dec 2016 23:04:31 +0900
Subject: [PATCH 435/877] missing single qoute

---
 docs/en/features/css-modules.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index 09ebb20ad..253095778 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -86,8 +86,7 @@ CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader
 }
 ```
 
-You can use vue-loader
-s `cssModules` option to provide additional query options to `css-loader`:
+You can use vue-loader's `cssModules` option to provide additional query options to `css-loader`:
 
 ``` js
 // webpack 1

From 6c3ec8e3b8914e23279b4ee0064677f2fb242b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangJoo=20Park=28=EB=B0=95=EC=B0=BD=EC=A3=BC=29?=
 <pcjpcj2@gmail.com>
Date: Wed, 21 Dec 2016 11:52:45 +0900
Subject: [PATCH 436/877] Update Korean (#546)

---
 docs/ko/README.md                        | 12 +++++------
 docs/ko/configurations/advanced.md       |  4 ++--
 docs/ko/configurations/asset-url.md      |  4 ++--
 docs/ko/configurations/pre-processors.md | 20 +++++++++---------
 docs/ko/features/css-modules.md          | 24 +++++++++++-----------
 docs/ko/features/es2015.md               | 10 ++++-----
 docs/ko/features/hot-reload.md           |  6 +++---
 docs/ko/features/postcss.md              |  6 +++---
 docs/ko/features/scoped-css.md           |  6 +++---
 docs/ko/options.md                       |  6 +++---
 docs/ko/start/setup.md                   |  8 ++++----
 docs/ko/start/spec.md                    | 22 ++++++++++----------
 docs/ko/workflow/linting.md              |  8 ++++----
 docs/ko/workflow/production.md           |  8 ++++----
 docs/ko/workflow/testing-with-mocks.md   |  6 +++---
 docs/ko/workflow/testing.md              | 26 ++++++++++++------------
 16 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/docs/ko/README.md b/docs/ko/README.md
index 7af94c305..ba55ada21 100644
--- a/docs/ko/README.md
+++ b/docs/ko/README.md
@@ -2,17 +2,17 @@
 
 ### `vue-loader`는 무엇인가요?
 
-`vue-loader`는 다음과 같은 형태로 작성된 Vue 컴포넌트를 일반적인 자바스크립트 모듈로 변환할 수 있는 Webpack 로더입니다.
+`vue-loader`는 다음과 같이 작성된 Vue 컴포넌트를 일반적인 자바스크립트 모듈로 변환할 수 있는 Webpack에서 사용하는 로더입니다.
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 다음은 `vue-loader`가 제공하는 여러가지 유용한 기능입니다.
 
 - 기본적으로 ES2015를 지원합니다.
-- Vue 컴포넌트 각 요소에 따라 서로 다른 Webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 SASS, `<template>`에 Jade로 각각 설정 가능합니다.
+- 각 Vue 컴포넌트 마다 서로 다른 Webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 SASS, `<template>`에 Jade로 각각 설정 가능합니다.
 - `<style>`과 `<template>`에서 참조된 정적 Asset 파일을 모듈로 취급하고 Webpack 로더로 처리합니다.
 - 각 컴포넌트마다 지정된 CSS를 시뮬레이트 할 수 있습니다.
-- 개발 중에 컴포넌트 hot-reloading을 지원합니다.
+- 개발 중에 컴포넌트 핫 리로딩을 지원합니다.
 
 한 마디로 Webpack과 `vue-loader`의 결합은 Vue.js 어플리케이션을 제작하기위한 현대적이고 유연하며 매우 강력한 작업환경을 제공합니다.
 
@@ -24,9 +24,9 @@
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
-간단한 예를 들어보자면, 우리가 많은 CommonJS 모듈을 가지고 있다고 가정해봅시다. 모듈들은 브라우저 내부에서 바로 실행될 수 없기에 `<script>` 태그를 통해 불러올 수 있도록 하나의 파일로 "묶어"야 합니다. Webpack은 `require()` 호출을 통해 의존되어 있는 각 파일을 하나로 묶을 수 있습니다.
+간단한 예를 들어보자면, 우리가 많은 CommonJS 모듈을 가지고 있다고 가정해봅시다. 모듈들은 브라우저 내부에서 바로 실행될 수 없으므로 `<script>` 태그를 통해 불러올 수 있도록 하나의 파일로 "묶어"야 합니다. Webpack은 `require()` 호출을 통해 의존하는 각 파일을 하나로 묶을 수 있습니다.
 
-여기서 Webpack은 묶는일 외에도 더 많은 일을 할 수 있습니다. "로더들"을 사용하면 최종 Bundle(묶음)을 출력하기 전에 원하는 방식으로 모든 유형의 파일을 변환할 수 있도록 Webpack에 지시할 수 있습니다. 몇 가지 예를 봅시다.
+여기서 Webpack은 묶는일 외에도 더 많은 일을 할 수 있습니다. "로더"들을 사용하면 최종 Bundle(묶음)을 출력하기 전에 원하는 방식으로 모든 유형의 파일을 변환할 수 있도록 Webpack에 지시할 수 있습니다. 몇 가지 예를 봅시다.
 
 - ES2015 또는 CoffeeScript, TypeScript 모듈을 ES5 CommonJS 모듈로 변환할 수 있습니다.
 - 선택 사항으로 컴파일 전에 linter를 이용하여 소스 코드를 연결 할 수 있습니다.
@@ -34,4 +34,4 @@
 - SASS 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 JavaScript 스니펫으로 변환합니다.
 - HTML 또는 CSS에서 참조된 이미지 파일을 처리하고 경로 구성에 따라 이동한 후 md5 해시를 사용하여 이름을 지정합니다.
 
-Webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 단점은 장황하고 복잡한 구성입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 Webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
\ No newline at end of file
+Webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 구성하기에 장황하고 복잡한 것이 단점입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 Webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
diff --git a/docs/ko/configurations/advanced.md b/docs/ko/configurations/advanced.md
index c88186b96..41f9a5a0b 100644
--- a/docs/ko/configurations/advanced.md
+++ b/docs/ko/configurations/advanced.md
@@ -1,6 +1,6 @@
 # 고급 로더 설정
 
-때로는 `vue-loader`가 그것을 추론하는 대신 언어에 커스텀 로더 스트링을 적용하기를 원할 수도 있습니다. 또는 디폴트 언어에서 기본적으로 제공되는 로더 설정을 덮어쓰고 싶을 수도 있습니다. 이를 위해서 Webpack 설정 파일에 `vue` 블럭을 추가하고 `loaders` 옵션을 지정하세요.
+때로는 `vue-loader`가 그것을 추론하는 대신 언어에 사용자 정의 로더 문자열을 적용하기를 원할 수도 있습니다. 또는 기본 언어에서 기본적으로 제공되는 로더 설정을 덮어쓰고 싶을 수도 있습니다. 이를 위해서 Webpack 설정 파일에 `vue` 블럭을 추가하고 `loaders` 옵션을 지정할 수 있습니다.
 
 ### Webpack 1.x
 
@@ -53,4 +53,4 @@ module.exports = {
 }
 ```
 
-고급 로더 설정을 보다 실용적으로 사용하면 [컴포넌트 내부의 CSS를 단일 파일로 추출할 수 있습니다](./extract-css.md).
\ No newline at end of file
+고급 로더 설정을 보다 실용적으로 사용하면 [컴포넌트 내부의 CSS를 단일 파일로 추출할 수 있습니다](./extract-css.md).
diff --git a/docs/ko/configurations/asset-url.md b/docs/ko/configurations/asset-url.md
index a0520f9d2..bacf1487b 100644
--- a/docs/ko/configurations/asset-url.md
+++ b/docs/ko/configurations/asset-url.md
@@ -1,6 +1,6 @@
 # Asset URL 핸들링
 
-기본적으로, `vue-loader`는 [css-loader](https://github.com/webpack/css-loader)와 Vue 템플릿 컴파일러로 스타일과 템플릿을 자동으로 처리합니다. 이 컴파일 과정에서 `<img src="...">`, `background: url(...)`, CSS `@import`와 같은 모든 Asset URL은 **모듈 종속성**으로 해결됩니다.
+기본적으로, `vue-loader`는 [css-loader](https://github.com/webpack/css-loader)와 Vue 템플릿 컴파일러로 스타일과 템플릿을 자동으로 처리합니다. 이 컴파일 과정에서 `<img src="...">`, `background: url(...)`, CSS `@import`와 같은 모든 Asset URL은 **모듈 종속성** 으로 해결됩니다.
 
 예를 들어, `url(./image.png)`는 `require('./image.png')`로 변환되어,
 
@@ -20,4 +20,4 @@ createElement('img', { attrs: { src: require('../image.png') }})
 
 1. `file-loader`는 당신이 Asset 파일을 복사하여 붙여넣을 곳을 지정하고 더 나은 캐싱을 위해 버전 해시를 사용하여 이름을 지정하는 방법을 사용합니다. 더 나아가 **이것은 `*.vue` 파일 옆에 이미지를 놓고 배포 URL에 대해 걱정하지 않으면서 폴더 구조를 기반으로 상대 경로를 사용할 수 있습니다**. 올바른 설정을 사용하면 Webpack은 파일 경로를 번들 아웃풋을 올바른 URL로 자동으로 재작성합니다.
 
-2. `url-loader`는 파일이 주어진 값보다 작은 경우 조건부로 파일을 base-64 데이터 URL로 인라인 할 수 있도록 합니다. 이렇게하면 사소한 파일들에 대한 HTTP 요청의 양을 줄일 수 있습니다. 파일이 주어진 값보다 크면 자동으로 `file-loader`로 돌아갑니다.
\ No newline at end of file
+2. `url-loader`는 파일이 주어진 값보다 작은 경우 조건부로 파일을 base-64 데이터 URL로 인라인 할 수 있도록 합니다. 이렇게하면 사소한 파일들에 대한 HTTP 요청의 양을 줄일 수 있습니다. 파일이 주어진 값보다 크면 자동으로 `file-loader`로 돌아갑니다.
diff --git a/docs/ko/configurations/pre-processors.md b/docs/ko/configurations/pre-processors.md
index ccadeddfe..6ba9f83b8 100644
--- a/docs/ko/configurations/pre-processors.md
+++ b/docs/ko/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # 전처리기 사용하기
 
-Webpack에서는 모든 전처리기가 해당 로더와 함께 적용되어야 합니다. `vue-loader`는 다른 Webpack 로더를 사용하여 Vue 컴포넌트의 일부를 처리 할 수 있게합니다. language block의 `lang` 속성에서 사용할 적절한 로더를 자동으로 유추합니다.
+Webpack에서는 모든 전처리기가 해당 로더와 함께 적용되어야 합니다. `vue-loader`는 다른 Webpack 로더를 사용하여 Vue 컴포넌트의 일부를 처리 할 수 있게 합니다. 언어 블럭의 `lang` 속성에서 사용할 적절한 로더를 자동으로 알아챕니다.
 
 ### CSS
 
@@ -12,15 +12,15 @@ npm install sass-loader node-sass --save-dev
 
 ``` html
 <style lang="sass">
-  /* write sass here */
+  /* sass로 작성하세요 */
 </style>
 ```
 
 내부적으로, `<style>` 태그 안의 텍스트 내용은 후처리를 위해서 전달되기 전에 `sass-loader`에 의해 먼저 컴파일됩니다.
 
-### Javascript
+### JavaScript
 
-Vue 컴포넌트 내의 모든 Javascript는 기본적으로 `babel-loader`에 의해서 처리됩니다. 물론 당신은 그것을 변경할 수 있습니다.
+Vue 컴포넌트 내의 모든 JavaScript는 기본적으로 `babel-loader`에 의해서 처리됩니다. 물론 변경할 수 있습니다.
 
 ``` bash
 npm install coffee-loader --save-dev
@@ -28,13 +28,13 @@ npm install coffee-loader --save-dev
 
 ``` html
 <script lang="coffee">
-  # Write coffeescript!
+  # coffeescript로 작성하세요!
 </script>
 ```
 
-### Templates
+### 템플릿
 
-`pug-loader`와 같은 대부분의 Webpack 템플릿 로더는 컴파일된 HTML 문자열 대신 템플릿 함수를 반환하기 때문에 템플릿 처리 앞서 처리한 방법과는 약간 다릅니다. `pug-loader` 대신 원래의 `pug` 파일을 설치하여 사용할 수 있습니다.
+`pug-loader`와 같은 대부분의 Webpack 템플릿 로더는 컴파일된 HTML 문자열 대신 템플릿 함수를 반환하기 때문에 템플릿 처리는 앞서 처리한 방법과 약간 다릅니다. `pug-loader` 대신 원래의 `pug` 파일을 설치하여 사용할 수 있습니다.
 
 ``` bash
 npm install pug --save-dev
@@ -47,7 +47,7 @@ div
 </template>
 ```
 
-> **중요:** 만약 당신이 `vue-loader@<8.2.0`을 사용한다면, 당신은 `template-html-loader`도 설치해야 합니다.
+> **중요:** 만약 `vue-loader@<8.2.0`을 사용한다면, `template-html-loader`도 설치해야 합니다.
 
 ### 인라인 로더 요청
 
@@ -55,8 +55,8 @@ div
 
 ``` html
 <style lang="sass?outputStyle=expanded">
-  /* 여기에 SASS를 사용하세요! */
+  /* sass로 작성하세요 */
 </style>
 ```
 
-그러나 이것은 Vue 컴포넌트가 Webpack에 한정되어 있고 Browserify 및 [vueify](https://github.com/vuejs/vueify)와 호환되지 않습니다. **Vue 컴포넌트를 재사용 가능한 써드파티로 제공하려면 이 구문을 사용하지 마십시오.**
\ No newline at end of file
+그러나 이것은 Vue 컴포넌트가 Webpack에 한정되어 있고 Browserify 및 [vueify](https://github.com/vuejs/vueify)와 호환되지 않습니다. **Vue 컴포넌트를 재사용 가능한 써드파티로 제공하려면 이 구문을 사용하지 마십시오.**
diff --git a/docs/ko/features/css-modules.md b/docs/ko/features/css-modules.md
index bbfb76fc9..a8e073dbf 100644
--- a/docs/ko/features/css-modules.md
+++ b/docs/ko/features/css-modules.md
@@ -1,12 +1,12 @@
-# CSS Modules
+# CSS 모듈
 
-> requires ^9.8.0
+> 9.8.0 이상 버전을 요구합니다
 
-[CSS Modules](https://github.com/css-modules/css-modules)은 CSS을 모듈화하고 구성하는데 널리 사용되는 시스템입니다. `vue-loader`는 스뮬레이트된 범위 CSS의 대안으로 CSS Modules와 함께 first-class intergration을 제공합니다.
+[CSS 모듈](https://github.com/css-modules/css-modules)은 CSS을 모듈화하고 구성하는데 널리 사용되는 시스템입니다. `vue-loader`는 시뮬레이트된 범위 CSS의 대안으로 CSS 모듈과 함께 1급 클래스로의 통합을 제공합니다.
 
 ### 사용법
 
-`<style>`에 `moudle` 속성을 삽입하니다.
+`<style>`에 `moudle` 속성을 삽입합니다.
 
 ``` html
 <style module>
@@ -19,7 +19,7 @@
 </style>
 ```
 
-이렇게하면 `css-loader`에 대한 CSS Modules 모드가 켜지고 결과적으로 클래스 식별자 오브젝트는 `$style` 이름의 계산된 속성으로 컴포넌트에 주입됩니다. 당신은 동적 클래스 바인딩을 사용하여 템플릿에서 이를 사용할 수 있습니다.
+이렇게하면 `css-loader`에 대한 CSS 모듈 모드가 켜지고 결과적으로 클래스 식별자 오브젝트는 `$style` 이름의 계산된 속성으로 컴포넌트에 주입됩니다. 동적 클래스 바인딩을 사용하여 템플릿에서 이를 사용할 수 있습니다.
 
 ``` html
 <template>
@@ -29,7 +29,7 @@
 </template>
 ```
 
-그것은 계산된 속성이기 때문에 `:class`의 오브젝트/배열 문법에도 작동합니다.
+이는 계산된 속성이기 때문에 `:class`의 오브젝트/배열 문법에도 작동합니다.
 
 ``` html
 <template>
@@ -58,11 +58,11 @@ export default {
 </script>
 ```
 
-[global exceptions](https://github.com/css-modules/css-modules#exceptions)과 [composition](https://github.com/css-modules/css-modules#composition) 같은 자세한 정보는 [CSS Modules 스펙](https://github.com/css-modules/css-modules)을 참고하세요.
+[전역 예외사항](https://github.com/css-modules/css-modules#exceptions)과 [구성](https://github.com/css-modules/css-modules#composition) 같은 자세한 정보는 [CSS 모듈 스펙](https://github.com/css-modules/css-modules)을 참고하세요.
 
-### 속성 이름 커스터마이징
+### 사용자 정의 이름 주입
 
-하나의 `*.vue` 컴포넌트 내에 하나 이상의 `<style>` 태그를 가질 수 있습니다. 삽입된 스타일이 서로 덮어 쓰지 않게하려면 `module` 속성에 값을 지정하여 계산된 속성의 이름을 커스터마이징할 수 있습니다.
+하나의 `*.vue` 컴포넌트 내에 하나 이상의 `<style>` 태그를 가질 수 있습니다. 삽입된 스타일이 서로 덮어 쓰지 않게하려면 `module` 속성에 값을 지정하여 계산된 속성의 이름을 사용자 정의할 수 있습니다.
 
 ``` html
 <style module="a">
@@ -76,7 +76,7 @@ export default {
 
 ### `css-loader` 쿼리 설정
 
-CSS Modules는 [css-loader](https://github.com/webpack/css-loader)를 통해 처리됩니다. `<style module>`을 사용하면 `css-loader`에 사용되는 기본적인 쿼리는 다음과 같습니다.
+CSS 모듈은 [css-loader](https://github.com/webpack/css-loader)를 통해 처리됩니다. `<style module>`을 사용하면 `css-loader`에 사용되는 기본적인 쿼리는 다음과 같습니다.
 
 ``` js
 {
@@ -92,9 +92,9 @@ CSS Modules는 [css-loader](https://github.com/webpack/css-loader)를 통해 처
 // webpack 1
 vue: {
   cssModules: {
-    // 로컬 ID값을 덮어씌웁니다.
+    // 로컬 ID값을 덮어 씁니다.
     localIdentName: '[path][name]---[local]---[hash:base64:5]',
-    // enable camelCase
+    // camelCase를 사용합니다
     camelCase: true
   }
 }
diff --git a/docs/ko/features/es2015.md b/docs/ko/features/es2015.md
index fefbc917a..857569eee 100644
--- a/docs/ko/features/es2015.md
+++ b/docs/ko/features/es2015.md
@@ -22,11 +22,11 @@ export default {
 </script>
 ```
 
-여기서는 ES2015의 오브젝트 리터럴을 사용하여 하위 컴포넌트를 구성합니다. `{ ComponentA }`는 `{ ComponentA: ComponentA }`의 줄임말 입니다. Vue는 키를 자동으로 `component-a`로 변환하기 때문에 당신은 템플릿에서 가져온 컴포넌트롤 `<component-a>`로 사용할 수 있습니다.
+여기서는 ES2015의 오브젝트 리터럴을 사용하여 하위 컴포넌트를 구성합니다. `{ ComponentA }`는 `{ ComponentA: ComponentA }`의 줄임말 입니다. Vue는 키를 자동으로 `component-a`로 변환하기 때문에 템플릿에서 가져온 컴포넌트를 `<component-a>`로 사용할 수 있습니다.
 
 ### 템플릿의 ES2015
 
-`*.vue`파일의 `<template>`는 Javascript 렌더링 함수로 컴파일 된 다음 [Buble](https://buble.surge.sh/guide/)의 사용자 정의 빌드로 처리되어 ES2015 기능을 지원합니다. 이를 통해 [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-)과 [computed properties](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)과 같은 기능을 이용할 수 있습니다.
+`*.vue`파일의 `<template>`는 JavaScript 렌더링 함수로 컴파일 된 다음 [Buble](https://buble.surge.sh/guide/)의 사용자 정의 빌드로 처리되어 ES2015 기능을 지원합니다. 이를 통해 [객체 약어 속성](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-)과 [계산된 속성](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)과 같은 기능을 이용할 수 있습니다.
 
 ``` html
 <div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
@@ -38,7 +38,7 @@ export default {
 <div :class="{ active, [`${prefix}-button`]: isButton }">
 ```
 
-**vue@^2.1.0 only:** `v-for` 또는 scoped slot을 사용하여 매개 변수 소멸을 사용할 수도 있습니다.
+**vue@^2.1.0만 가능합니다:** `v-for` 또는 범위를 가지는 slot을 사용하여 매개 변수 소멸을 사용할 수도 있습니다.
 
 ``` html
 <li v-for="{ id, text } in items">
@@ -58,8 +58,8 @@ export default {
 
 ### 일반적인 `.js` 파일로 변환하기
 
-`vue-loader`는 오직 `*.vue` 파일만 처리하기 때문에 Webpack config 파일에 `babel-loader` 또는 `buble-loader`를 사용하여 보통 `*.js` 파일을 처리하도록 지시해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트는 이미 당신을 위해 그렇게 설정되어 있습니다.
+`vue-loader`는 오직 `*.vue` 파일만 처리하기 때문에 Webpack 설정 파일에 `babel-loader` 또는 `buble-loader`를 사용하여 보통 `*.js` 파일을 처리하도록 지시해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트는 이미 당신을 위해 그렇게 설정되어 있습니다.
 
 ### `.babelrc`로 Babel 설정하기
 
-`babel-loader`는 [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)를 존중하므로 Babel 설정과 플로그인을 구성하는데 권장되는 방법입니다.
+`babel-loader`는 [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)를 우선하므로 Babel 설정과 플러그인을 구성하는데 권장되는 방법입니다.
diff --git a/docs/ko/features/hot-reload.md b/docs/ko/features/hot-reload.md
index cc9a34e41..0fff2bead 100644
--- a/docs/ko/features/hot-reload.md
+++ b/docs/ko/features/hot-reload.md
@@ -1,7 +1,7 @@
-# Hot Reload
+# 핫 리로드
 
-"Hot Reload"는 파일을 편집 할 때 단순히 페이지를 다시 로드하는 것이 아닙니다. Hot Reload 기능을 사용하면 `*.vue` 파일을 편집 할 때 해당 컴포넌트의 모든 인스턴스가 **페이지를 리로딩하지 않고** 변경됩니다. 심지어 앱의 현재 상태와 변경된 컴포넌트를 보존합니다. 이것은 템플릿 또는 컴포넌트의 스타일을 조정할 때 개발 환경이 크게 개선됩니다.
+"핫 리로드"는 파일을 편집 할 때 단순히 페이지를 다시 로드하는 것이 아닙니다. 핫 리로드 기능을 사용하면 `*.vue` 파일을 편집 할 때 해당 컴포넌트의 모든 인스턴스가 **페이지를 리로딩하지 않고** 변경됩니다. 심지어 앱의 현재 상태와 변경된 컴포넌트를 보존합니다. 이것은 템플릿 또는 컴포넌트의 스타일을 수정할 때 개발 환경이 크게 개선됩니다.
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
-Hot Reload는 `vue-cli`로 프로젝트를 스캐폴딩했다면 바로 사용할 수 있습니다.
+핫 리로드는 `vue-cli`로 프로젝트를 스캐폴딩했다면 바로 사용할 수 있습니다.
diff --git a/docs/ko/features/postcss.md b/docs/ko/features/postcss.md
index b226eb0b3..0c54b4eb0 100644
--- a/docs/ko/features/postcss.md
+++ b/docs/ko/features/postcss.md
@@ -1,6 +1,6 @@
 # PostCSS
 
-`vue-loader`에 의해서 처리된 모든 CSS 아웃풋은 범위가 지정된 CSS의 재작성을 위해 [PostCSS](https://github.com/postcss/postcss)를 통해 파이프됩니다. 당신은 프로세스에 [autoprefixer](https://github.com/postcss/autoprefixer) 또는 [CSSNext](http://cssnext.io/)와 같은 사용자 정의 PostCSS 플러그인을 추가할 수 있습니다.
+`vue-loader`에 의해서 처리된 모든 CSS 출력은 범위가 지정된 CSS의 재 작성을 위해 [PostCSS](https://github.com/postcss/postcss)를 통해 파이프됩니다. 당신은 프로세스에 [autoprefixer](https://github.com/postcss/autoprefixer) 또는 [CSSNext](http://cssnext.io/)와 같은 사용자 정의 PostCSS 플러그인을 추가할 수 있습니다.
 
 Webpack 1.x의 예제입니다.
 
@@ -43,13 +43,13 @@ module.exports = {
 
 - 플러그인 배열을 반환하는 함수.
 
-- PostCSS 프로세서에 전달할 옵션을 포함하는 객체. 이것은 사용자 정의 parser/stringifiers에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
+- PostCSS 프로세서에 전달할 옵션을 포함하는 객체. 이것은 사용자 정의 파서/문자열 변환기에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
 
   ``` js
   postcss: {
     plugins: [...], // 플러그인의 리스트
     options: {
-      parser: sugarss // sugarss parser 사용
+      parser: sugarss // sugarss 파서 사용
     }
   }
   ```
diff --git a/docs/ko/features/scoped-css.md b/docs/ko/features/scoped-css.md
index 43aa1ef99..fa0661efe 100644
--- a/docs/ko/features/scoped-css.md
+++ b/docs/ko/features/scoped-css.md
@@ -1,6 +1,6 @@
-# 범위 CSS
+# 범위를 가지는 CSS
 
-`<style>` 태그가 `scoped` 속성을 가지고있을 때, CSS는 현재 컴포넌트의 요소에만 적용됩니다. 이는 Shadow DOM에 있는 스타일 캡슐화와 유사합니다. 여기에는 몇 가지 주의사항이 있지만 polyfills는 필요 없습니다. PostCSS를 사용한다면 다음과 같이 변환할 수 있습니다.
+`<style>` 태그가 `scoped` 속성을 가지고있을 때, CSS는 현재 컴포넌트의 엘리먼트에만 적용됩니다. 이는 Shadow DOM에 있는 스타일 캡슐화와 유사합니다. 여기에는 몇 가지 주의사항이 있지만 폴리필은 필요 없습니다. PostCSS를 사용한다면 다음과 같이 변환할 수 있습니다.
 
 ``` html
 <style scoped>
@@ -28,7 +28,7 @@
 </template>
 ```
 
-#### 메모
+#### 참고사항
 
 1. 범위가 지정된 스타일과 범위가 지정되지 않은 스타일은 동일한 컴포넌트에 포함 할 수 있습니다.
 
diff --git a/docs/ko/options.md b/docs/ko/options.md
index f87fa4e6c..ba2219835 100644
--- a/docs/ko/options.md
+++ b/docs/ko/options.md
@@ -32,11 +32,11 @@ module.exports = {
 }
 ```
 
-### loaders
+### 로더
 
 - 타입: `Object`
 
-  `*.vue` 파일의 language block에 사용할 Webpack 로더를 지정하는 객체입니다. 이 키는 특별히 지정된 경우 language block에 대한 `lang` 속성에 해당합니다. 각 타입에 대한 기본적인 `lang`은 다음과 같습니다.
+  `*.vue` 파일의 언어 블럭에 사용할 Webpack 로더를 지정하는 객체입니다. 이 키는 특별히 지정된 경우 language block에 대한 `lang` 속성에 해당합니다. 각 타입에 대한 기본적인 `lang`은 다음과 같습니다.
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -71,7 +71,7 @@ module.exports = {
   }
   ```
 
-  이 옵션은 PostCSS 프로세서에 전달할 옵션을 포함하는 객체일 수 있습니다. 이것은 사용자 정의 parser/stringifiers에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
+  이 옵션은 PostCSS 프로세서에 전달할 옵션을 포함하는 객체일 수 있습니다. 이것은 사용자 정의 파서/문자열 변환기에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
 
   ``` js
   postcss: {
diff --git a/docs/ko/start/setup.md b/docs/ko/start/setup.md
index accb5beea..b4a2f5c95 100644
--- a/docs/ko/start/setup.md
+++ b/docs/ko/start/setup.md
@@ -1,8 +1,8 @@
 # 프로젝트 세팅하기
 
-### Syntax Highlighting
+### 구문 강조
 
-먼저 `*.vue` 컴포넌트에 대한 Syntax Highlighting 올바른 표시가 필요할 것입니다. 현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue) 등이 Syntax Highlighting이 지원됩니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 Syntax Highlighting을 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
+먼저 `*.vue` 컴포넌트에 대한 올바른 구문 강조가 필요할 것입니다. 현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) 그리고 [Vim](https://github.com/posva/vim-vue) 등이 구문 강조를 지원합니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 구문 강조를 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
 
 ### `vue-cli` 사용하기
 
@@ -13,5 +13,5 @@ npm install -g vue-cli
 vue init webpack-simple hello-vue
 cd hello-vue
 npm install
-npm run dev # ready to go!
-```
\ No newline at end of file
+npm run dev # 시작할 준비가 되었습니다!
+```
diff --git a/docs/ko/start/spec.md b/docs/ko/start/spec.md
index a93feb1bc..fa13f0c6b 100644
--- a/docs/ko/start/spec.md
+++ b/docs/ko/start/spec.md
@@ -1,6 +1,6 @@
 # Vue 컴포넌트 스펙
 
-`*.vue` 파일은 HTML과 유사한 문법을 사용하여 Vue 컴포넌트를 작성하는 사용자 정의 파일입니다. 각 `*.vue` 파일은 `<template>`와 `<script>`, `<style>` 세 가지 유형의 최상위 language block으로 구성됩니다.
+`*.vue` 파일은 HTML과 유사한 문법을 사용하여 Vue 컴포넌트를 작성하는 사용자 정의 파일입니다. 각 `*.vue` 파일은 `<template>`와 `<script>`, `<style>` 세 가지 유형의 최상위 언어 블럭으로 구성됩니다.
 
 ``` html
 <template>
@@ -24,9 +24,9 @@ export default {
 </style>
 ```
 
-`vue-loader`는 파일을 파싱하고 각 language block을 추출한 다음 필요한 경우 다른 로더를 통해 파이프를 구성하고 `module.exports`가 Vue.js 옵션 객체인 CommonJS 모듈로 다시 합쳐줍니다.
+`vue-loader`는 파일을 파싱하고 각 언어 블럭을 추출한 다음 필요한 경우 다른 로더를 통해 파이프를 구성하고 `module.exports`가 Vue.js 옵션 객체인 CommonJS 모듈로 다시 합쳐줍니다.
 
-`vue-loader`는 language block에 `lang` 속성을 지정하여 CSS 전처리기 혹은 HTML 컴파일 언어를 사용할 수 있습니다. 예를 들어, 다음과 같이 컴포넌트에 SASS를 사용할 수 있습니다.
+`vue-loader`는 언어 블럭에 `lang` 속성을 지정하여 CSS 전처리기 혹은 HTML 컴파일 언어를 사용할 수 있습니다. 예를 들어, 다음과 같이 컴포넌트에 SASS를 사용할 수 있습니다.
 
 ``` html
 <style lang="sass">
@@ -36,7 +36,7 @@ export default {
 
 자세한 내용은 [전처리기 사용하기](../configurations/pre-processors.md)에서 확인할 수 있습니다.
 
-### Language Block
+### 언어 블록
 
 #### `<template>`
 
@@ -54,7 +54,7 @@ export default {
 
 - 이 스크립트는 CommonJS와 같은 환경(Webpack을 통해 번들로 제공되는 `.js` 모듈처럼)에서 실행되기 때문에 다른 파일을 `require()` 할 수 있습니다. 또한 ES2015을 지원하면 `import`와 `export`를 사용할 수 있습니다.
 
-- 스크립트는 Vue.js 컴포넌트 옵션 객체를 내보내야 합니다. `Vue.extend()`에 의해 생선된 확장 생성자를 내보내는 것도 가능하지만, 평범한 객체를 선호합니다.
+- 스크립트는 Vue.js 컴포넌트 옵션 객체를 내보내야 합니다. `Vue.extend()`에 의해 만들어진 확장 생성자를 내보내는 것도 가능하지만, 일반 객체를 선호합니다.
 
 #### `<style>`
 
@@ -62,13 +62,13 @@ export default {
 
 - 여러 개의 `<style>` 태그가 하나의 `*.vue` 파일에 포함될 수 있습니다.
 
-- `<style>` 태그는 컴포넌트에 스타일을 캡슐화 할 수 있도록 `scoped` 또는 `module` 속성을 사용할 수 있습니다. ([범위 CSS](../features/scoped-css.md)와 [CSS Modules](../features/css-modules.md)를 참고하세요)  여러 개의 `<style>` 태그로 동일한 컴포넌트에 캡슐화 모드를 혼합하여 사용 할 수 있습니다.
+- `<style>` 태그는 컴포넌트에 스타일을 캡슐화 할 수 있도록 `scoped` 또는 `module` 속성을 사용할 수 있습니다. ([범위를 가지는 CSS](../features/scoped-css.md)와 [CSS 모듈](../features/css-modules.md)을 참고하세요)  여러 개의 `<style>` 태그로 동일한 컴포넌트에 캡슐화 모드를 혼합하여 사용 할 수 있습니다.
 
-- 기본적으로 내용은 추출되고 `style-loader`를 사용하여 문서의 `<head>`에서 `<style>`태그로 동적으로 삽입됩니다. 또한 모든 [컴포넌트의 스타일이 단일 CSS 파일로 추출되도록](../configurations/extract-css.md) Webpack을 구성할 수 있습니다. 
+- 기본적으로 컨텐츠는 추출되고 `style-loader`를 사용하여 문서의 `<head>`에서 `<style>`태그로 동적으로 삽입됩니다. 또한 모든 [컴포넌트의 스타일이 단일 CSS 파일로 추출되도록](../configurations/extract-css.md) Webpack을 구성할 수 있습니다.
 
 ### Src로 가져오기
 
-`*.vue` 컴포넌트를 여러 파일로 분할하려 할 경우 `src` 속성을 사용하여 language block에 대한 외부 파일을 가져올 수 있습니다.
+`*.vue` 컴포넌트를 여러 파일로 분할하려 할 경우 `src` 속성을 사용하여 언어 블럭에 대한 외부 파일을 가져올 수 있습니다.
 
 ``` html
 <template src="./template.html"></template>
@@ -83,10 +83,10 @@ export default {
 <style src="todomvc-app-css/index.css">
 ```
 
-### Syntax Highlighting
+### 구문 강조
 
-현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm 등)에 Syntax Highlighting 기능이 있습니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 Syntax Highlighting을 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
+현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm 등)에 구문강조 기능이 있습니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 구문 강조를 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
 
 ### 주석
 
-각 블럭 안에는 사용되는 언어의 주석 처리 방법을 사용해야 합니다. 최상위 수준의 주석은 HTML 주석 처리 방법을 사용해주세요. `<!-- 주석 내용을 여기에 적어주세요 -->`
\ No newline at end of file
+각 블럭 안에는 사용되는 언어의 주석 처리 방법을 사용해야 합니다. 최상위 수준의 주석은 HTML 주석 처리 방법을 사용해주세요. `<!-- 주석 내용을 여기에 적어주세요 -->`
diff --git a/docs/ko/workflow/linting.md b/docs/ko/workflow/linting.md
index f3a88a021..7ffe68d46 100644
--- a/docs/ko/workflow/linting.md
+++ b/docs/ko/workflow/linting.md
@@ -1,8 +1,8 @@
 # Linting
 
-`*.vue` 파일은 Javascript가 아니기 때문에 내부 코드를 어떻게 lint하는지 궁금했을 겁니다. 우리는 당신이 [ESLint](http://eslint.org/)를 사용하고 있다고 가정 할 것입니다. (그렇지 않다면 당신은 사용해야합니다!)
+`*.vue` 파일은 JavaScript가 아니기 때문에 내부 코드를 어떻게 lint하는지 궁금했을 겁니다. 우리는 당신이 [ESLint](http://eslint.org/)를 사용하고 있다고 가정합니다. (그렇지 않다면 사용해야합니다!)
 
-당신은 `*.vue` 파일 내에서 Javascript를 추출하고 linting하는 것과 동시에 [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html)이 필요합니다.
+`*.vue` 파일 내에서 JavaScript를 추출하고 linting하는 것과 함께 [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html)이 필요합니다.
 
 그리고 ESLint 설정에 플러그인을 포함해야 합니다.
 
@@ -18,7 +18,7 @@
 eslint --ext js,vue MyComponent.vue
 ```
 
-또 다른 옵션은 [eslint-loader](https://github.com/MoOx/eslint-loader)를 사용하여 개발 중에 `*.vue` 파일이 저장될 때 자동으로 lint되도록 할 수 있습니다.
+또 다른 옵션은 [eslint-loader](https://github.com/MoOx/eslint-loader)를 사용하여 개발 중에 `*.vue` 파일이 저장될 때 자동으로 lint할 수 있습니다.
 
 ``` bash
 npm install eslint eslint-loader --save-dev
@@ -39,7 +39,7 @@ module.exports = {
 }
 ```
 
-Webpack 로더 체인은 **가장 먼저** 적용됩니다. `vue` 전에 `eslint`를 적용하여 컴파일 전 소스코드를 lint하세요.
+Webpack 로더 체인이 **가장 먼저** 적용됩니다. `vue` 전에 `eslint`를 적용하여 컴파일 전 소스코드를 lint하세요.
 
 우리가 고려해야할 한 가지는 NPM 패키지에 포함 된 써드파티 `*.vue` 컴포넌트를 사용하는 것 입니다. 이 경우에 우리는 써드파티 컴포넌트를 처리하기 위해 `vue-loader`를 사용하려고 하지만 그것을 lint하고 싶지는 않습니다. 우리는 lint를 Webpack의 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order)로 분리할 수 있습니다.
 
diff --git a/docs/ko/workflow/production.md b/docs/ko/workflow/production.md
index d500ec5c6..b3eaffad8 100644
--- a/docs/ko/workflow/production.md
+++ b/docs/ko/workflow/production.md
@@ -2,7 +2,7 @@
 
 배포 환경을 위해 번들을 제작할 때는 다음 두 가지 작업을 수행해야 합니다.
 
-1. 어플리케이션 코드를 Minify합니다.
+1. 어플리케이션 코드를 최소화 합니다.
 2. Vue.js 소스 코드의 모든 경고를 제거하려면 [Vue.js 가이드에 설명된 설정](https://vuejs.org/guide/deployment.html)을 사용하세요.
 
 여기 예제 설정이 있습니다.
@@ -18,7 +18,7 @@ module.exports = {
         NODE_ENV: '"production"'
       }
     }),
-    // 불필요한 코드를 제거하여 minify합니다.
+    // 불필요한 코드를 제거하여 최소화 합니다.
     new webpack.optimize.UglifyJsPlugin({
       compress: {
         warnings: false
@@ -30,10 +30,10 @@ module.exports = {
 }
 ```
 
-우리는 개발 중에 이 설정을 사용하고 싶지 않을 것이기 때문에 이것을 해결하는 몇 가지 방법이 있습니다.
+개발 중에는 이 설정을 사용하고 싶지 않으므로 이것을 해결하는 몇 가지 방법이 있습니다.
 
 1. 환경변수 기반으로 설정 오브젝트를 동적으로 빌드할 수 있습니다.
 
 2. 또는 개발용 Webpack 설정 파일과 배포용 설정 파일을 분리하여 사용합니다. 그리고 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)에 표시 된 것처럼 세 번째 파일에서 공통 옵션을 공유할 수도 있습니다.
 
-목표의 달성은 당신에게 달려있습니다.
\ No newline at end of file
+당신에게 목표 달성이 달려있습니다.
diff --git a/docs/ko/workflow/testing-with-mocks.md b/docs/ko/workflow/testing-with-mocks.md
index df23e93d0..0d913006f 100644
--- a/docs/ko/workflow/testing-with-mocks.md
+++ b/docs/ko/workflow/testing-with-mocks.md
@@ -1,6 +1,6 @@
 # 목업을 위한 테스트
 
-리얼 월드 어플리케이션에서는 컴포넌트에 외부 의존성이 있을 가능성이 큽니다. 컴포넌트에 대한 유닛 테스트를 작성할 때 테스트가 테스트 중인 컴포넌트의 동작에만 의존하도록 mock을 만드는 것이 이상적 입니다.
+실제 애플리케이션에서는 컴포넌트에 외부 의존성이 있을 가능성이 큽니다. 컴포넌트에 대한 유닛 테스트를 작성할 때 테스트가 테스트 중인 컴포넌트의 동작에만 의존하도록 mock을 만드는 것이 이상적 입니다.
 
 `vue-loader`는 [inject-loader](https://github.com/plasticine/inject-loader)를 사용하여 임의의 의존성을 `*.vue` 컴포넌트에 주입 할 수 있는 기능을 제공합니다. 일반적인 아이디어로 컴포넌트 모듈을 직접 가져오는 대신 `inject-loader`를 사용하여 해당 모듈에 대한 "모듈 팩토리" 함수를 생성하는 것 입니다. 이 함수가 목업 객체와 함께 호출되면 목업 객체가 삽입된 모듈의 인스턴트를 반환합니다.
 
@@ -39,7 +39,7 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-위 코드의 require 문자열은 미친 것 같습니다. 여기에는 인라인 [webpack loader requests](https://webpack.github.io/docs/loaders.html)이 사용됩니다. 위 코드에 대해서 간단한 설명을 하겠습니다.
+위 코드의 require 문자열은 이상해 보입니다. 여기에는 인라인 [webpack 로더 요청](https://webpack.github.io/docs/loaders.html)이 사용됩니다. 위 코드에 대해서 간단한 설명을 하겠습니다.
 
 - `!!`는 "글로벌 설정에서 모든 로더를 사용하지 못하게 함"을 의미합니다.
 - `vue?inject!`는 `vue` 로더를 사용하고 `?inject` 쿼리를 전달한다는 것을 의미합니다. 이것은 `vue-loader`에게 의존성 주입 모드로 컴퍼넌트를 컴파일하도록 알려줍니다.
@@ -48,7 +48,7 @@ const ExampleInjector = require('!!vue?inject!./example.vue')
 
 ``` js
 const ExampleWithMocks = ExampleInjector({
-  // mock it
+  // 가짜로 만듭니다
   '../service': {
     msg: 'Hello from a mocked service!'
   }
diff --git a/docs/ko/workflow/testing.md b/docs/ko/workflow/testing.md
index 92043e8f8..a1d8b8d34 100644
--- a/docs/ko/workflow/testing.md
+++ b/docs/ko/workflow/testing.md
@@ -1,8 +1,8 @@
 # 테스트
 
-> [webpack vue-cli template](https://github.com/vuejs-templates/webpack)은 유닛 테스트 및 e2e 테스트 설정을 사전에 제공합니다.
+> [webpack vue-cli 템플릿](https://github.com/vuejs-templates/webpack)은 유닛 테스트 및 e2e 테스트 설정을 사전에 제공합니다.
 
-`*.vue` 파일을 테스트할 때 `*.vue` 파일 처리 방법을 알지 못하기 때문에 CommonJS 기반 테스트 러너를 사용할 수 없습니다. 대신 Webpack + vue-loader를 사용하여 테스트 파일을 번들로 제공합니다. [Karma](http://karma-runner.github.io/0.13/index.html) 및 [karma-webpack](https://github.com/webpack/karma-webpack)을 사용하는 것을 추천합니다.
+`*.vue` 파일을 테스트할 때 `*.vue` 파일 처리 방법을 모르기 때문에 CommonJS 기반 테스트 러너를 사용할 수 없습니다. 대신 Webpack + vue-loader를 사용하여 테스트 파일을 번들로 제공합니다. [Karma](http://karma-runner.github.io/0.13/index.html) 및 [karma-webpack](https://github.com/webpack/karma-webpack)을 사용하는 것을 추천합니다.
 
 Karma는 브라우저를 실행하고 테스트를 실행하는 테스트 러너입니다. 테스트할 브라우저와 사용할 테스트 프레임워크(Mocha 또는 Jasmine)를 선택할 수 있습니다. 다음은 [PhantomJS](http://phantomjs.org/) 내부에서 [Jasmine](http://jasmine.github.io/edge/introduction.html)을 사용하여 테스트를 실행하는 Karma 설정의 예입니다.
 
@@ -15,9 +15,9 @@ npm install\
 ```
 
 ``` js
-// we can just use the exact same webpack config by requiring it
-// however, remember to delete the original entry since we don't
-// need it during tests
+// 우리는 정확히 똑같은 Webpack 설정을 요구할 수 있습니다
+// 하지만, 테스트 중에는 필요하지 않기 때문에
+// 원래 항목을 지우는 것을 잊지 마십시오.
 var webpackConfig = require('./webpack.config.js')
 delete webpackConfig.entry
 
@@ -26,15 +26,15 @@ module.exports = function (config) {
   config.set({
     browsers: ['PhantomJS'],
     frameworks: ['jasmine'],
-    // this is the entry file for all our tests.
+    // 이 파일은 모든 테스트의 시작점입니다.
     files: ['test/index.js'],
-    // we will pass the entry file to webpack for bundling.
+    // 우리는 번들을 위해 webpack에 엔트리 파일을 전달할 것입니다.
     preprocessors: {
       'test/index.js': ['webpack']
     },
-    // use the webpack config
+    // webpack 설정을 사용합니다.
     webpack: webpackConfig,
-    // avoid walls of useless text
+    // 쓸모없는 텍스트들을 피합니다.
     webpackMiddleware: {
       noInfo: true
     },
@@ -47,7 +47,7 @@ module.exports = function (config) {
 
 ``` js
 // test/index.js
-// require all test files using special Webpack feature
+// 특별한 Webpack 기능을 사용하기 위해 모든 테스트 파일이 필요합니다.
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
@@ -62,12 +62,12 @@ var ComponentA = require('../../src/components/a.vue')
 
 describe('a.vue', function () {
 
-  // asserting JavaScript options
+  // JavsScript 옵션을 검사합니다.
   it('should have correct message', function () {
     expect(ComponentA.data().msg).toBe('Hello from Component A!')
   })
 
-  // asserting rendered result by actually rendering the component
+  // 실제로 그 컴포넌트를 렌더링하여 렌더링된 결과를 검사합니다.
   it('should render correct message', function () {
     var vm = new Vue({
       template: '<div><test></test></div>',
@@ -98,4 +98,4 @@ describe('a.vue', function () {
 npm test
 ```
 
-다시 말하자면, [webpack vue-cli 템플릿](https://github.com/vuejs-templates/webpack)에는 테스트에 대한 완전한 예제가 들어 있습니다.
+다시 말해, [webpack vue-cli 템플릿](https://github.com/vuejs-templates/webpack)에는 테스트에 대한 완전한 예제가 있습니다.

From 21fc5096c4cd2979fb4f1d911e50c2a7a6324225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangJoo=20Park=28=EB=B0=95=EC=B0=BD=EC=A3=BC=29?=
 <pcjpcj2@gmail.com>
Date: Thu, 22 Dec 2016 09:19:05 +0900
Subject: [PATCH 437/877] update url /ko to /kr (#548)

* Update Korean

* update url ko to kr
---
 docs/{ko => kr}/README.md                        | 0
 docs/{ko => kr}/SUMMARY.md                       | 0
 docs/{ko => kr}/configurations/advanced.md       | 0
 docs/{ko => kr}/configurations/asset-url.md      | 0
 docs/{ko => kr}/configurations/extract-css.md    | 0
 docs/{ko => kr}/configurations/pre-processors.md | 0
 docs/{ko => kr}/features/css-modules.md          | 0
 docs/{ko => kr}/features/es2015.md               | 0
 docs/{ko => kr}/features/hot-reload.md           | 0
 docs/{ko => kr}/features/postcss.md              | 0
 docs/{ko => kr}/features/scoped-css.md           | 0
 docs/{ko => kr}/options.md                       | 0
 docs/{ko => kr}/start/setup.md                   | 0
 docs/{ko => kr}/start/spec.md                    | 0
 docs/{ko => kr}/workflow/linting.md              | 0
 docs/{ko => kr}/workflow/production.md           | 0
 docs/{ko => kr}/workflow/testing-with-mocks.md   | 0
 docs/{ko => kr}/workflow/testing.md              | 0
 18 files changed, 0 insertions(+), 0 deletions(-)
 rename docs/{ko => kr}/README.md (100%)
 rename docs/{ko => kr}/SUMMARY.md (100%)
 rename docs/{ko => kr}/configurations/advanced.md (100%)
 rename docs/{ko => kr}/configurations/asset-url.md (100%)
 rename docs/{ko => kr}/configurations/extract-css.md (100%)
 rename docs/{ko => kr}/configurations/pre-processors.md (100%)
 rename docs/{ko => kr}/features/css-modules.md (100%)
 rename docs/{ko => kr}/features/es2015.md (100%)
 rename docs/{ko => kr}/features/hot-reload.md (100%)
 rename docs/{ko => kr}/features/postcss.md (100%)
 rename docs/{ko => kr}/features/scoped-css.md (100%)
 rename docs/{ko => kr}/options.md (100%)
 rename docs/{ko => kr}/start/setup.md (100%)
 rename docs/{ko => kr}/start/spec.md (100%)
 rename docs/{ko => kr}/workflow/linting.md (100%)
 rename docs/{ko => kr}/workflow/production.md (100%)
 rename docs/{ko => kr}/workflow/testing-with-mocks.md (100%)
 rename docs/{ko => kr}/workflow/testing.md (100%)

diff --git a/docs/ko/README.md b/docs/kr/README.md
similarity index 100%
rename from docs/ko/README.md
rename to docs/kr/README.md
diff --git a/docs/ko/SUMMARY.md b/docs/kr/SUMMARY.md
similarity index 100%
rename from docs/ko/SUMMARY.md
rename to docs/kr/SUMMARY.md
diff --git a/docs/ko/configurations/advanced.md b/docs/kr/configurations/advanced.md
similarity index 100%
rename from docs/ko/configurations/advanced.md
rename to docs/kr/configurations/advanced.md
diff --git a/docs/ko/configurations/asset-url.md b/docs/kr/configurations/asset-url.md
similarity index 100%
rename from docs/ko/configurations/asset-url.md
rename to docs/kr/configurations/asset-url.md
diff --git a/docs/ko/configurations/extract-css.md b/docs/kr/configurations/extract-css.md
similarity index 100%
rename from docs/ko/configurations/extract-css.md
rename to docs/kr/configurations/extract-css.md
diff --git a/docs/ko/configurations/pre-processors.md b/docs/kr/configurations/pre-processors.md
similarity index 100%
rename from docs/ko/configurations/pre-processors.md
rename to docs/kr/configurations/pre-processors.md
diff --git a/docs/ko/features/css-modules.md b/docs/kr/features/css-modules.md
similarity index 100%
rename from docs/ko/features/css-modules.md
rename to docs/kr/features/css-modules.md
diff --git a/docs/ko/features/es2015.md b/docs/kr/features/es2015.md
similarity index 100%
rename from docs/ko/features/es2015.md
rename to docs/kr/features/es2015.md
diff --git a/docs/ko/features/hot-reload.md b/docs/kr/features/hot-reload.md
similarity index 100%
rename from docs/ko/features/hot-reload.md
rename to docs/kr/features/hot-reload.md
diff --git a/docs/ko/features/postcss.md b/docs/kr/features/postcss.md
similarity index 100%
rename from docs/ko/features/postcss.md
rename to docs/kr/features/postcss.md
diff --git a/docs/ko/features/scoped-css.md b/docs/kr/features/scoped-css.md
similarity index 100%
rename from docs/ko/features/scoped-css.md
rename to docs/kr/features/scoped-css.md
diff --git a/docs/ko/options.md b/docs/kr/options.md
similarity index 100%
rename from docs/ko/options.md
rename to docs/kr/options.md
diff --git a/docs/ko/start/setup.md b/docs/kr/start/setup.md
similarity index 100%
rename from docs/ko/start/setup.md
rename to docs/kr/start/setup.md
diff --git a/docs/ko/start/spec.md b/docs/kr/start/spec.md
similarity index 100%
rename from docs/ko/start/spec.md
rename to docs/kr/start/spec.md
diff --git a/docs/ko/workflow/linting.md b/docs/kr/workflow/linting.md
similarity index 100%
rename from docs/ko/workflow/linting.md
rename to docs/kr/workflow/linting.md
diff --git a/docs/ko/workflow/production.md b/docs/kr/workflow/production.md
similarity index 100%
rename from docs/ko/workflow/production.md
rename to docs/kr/workflow/production.md
diff --git a/docs/ko/workflow/testing-with-mocks.md b/docs/kr/workflow/testing-with-mocks.md
similarity index 100%
rename from docs/ko/workflow/testing-with-mocks.md
rename to docs/kr/workflow/testing-with-mocks.md
diff --git a/docs/ko/workflow/testing.md b/docs/kr/workflow/testing.md
similarity index 100%
rename from docs/ko/workflow/testing.md
rename to docs/kr/workflow/testing.md

From 2e3626ca3a3c762720e6189499b3fa343accd855 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Thu, 22 Dec 2016 10:41:55 +0900
Subject: [PATCH 438/877] change ko -> kr

---
 docs/LANGS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/LANGS.md b/docs/LANGS.md
index 00ad8924e..42957cdb2 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1,2 +1,2 @@
 * [English](en/)
-* [한국어](ko/)
+* [한국어](kr/)

From 2c7440dca7f169509f7833f93eab2451afaa77b0 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Thu, 22 Dec 2016 10:57:00 +0900
Subject: [PATCH 439/877] fix docs index link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e5a37f2c..180f04468 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ npm run dev
 
 This will setup a basic Webpack + `vue-loader` project for you, with `*.vue` files and hot-reloading working out of the box!
 
-For advanced `vue-loader` configuration, checkout the [documentation](http://vuejs.github.io/vue-loader/).
+For advanced `vue-loader` configuration, checkout the [documentation](http://vuejs.github.io/vue-loader/index.html).

From a37f944ffc8c0fedea38e29399d583a6c9697e6a Mon Sep 17 00:00:00 2001
From: Andre Asselin <github@aasselin.com>
Date: Mon, 26 Dec 2016 05:24:38 -0500
Subject: [PATCH 440/877] Fix mockRender to work with the changes in compiler
 API introduced in vue/vue-template-compiler 2.1.5 and
 vue-template-es2015-compiler 1.3.2 (#550)

---
 test/test.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index a9eea3d9f..e9bf6f134 100644
--- a/test/test.js
+++ b/test/test.js
@@ -73,7 +73,11 @@ function test (options, assert) {
 
 function mockRender (options, data) {
   return options.render.call(Object.assign({
-    _h (tag, data, children) {
+    _v (val) {
+      return val
+    },
+    _self: {},
+    $createElement (tag, data, children) {
       if (Array.isArray(data)) {
         children = data
         data = null

From 2fb9b71140eed41cb546ee4b4e6992688e17331a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B0=E5=BE=97?= <sd8020563@gmail.com>
Date: Mon, 26 Dec 2016 18:26:02 +0800
Subject: [PATCH 441/877] Update Posecss.md (#551)

del wrong '}'
---
 docs/en/features/postcss.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index 4dbd8e1b7..c088bbe1d 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -31,7 +31,6 @@ module.exports = {
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
-          }
         }
       }
     ]

From 5f0d3541dfc4de2f8b955eb4913c12d6308a08d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Thu, 5 Jan 2017 02:52:14 +0100
Subject: [PATCH 442/877] Explain SASS caveat (#517)

* Explain SASS caveat

improvement according to #453

* Update pre-processors.md

* typo
---
 docs/en/configurations/pre-processors.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index dcc60e12f..98ac4472b 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -18,6 +18,25 @@ npm install sass-loader node-sass --save-dev
 
 Under the hood, the text content inside the `<style>` tag will be first compiled by `sass-loader` before being passed on for further processing.
 
+#### sass-loader caveat
+
+Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *SASS* syntax, you have to configure vuel-loader's options for sass-loader accordingly. 
+
+```javascript
+{
+  test: /\.vue$/,
+  loader: 'vue-loader',
+  options: {
+    loaders: {
+      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
+    }
+  }
+}
+```
+
+See the [Advanced Loader Configuration](./advanced.md) Section for further information about how to configure vue-loader.
+
 ### JavaScript
 
 All JavaScript inside Vue components are processed by `babel-loader` by default. But you can of course change it:

From 25fd27f13a23e91348493d4b869164818860f1f2 Mon Sep 17 00:00:00 2001
From: Daniel Melo <danielmelogpi@gmail.com>
Date: Thu, 5 Jan 2017 14:45:25 -0200
Subject: [PATCH 443/877] Added VSCode in syntax highlighters list (#509)

---
 docs/en/start/setup.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/start/setup.md b/docs/en/start/setup.md
index 761e281d2..632bfbe2e 100644
--- a/docs/en/start/setup.md
+++ b/docs/en/start/setup.md
@@ -2,7 +2,7 @@
 
 ### Syntax Highlighting
 
-First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=seanwash.vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
 
 ### Using `vue-cli`
 

From 754772f62c8ac3a07f2a673703f5f2750b01fe73 Mon Sep 17 00:00:00 2001
From: Juan Eugenio Abadie <juaneabadie@gmail.com>
Date: Thu, 5 Jan 2017 14:32:44 -0300
Subject: [PATCH 444/877] Remove duplicated text (#467)

**Syntax Highlighting** is already covered [here](https://vue-loader.vuejs.org/en/start/spec.html) (and is updated).
---
 docs/en/start/setup.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/en/start/setup.md b/docs/en/start/setup.md
index 632bfbe2e..98d9ee206 100644
--- a/docs/en/start/setup.md
+++ b/docs/en/start/setup.md
@@ -1,9 +1,5 @@
 # Setting Up a Project
 
-### Syntax Highlighting
-
-First thing first, you will probably want proper syntax highlighting for `*.vue` components. Currently there are syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=seanwash.vue) and [Vim](https://github.com/posva/vim-vue). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
-
 ### Using `vue-cli`
 
 It's recommended to scaffold a project using `vue-loader` with `vue-cli`:

From 328aa6c24919fef66c738b3e7ff93cb1f58136eb Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sat, 7 Jan 2017 01:37:32 +0900
Subject: [PATCH 445/877] fix loader setting for webpack2 (#409)

---
 docs/en/configurations/advanced.md    | 2 +-
 docs/en/configurations/extract-css.md | 2 +-
 docs/en/features/css-modules.md       | 2 +-
 docs/en/features/postcss.md           | 2 +-
 docs/en/options.md                    | 4 ++--
 docs/en/workflow/linting.md           | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 749c42b0f..1f6667a08 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -40,7 +40,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         // vue-loader options goes here
         options: {
           loaders: {
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index b0701a04b..b1134406f 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -51,7 +51,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             css: ExtractTextPlugin.extract({
diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index 253095778..af9fb3d66 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -104,7 +104,7 @@ module: {
   rules: [
     {
       test: '\.vue$',
-      loader: 'vue',
+      loader: 'vue-loader',
       options: {
         cssModules: {
           localIdentName: '[path][name]---[local]---[hash:base64:5]',
diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index c088bbe1d..cb5c9e531 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -26,7 +26,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         // vue-loader options goes here
         options: {
           // ...
diff --git a/docs/en/options.md b/docs/en/options.md
index 6789e7c71..ccffacf70 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -22,7 +22,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           // vue-loader options
         }
@@ -145,7 +145,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           buble: {
             // same options
diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index 431047436..a88e55be2 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -79,13 +79,13 @@ module.exports = {
       {
         enforce: 'pre',
         test: /.vue$/,
-        loader: 'eslint',
+        loader: 'eslint-loader',
         exclude: /node_modules/
       },
       // but use vue-loader for all *.vue files
       {
         test: /.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader'
       }
     ]
   }

From 67bc509970edeec0b3076a9517ad5726666f62e1 Mon Sep 17 00:00:00 2001
From: Scott Bedard <scottbedard@users.noreply.github.com>
Date: Sat, 7 Jan 2017 15:47:16 -0700
Subject: [PATCH 446/877] Remove unused dependency (#564)

---
 package.json | 1 -
 test/test.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/package.json b/package.json
index 9a547412d..7db777df2 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,6 @@
     "normalize-newline": "^3.0.0",
     "postcss": "^5.0.21",
     "pug": "^2.0.0-beta6",
-    "rimraf": "^2.4.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
diff --git a/test/test.js b/test/test.js
index e9bf6f134..da99b4c36 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,7 +5,6 @@ var webpack = require('webpack')
 var MemoryFS = require('memory-fs')
 var jsdom = require('jsdom')
 var expect = require('chai').expect
-var rimraf = require('rimraf')
 var genId = require('../lib/gen-id')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 var ExtractTextPlugin = require("extract-text-webpack-plugin")

From e2feb0c8aad472d4e9980cc7c3c25c8aee87cbdb Mon Sep 17 00:00:00 2001
From: Victor Bastos <victorwpbastos@gmail.com>
Date: Tue, 10 Jan 2017 01:58:26 -0200
Subject: [PATCH 447/877] tempaltes -> templates (#567)

---
 docs/en/features/es2015.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index 80fc3d19d..023e41612 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -54,7 +54,7 @@ can be simplified to:
 </my-component>
 ```
 
-You can also customize the features supported in tempaltes using the [`buble` option](../options.md#buble).
+You can also customize the features supported in templates using the [`buble` option](../options.md#buble).
 
 ### Transpiling Normal `.js` Files
 

From 8ecc776af78b84e7954bc170d9d1a65397b793d3 Mon Sep 17 00:00:00 2001
From: Wooram Jun <chatii2412@gmail.com>
Date: Fri, 13 Jan 2017 14:39:24 +0900
Subject: [PATCH 448/877] Fix a typo (#574)

---
 docs/kr/features/css-modules.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/kr/features/css-modules.md b/docs/kr/features/css-modules.md
index a8e073dbf..c1c8edbf2 100644
--- a/docs/kr/features/css-modules.md
+++ b/docs/kr/features/css-modules.md
@@ -6,7 +6,7 @@
 
 ### 사용법
 
-`<style>`에 `moudle` 속성을 삽입합니다.
+`<style>`에 `module` 속성을 삽입합니다.
 
 ``` html
 <style module>

From 03a3139c1c73fe2ee82f5d1ca8cf1e3a6554670f Mon Sep 17 00:00:00 2001
From: Wooram Jun <chatii2412@gmail.com>
Date: Fri, 13 Jan 2017 15:17:45 +0900
Subject: [PATCH 449/877] Update Korean translation (#575)

---
 docs/kr/configurations/extract-css.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/kr/configurations/extract-css.md b/docs/kr/configurations/extract-css.md
index 7c90a0e13..6e0598daa 100644
--- a/docs/kr/configurations/extract-css.md
+++ b/docs/kr/configurations/extract-css.md
@@ -56,7 +56,7 @@ module.exports = {
           loaders: {
             css: ExtractTextPlugin.extract({
               loader: 'css-loader',
-              fallbackLoader: 'vue-style-loader' // <- 이것은 vue-loader가 필요 없으므로 npm3를 사용하는 경우 명시적으로 설치할 필요가 없습니다.
+              fallbackLoader: 'vue-style-loader' // <- 이것은 vue-loader의 의존성이므로, npm3를 사용하는 경우에는 명시적으로 설치할 필요가 없습니다.
             })
           }
         }

From 7504e28cfbbc2769717464ef40abe6816246bc3b Mon Sep 17 00:00:00 2001
From: Bob Fanger <bfanger@gmail.com>
Date: Sun, 15 Jan 2017 06:18:15 +0100
Subject: [PATCH 450/877] =?UTF-8?q?When=20name=20isn=E2=80=99t=20specified?=
 =?UTF-8?q?=20use=20the=20filename=20as=20the=20component=20name.=20(#495)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improves the Vue.js devtools experience, no more “< Anonymous Component >”
---
 lib/loader.js | 6 ++++++
 test/test.js  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/loader.js b/lib/loader.js
index 0b482a469..be5693df6 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -256,6 +256,12 @@ module.exports = function (content) {
     // add filename in dev
     (isProduction ? '' : ('__vue_options__.__file = ' + JSON.stringify(filePath))) + '\n'
 
+  // add component name based on the filename
+  exports +=
+    'if(typeof __vue_options__.name === "undefined") {\n' +
+    '  __vue_options__.name = ' + JSON.stringify(path.parse(filePath).name) + '\n' +
+    '}'
+
   // add require for template
   var template = parts.template
   if (template) {
diff --git a/test/test.js b/test/test.js
index da99b4c36..4e109724e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -107,6 +107,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue'
     }, function (window, module, rawModule) {
+      expect(module.name).to.equal('basic')
       var vnode = mockRender(module, {
         msg: 'hi'
       })

From 89cf9f35f98e3b9d87a475c0175f3532a3f85556 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Tue, 17 Jan 2017 12:27:56 +0900
Subject: [PATCH 451/877] Add 'image' tag of SVG to 'transformToRequire` option
 as default (#579)

* add dev dependency module

* add 'image' tag to 'transformToRequire' option as default

Closes #569

* update doc

* add fixture
---
 docs/en/options.md          |  4 ++--
 lib/template-compiler.js    |  3 ++-
 package.json                |  1 +
 test/fixtures/transform.vue | 12 ++++++++++++
 test/test.js                | 28 ++++++++++++++++++++++++++++
 5 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 test/fixtures/transform.vue

diff --git a/docs/en/options.md b/docs/en/options.md
index ccffacf70..7f0d883a4 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -108,9 +108,9 @@ module.exports = {
 ### transformToRequire
 
 - type: `{ [tag: string]: string | Array<string> }`
-- default: `{ img: 'src' }`
+- default: `{ img: 'src', image: 'xlink:href' }`
 
-  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags.
+  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags and `xlink:href` attribute on `<image>` tags of SVG.
 
 ### buble
 
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 8870631f8..58ee3bda7 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -7,7 +7,8 @@ var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 // vue compiler module for using transforming `<tag>:<attribute>` to `require`
 var defaultTransformToRequire = {
-  img: 'src'
+  img: 'src',
+  image: 'xlink:href'
 }
 var transformToRequire = defaultTransformToRequire
 var defaultCompileOptions = {
diff --git a/package.json b/package.json
index 7db777df2..bb436988f 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
+    "url-loader": "^0.5.7",
     "vue": "^2.1.0",
     "vue-template-compiler": "^2.1.0",
     "webpack": "^2.1.0-beta.27"
diff --git a/test/fixtures/transform.vue b/test/fixtures/transform.vue
new file mode 100644
index 000000000..33442c644
--- /dev/null
+++ b/test/fixtures/transform.vue
@@ -0,0 +1,12 @@
+<template>
+<div>
+  <img src="./logo.png">
+  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink= "http://www.w3.org/1999/xlink">
+    <image xlink:href="./logo.png" />
+  </svg>
+</div>
+</template>
+
+<style>
+html { background-image: url(./logo.png); }
+</style>
diff --git a/test/test.js b/test/test.js
index 4e109724e..e7809c5a4 100644
--- a/test/test.js
+++ b/test/test.js
@@ -330,6 +330,34 @@ describe('vue-loader', function () {
     })
   })
 
+  it('transformToRequire option', function (done) {
+    test({
+      entry: './test/fixtures/transform.vue',
+      module: {
+        rules: [
+          { test: /\.vue$/, loader: loaderPath },
+          {
+            test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+            loader: 'url-loader'
+          }
+        ]
+      }
+    }, function (window, module) {
+      function includeDataURL (s) {
+        return !!s.match(/\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*/i)
+      }
+      var vnode = mockRender(module)
+      // img tag
+      expect(includeDataURL(vnode.children[0].data.attrs.src)).to.equal(true)
+      // image tag (SVG)
+      expect(includeDataURL(vnode.children[2].children[0].data.attrs['xlink:href'])).to.equal(true)
+      var style = window.document.querySelector('style').textContent
+      // style
+      expect(includeDataURL(style)).to.equal(true)
+      done()
+    })
+  })
+
   it('postcss options', function (done) {
     test({
       entry: './test/fixtures/postcss.vue',

From 985ce02c49786236deb864b21d0d6c7315de7b37 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Tue, 17 Jan 2017 12:28:23 +0900
Subject: [PATCH 452/877] add component name section to spec docs (#578)

ref #495
---
 docs/en/start/spec.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index c63f3cba0..a8ae6486c 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -83,6 +83,10 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 <style src="todomvc-app-css/index.css">
 ```
 
+### Component Name
+
+If you don't specified the component name with [name](https://vuejs.org/v2/api/#name) component option, by default, it's named based on your `*.vue` filename (no `.vue` extention).
+
 ### Syntax Highlighting
 
 Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.

From 105d16486fab9976bcdc3b44eee0306e4f1dd21f Mon Sep 17 00:00:00 2001
From: Sean Larkin <sean.larkin@cuw.edu>
Date: Thu, 19 Jan 2017 16:42:02 -0600
Subject: [PATCH 453/877] fix(docs): Correct Tiny Typo (#583)

Correct Tiny Typo.
---
 docs/en/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index 98ac4472b..491af9655 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -20,7 +20,7 @@ Under the hood, the text content inside the `<style>` tag will be first compiled
 
 #### sass-loader caveat
 
-Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *SASS* syntax, you have to configure vuel-loader's options for sass-loader accordingly. 
+Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *SASS* syntax, you have to configure vue-loader's options for sass-loader accordingly. 
 
 ```javascript
 {

From 9bbb54bde10c274fd256dff212af14805b458001 Mon Sep 17 00:00:00 2001
From: Alexander <Alex-Sokolov@users.noreply.github.com>
Date: Fri, 20 Jan 2017 11:46:26 +0300
Subject: [PATCH 454/877] - Fix typo (#589)

---
 docs/en/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index a8ae6486c..ff74caf98 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -89,7 +89,7 @@ If you don't specified the component name with [name](https://vuejs.org/v2/api/#
 
 ### Syntax Highlighting
 
-Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by by treating `*.vue` files as HTML in your editor.
+Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by treating `*.vue` files as HTML in your editor.
 
 ### Comments
 

From deb8f44877042841ec94200d93d00b463f2b0086 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Jan 2017 15:48:09 -0500
Subject: [PATCH 455/877] improve compile-time syntax error warning

---
 lib/template-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 58ee3bda7..224ec446d 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -66,7 +66,7 @@ module.exports = function (html) {
   if (compiled.errors.length) {
     var self = this
     compiled.errors.forEach(function (err) {
-      self.emitError('template syntax error ' + err)
+      self.emitError('\n  Vue template syntax error:\n\n  ' + err + '\n')
     })
     code = 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {

From b8d6df7545dcc5c3fde1a32915655207e99aa36d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Jan 2017 15:50:10 -0500
Subject: [PATCH 456/877] 10.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bb436988f..dc0cac9da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.0.2",
+  "version": "10.0.3",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From c6fc82f7e713d23f84641179692d233f6419cb94 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 26 Jan 2017 09:50:45 -0500
Subject: [PATCH 457/877] bump deps + fix compat with
 extract-text-webpack-plugin 2.0 rc (fix #594)

---
 lib/loader.js | 12 ++++++++++++
 package.json  |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index be5693df6..0fd2e973a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -125,12 +125,24 @@ module.exports = function (content) {
     })
   }
 
+  // stringify an Array of loader objects
+  function stringifyLoaders (loaders) {
+    return loaders.map(function (obj) {
+      return obj && typeof obj === 'object' && typeof obj.loader === 'string'
+        ? obj.loader + (obj.options ? '?' + JSON.stringify(obj.options) : '')
+        : obj
+    }).join('!')
+  }
+
   function getLoaderString (type, part, index, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
     var injectString = (type === 'script' && query.inject) ? 'inject-loader!' : ''
     if (loader !== undefined) {
+      if (Array.isArray(loader)) {
+        loader = stringifyLoaders(loader)
+      }
       // add css modules
       if (type === 'styles') {
         loader = addCssModulesToLoader(loader, part, index)
diff --git a/package.json b/package.json
index dc0cac9da..b1690b228 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "eslint-config-vue": "^1.0.0",
     "eslint-plugin-html": "^1.5.2",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^2.0.0-beta.4",
+    "extract-text-webpack-plugin": "^2.0.0-rc.0",
     "file-loader": "^0.9.0",
     "inject-loader": "^2.0.0",
     "jsdom": "^9.2.1",
@@ -75,6 +75,6 @@
     "url-loader": "^0.5.7",
     "vue": "^2.1.0",
     "vue-template-compiler": "^2.1.0",
-    "webpack": "^2.1.0-beta.27"
+    "webpack": "^2.2.0"
   }
 }

From 28c386d22aa0f4a8991dd6a90a91da18a5b0f58c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 26 Jan 2017 09:50:49 -0500
Subject: [PATCH 458/877] 10.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b1690b228..53f39f140 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 4b7406a7bb32b1dba6e043a65712719c6fd917d5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 26 Jan 2017 15:23:12 -0500
Subject: [PATCH 459/877] only generate __vue_styles__ if has CSS modules

---
 lib/loader.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 0fd2e973a..a3e4179be 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -201,12 +201,12 @@ module.exports = function (content) {
   var output = 'var __vue_exports__, __vue_options__\n'
 
   // css modules
-  output += 'var __vue_styles__ = {}\n'
   var cssModules = {}
 
   // add requires for styles
   if (parts.styles.length) {
     output += '\n/* styles */\n'
+    var hasModules = false
     parts.styles.forEach(function (style, i) {
       var moduleName = (style.module === true) ? '$style' : style.module
 
@@ -218,6 +218,10 @@ module.exports = function (content) {
 
       // setCssModule
       if (moduleName) {
+        if (!hasModules) {
+          hasModules = true
+          output += 'var __vue_styles__ = {}\n'
+        }
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
           output += requireString

From 07b94527d1de4e9fd63917a3c7ddfe68576ba6be Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 26 Jan 2017 16:43:44 -0500
Subject: [PATCH 460/877] refactor: extract common generated runtime code into
 a single module

---
 lib/component-normalizer.js |  58 +++++++++++++
 lib/loader.js               | 157 +++++++++++++++++-------------------
 2 files changed, 133 insertions(+), 82 deletions(-)
 create mode 100644 lib/component-normalizer.js

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
new file mode 100644
index 000000000..b8fcb9e77
--- /dev/null
+++ b/lib/component-normalizer.js
@@ -0,0 +1,58 @@
+module.exports = function normalizeComponent (
+  name,
+  scriptExports,
+  compiledTemplate,
+  scopeId,
+  cssModules
+) {
+  scriptExports = scriptExports || {}
+
+  // ES6 modules interop
+  var type = typeof scriptExports.default
+  if (type === 'object' || type === 'function') {
+    // check named exports
+    if (process.env.NODE_ENV !== 'production') {
+      if (Object.keys(scriptExports).some(function (key) {
+        return key !== 'default' && key !== '__esModule'
+      })) {
+        console.error('named exports are not supported in *.vue files.')
+      }
+    }
+    scriptExports = scriptExports.default
+  }
+
+  // Vue.extend constructor export interop
+  var options = typeof scriptExports === 'function'
+    ? scriptExports.options
+    : scriptExports
+
+  // default name option based on filename
+  if (options.name == null) {
+    options.name = name
+  }
+
+  // render functions
+  if (compiledTemplate) {
+    options.render = compiledTemplate.render
+    options.staticRenderFns = compiledTemplate.staticRenderFns
+  }
+
+  // scopedId
+  if (scopeId) {
+    options._scopeId = scopeId
+  }
+
+  // inject cssModules
+  if (cssModules) {
+    var computed = options.computed || (options.computed = {})
+    Object.keys(cssModules).forEach(function (key) {
+      var module = cssModules[key]
+      computed[key] = function () { return module }
+    })
+  }
+
+  return {
+    exports: scriptExports,
+    options: options
+  }
+}
diff --git a/lib/loader.js b/lib/loader.js
index a3e4179be..daca8545c 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -10,6 +10,7 @@ var selectorPath = normalize.lib('selector')
 var templateLoaderPath = normalize.lib('template-loader')
 var templateCompilerPath = normalize.lib('template-compiler')
 var styleRewriterPath = normalize.lib('style-rewriter')
+var componentNormalizerPath = normalize.lib('component-normalizer')
 
 // dep loaders
 var styleLoaderPath = normalize.dep('vue-style-loader')
@@ -33,10 +34,6 @@ var defaultLang = {
   script: 'js'
 }
 
-var checkNamedExports =
-  'if (Object.keys(__vue_exports__).some(function (key) { return key !== "default" && key !== "__esModule" })) {' +
-  'console.error("named exports are not supported in *.vue files.")}\n'
-
 module.exports = function (content) {
   this.cacheable()
   var isServer = this.options.target === 'node'
@@ -69,7 +66,7 @@ module.exports = function (content) {
   function getRequire (type, part, index, scoped) {
     return 'require(' +
       getRequireString(type, part, index, scoped) +
-    ')\n'
+    ')'
   }
 
   function getRequireString (type, part, index, scoped) {
@@ -88,7 +85,7 @@ module.exports = function (content) {
   function getRequireForImport (type, impt, scoped) {
     return 'require(' +
       getRequireForImportString(type, impt, scoped) +
-    ')\n'
+    ')'
   }
 
   function getRequireForImportString (type, impt, scoped) {
@@ -196,9 +193,9 @@ module.exports = function (content) {
     }
   }
 
+  var output = ''
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
-  var output = 'var __vue_exports__, __vue_options__\n'
 
   // css modules
   var cssModules = {}
@@ -220,7 +217,7 @@ module.exports = function (content) {
       if (moduleName) {
         if (!hasModules) {
           hasModules = true
-          output += 'var __vue_styles__ = {}\n'
+          output += 'var cssModules = {}\n'
         }
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
@@ -235,81 +232,89 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          output += '__vue_styles__["' + moduleName + '"] = ' + requireString + '\n'
+          output += 'cssModules["' + moduleName + '"] = ' + requireString + '\n'
         }
       } else {
-        output += requireString
+        output += requireString + '\n'
       }
     })
+    output += '\n'
   }
 
-  // add require for script
+  // we require the component normalizer function, and call it like so:
+  // normalizeComponent(
+  //   name,
+  //   scriptExports,
+  //   compiledTemplate,
+  //   scopeId,
+  //   cssModules
+  // )
+  output += 'var Component = require("' + componentNormalizerPath + '")(\n'
+
+  // name
+  output += '  /* name */\n  ' + JSON.stringify(path.parse(filePath).name) + ',\n'
+
+  // <script>
+  output += '  /* script */\n  '
   var script = parts.script
   if (script) {
-    output += '\n/* script */\n'
-    output +=
-      '__vue_exports__ = ' + (
-        script.src
-          ? getRequireForImport('script', script)
-          : getRequire('script', script)
-      )
+    output += script.src
+      ? getRequireForImport('script', script)
+      : getRequire('script', script)
+    // inject loader interop
+    if (query.inject) {
+      output += '(injections)'
+    }
+  } else {
+    output += 'null'
   }
+  output += ',\n'
 
-  var exports =
-    '__vue_options__ = __vue_exports__ = __vue_exports__ || {}\n' +
-    // ES6 modules interop
-    'if (\n' +
-    '  typeof __vue_exports__.default === "object" ||\n' +
-    '  typeof __vue_exports__.default === "function"\n' +
-    ') {\n' +
-      (isProduction ? '' : checkNamedExports) +
-      '__vue_options__ = __vue_exports__ = __vue_exports__.default\n' +
-    '}\n' +
-    // constructor export interop
-    'if (typeof __vue_options__ === "function") {\n' +
-    '  __vue_options__ = __vue_options__.options\n' +
-    '}\n' +
-    // add filename in dev
-    (isProduction ? '' : ('__vue_options__.__file = ' + JSON.stringify(filePath))) + '\n'
-
-  // add component name based on the filename
-  exports +=
-    'if(typeof __vue_options__.name === "undefined") {\n' +
-    '  __vue_options__.name = ' + JSON.stringify(path.parse(filePath).name) + '\n' +
-    '}'
-
-  // add require for template
+  // <template>
+  output += '  /* template */\n  '
   var template = parts.template
   if (template) {
-    output += '\n/* template */\n'
-    output += 'var __vue_template__ = ' + (
-      template.src
-        ? getRequireForImport('template', template)
-        : getRequire('template', template)
-    )
-    // attach render functions to exported options
-    exports +=
-      '__vue_options__.render = __vue_template__.render\n' +
-      '__vue_options__.staticRenderFns = __vue_template__.staticRenderFns\n'
+    output += template.src
+      ? getRequireForImport('template', template)
+      : getRequire('template', template)
+  } else {
+    output += 'null'
   }
+  output += ',\n'
 
-  // attach scoped id
-  if (hasScoped) {
-    exports += '__vue_options__._scopeId = "' + moduleId + '"\n'
-  }
+  // scopeId
+  output += '  /* scopeId */\n  '
+  output += (hasScoped ? JSON.stringify(moduleId) : 'null') + ',\n'
 
+  // cssModules
+  output += '  /* cssModules */\n  '
   if (Object.keys(cssModules).length) {
     // inject style modules as computed properties
-    exports +=
-      'if (!__vue_options__.computed) __vue_options__.computed = {}\n' +
-      'Object.keys(__vue_styles__).forEach(function (key) {\n' +
-        'var module = __vue_styles__[key]\n' +
-        '__vue_options__.computed[key] = function () { return module }\n' +
-      '})\n'
+    output += 'cssModules'
+  } else {
+    output += 'null'
+  }
+  output += '\n'
+
+  // close normalizeComponent call
+  output += ')\n'
+
+  // development-only code
+  if (!isProduction) {
+    // add filename in dev
+    output += 'Component.options.__file = ' + JSON.stringify(filePath) + '\n'
+    // check functional components used with templates
+    if (template) {
+      output +=
+        'if (Component.options.functional) {' +
+          'console.error("' +
+          '[vue-loader] ' + fileName + ': functional components are not ' +
+          'supported with templates, they should use render functions.' +
+        '")}\n'
+    }
   }
 
   if (!query.inject) {
-    output += exports
     // hot reload
     if (
       !isServer &&
@@ -325,37 +330,25 @@ module.exports = function (content) {
         '  module.hot.accept()\n' +
         '  if (!module.hot.data) {\n' +
         // initial insert
-        '    hotAPI.createRecord("' + moduleId + '", __vue_options__)\n' +
+        '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
         '  } else {\n' +
         // update
-        '    hotAPI.reload("' + moduleId + '", __vue_options__)\n' +
+        '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
         '  }\n' +
         '})()}\n'
     }
-    // check functional components used with templates
-    if (!isProduction) {
-      output +=
-        'if (__vue_options__.functional && typeof __vue_template__ !== "undefined") {' +
-          'console.error("' +
-          `[vue-loader] ${fileName}: functional components are not ` +
-          'supported with templates, they should use render functions.' +
-        '")}\n'
-    }
     // final export
     if (options.esModule) {
-      output += '\nexports.__esModule = true;\nexports["default"] = __vue_exports__\n'
+      output += '\nexports.__esModule = true;\nexports["default"] = Component.exports\n'
     } else {
-      output += '\nmodule.exports = __vue_exports__\n'
+      output += '\nmodule.exports = Component.exports\n'
     }
   } else {
     // inject-loader support
-    output +=
+    output =
       '\n/* dependency injection */\n' +
-      'module.exports = function (injections) {\n' +
-      '  __vue_exports__ = __vue_exports__(injections)\n' +
-      exports +
-      '  return __vue_exports__\n' +
-      '}'
+      'module.exports = function (injections) {\n' + output + '\n' +
+      '\nreturn Component.exports\n}'
   }
 
   // done

From e2b41eac5528152396a703a594aa2ef4af5216c4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 26 Jan 2017 17:29:39 -0500
Subject: [PATCH 461/877] feat: support chaining with other loaders for
 pre-processing (close #542)

---
 lib/loader.js       |  4 ++--
 test/mock-loader.js |  3 +++
 test/test.js        | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 test/mock-loader.js

diff --git a/lib/loader.js b/lib/loader.js
index daca8545c..0621f67da 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -77,8 +77,8 @@ module.exports = function (content) {
       getLoaderString(type, part, index, scoped) +
       // select the corresponding part from the vue file
       getSelectorString(type, index || 0) +
-      // the url to the actual vuefile
-      filePath
+      // the url to the actual vue file, including remaining requests
+      loaderUtils.getRemainingRequest(loaderContext)
     )
   }
 
diff --git a/test/mock-loader.js b/test/mock-loader.js
new file mode 100644
index 000000000..a0c719bb1
--- /dev/null
+++ b/test/mock-loader.js
@@ -0,0 +1,3 @@
+module.exports = function (content) {
+  return content.replace(/Hello from Component A!/, 'Changed!')
+}
diff --git a/test/test.js b/test/test.js
index e7809c5a4..963b689f5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -497,4 +497,19 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('support chaining with other loaders', done => {
+    const mockLoaderPath = require.resolve('./mock-loader')
+    test({
+      entry: './test/fixtures/basic.vue',
+      module: {
+        rules: [
+          { test: /\.vue$/, loader: loaderPath + '!' + mockLoaderPath }
+        ]
+      }
+    }, function (window, module) {
+      expect(module.data().msg).to.equal('Changed!')
+      done()
+    })
+  })
 })

From d8d2f0ed5883aded5eb9dc8dbd60f6105ce6c76d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 26 Jan 2017 17:30:22 -0500
Subject: [PATCH 462/877] 10.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 53f39f140..4884bf09c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.0.4",
+  "version": "10.1.0",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 49795c6f3ee98c365697e733b1a0953c2381ab36 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 09:14:31 -0500
Subject: [PATCH 463/877] use Object.assign

---
 lib/loader.js | 11 +++++------
 package.json  |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 0621f67da..43b2cf237 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,15 +1,14 @@
-var loaderUtils = require('loader-utils')
-var assign = require('object-assign')
-var parse = require('./parser')
 var path = require('path')
-var normalize = require('./normalize')
+var parse = require('./parser')
 var genId = require('./gen-id')
+var normalize = require('./normalize')
+var loaderUtils = require('loader-utils')
 
 // internal lib loaders
 var selectorPath = normalize.lib('selector')
+var styleRewriterPath = normalize.lib('style-rewriter')
 var templateLoaderPath = normalize.lib('template-loader')
 var templateCompilerPath = normalize.lib('template-compiler')
-var styleRewriterPath = normalize.lib('style-rewriter')
 var componentNormalizerPath = normalize.lib('component-normalizer')
 
 // dep loaders
@@ -61,7 +60,7 @@ module.exports = function (content) {
 
   // check if there are custom loaders specified via
   // webpack config, otherwise use defaults
-  var loaders = assign({}, defaultLoaders, options.loaders)
+  var loaders = Object.assign({}, defaultLoaders, options.loaders)
 
   function getRequire (type, part, index, scoped) {
     return 'require(' +
diff --git a/package.json b/package.json
index 4884bf09c..8335a238e 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "js-beautify": "^1.6.3",
     "loader-utils": "^0.2.10",
     "lru-cache": "^4.0.1",
-    "object-assign": "^4.0.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",

From def3703b0e0c3f6c45a98a23514bd905253e0064 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 09:41:51 -0500
Subject: [PATCH 464/877] always use absolute path for lib files (close #525)

---
 lib/loader.js    | 5 +++--
 lib/normalize.js | 6 +-----
 test/test.js     | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 43b2cf237..dccf437fa 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -36,16 +36,17 @@ var defaultLang = {
 module.exports = function (content) {
   this.cacheable()
   var isServer = this.options.target === 'node'
+  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
+
   var loaderContext = this
   var query = loaderUtils.parseQuery(this.query)
   var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
+
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = 'data-v-' + genId(filePath)
   var styleRewriter = styleRewriterPath + '?id=' + moduleId
 
-  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-
   var needCssSourceMap =
     !isProduction &&
     this.sourceMap &&
diff --git a/lib/normalize.js b/lib/normalize.js
index cc9f66287..4664486e7 100644
--- a/lib/normalize.js
+++ b/lib/normalize.js
@@ -3,11 +3,7 @@ var fs = require('fs')
 var path = require('path')
 
 exports.lib = function (file) {
-  if (IS_TEST) {
-    return path.resolve(__dirname, file)
-  } else {
-    return 'vue-loader/lib/' + file
-  }
+  return path.resolve(__dirname, file)
 }
 
 exports.dep = function (dep) {
diff --git a/test/test.js b/test/test.js
index 963b689f5..9035aa2de 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,15 +1,15 @@
 process.env.VUE_LOADER_TEST = true
 
 var path = require('path')
+var jsdom = require('jsdom')
 var webpack = require('webpack')
 var MemoryFS = require('memory-fs')
-var jsdom = require('jsdom')
 var expect = require('chai').expect
 var genId = require('../lib/gen-id')
-var SourceMapConsumer = require('source-map').SourceMapConsumer
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var SourceMapConsumer = require('source-map').SourceMapConsumer
 
 var loaderPath = 'expose-loader?vueModule!' + path.resolve(__dirname, '../index.js')
 var mfs = new MemoryFS()

From 5eec6aefd306844e67c8803d12ba0f352c0f6d59 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sat, 28 Jan 2017 01:36:11 +0900
Subject: [PATCH 465/877] Revert default component name option (#598)

* revert default name option based on filename

related: #495

if several unnamed components have the same filename, occured endless loop.

Closes #596

* update docs
---
 docs/en/start/spec.md       | 4 ----
 lib/component-normalizer.js | 6 ------
 lib/loader.js               | 4 ----
 test/test.js                | 1 -
 4 files changed, 15 deletions(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index ff74caf98..7e83a24ba 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -83,10 +83,6 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 <style src="todomvc-app-css/index.css">
 ```
 
-### Component Name
-
-If you don't specified the component name with [name](https://vuejs.org/v2/api/#name) component option, by default, it's named based on your `*.vue` filename (no `.vue` extention).
-
 ### Syntax Highlighting
 
 Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by treating `*.vue` files as HTML in your editor.
diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index b8fcb9e77..486b5370f 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -1,5 +1,4 @@
 module.exports = function normalizeComponent (
-  name,
   scriptExports,
   compiledTemplate,
   scopeId,
@@ -26,11 +25,6 @@ module.exports = function normalizeComponent (
     ? scriptExports.options
     : scriptExports
 
-  // default name option based on filename
-  if (options.name == null) {
-    options.name = name
-  }
-
   // render functions
   if (compiledTemplate) {
     options.render = compiledTemplate.render
diff --git a/lib/loader.js b/lib/loader.js
index dccf437fa..481018f61 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -243,7 +243,6 @@ module.exports = function (content) {
 
   // we require the component normalizer function, and call it like so:
   // normalizeComponent(
-  //   name,
   //   scriptExports,
   //   compiledTemplate,
   //   scopeId,
@@ -251,9 +250,6 @@ module.exports = function (content) {
   // )
   output += 'var Component = require("' + componentNormalizerPath + '")(\n'
 
-  // name
-  output += '  /* name */\n  ' + JSON.stringify(path.parse(filePath).name) + ',\n'
-
   // <script>
   output += '  /* script */\n  '
   var script = parts.script
diff --git a/test/test.js b/test/test.js
index 9035aa2de..79b21c89d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -107,7 +107,6 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue'
     }, function (window, module, rawModule) {
-      expect(module.name).to.equal('basic')
       var vnode = mockRender(module, {
         msg: 'hi'
       })

From e2141a0a8165c85b4044a37d840c3b57b0121eb8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 10:11:13 -0500
Subject: [PATCH 466/877] move named exports check to generated code (fix #599)

---
 lib/component-normalizer.js | 19 +++++++------------
 lib/loader.js               |  7 +++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 486b5370f..99eea7894 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -1,23 +1,17 @@
 module.exports = function normalizeComponent (
-  scriptExports,
+  rawScriptExports,
   compiledTemplate,
   scopeId,
   cssModules
 ) {
-  scriptExports = scriptExports || {}
+  var esModule
+  var scriptExports = rawScriptExports = rawScriptExports || {}
 
   // ES6 modules interop
-  var type = typeof scriptExports.default
+  var type = typeof rawScriptExports.default
   if (type === 'object' || type === 'function') {
-    // check named exports
-    if (process.env.NODE_ENV !== 'production') {
-      if (Object.keys(scriptExports).some(function (key) {
-        return key !== 'default' && key !== '__esModule'
-      })) {
-        console.error('named exports are not supported in *.vue files.')
-      }
-    }
-    scriptExports = scriptExports.default
+    esModule = rawScriptExports
+    scriptExports = rawScriptExports.default
   }
 
   // Vue.extend constructor export interop
@@ -46,6 +40,7 @@ module.exports = function normalizeComponent (
   }
 
   return {
+    esModule: esModule,
     exports: scriptExports,
     options: options
   }
diff --git a/lib/loader.js b/lib/loader.js
index 481018f61..a7eef7cc1 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -299,6 +299,13 @@ module.exports = function (content) {
   if (!isProduction) {
     // add filename in dev
     output += 'Component.options.__file = ' + JSON.stringify(filePath) + '\n'
+    // check named exports
+    output +=
+      'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +
+        'return key !== "default" && key !== "__esModule"' +
+      '})) {' +
+        'console.error("named exports are not supported in *.vue files.")' +
+      '}\n'
     // check functional components used with templates
     if (template) {
       output +=

From fb0c7c9c3d2f130a7acf0f81c950c39ab0a5bc73 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 11:37:56 -0500
Subject: [PATCH 467/877] 10.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8335a238e..b7e45bd61 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.1.0",
+  "version": "10.1.1",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From ee797d2dd925774be661577bc787b01774fc5605 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 21:28:57 -0500
Subject: [PATCH 468/877] fix component normalizer path on windows (fix #601)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index a7eef7cc1..d35d7ec02 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -248,7 +248,7 @@ module.exports = function (content) {
   //   scopeId,
   //   cssModules
   // )
-  output += 'var Component = require("' + componentNormalizerPath + '")(\n'
+  output += 'var Component = require(' + JSON.stringify(componentNormalizerPath) + ')(\n'
 
   // <script>
   output += '  /* script */\n  '

From f1c0afe6d84123325e2849829f1b54b22ebcdf66 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 21:35:12 -0500
Subject: [PATCH 469/877] 10.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b7e45bd61..47816367f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.1.1",
+  "version": "10.1.2",
   "description": "Vue.js component loader for Webpack",
   "main": "index.js",
   "repository": {

From 8ae6edd9201cf8f19f475a3b67bae39c5d4662cb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 21:42:10 -0500
Subject: [PATCH 470/877] add appveyor.yml

---
 appveyor.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..5cf1f0ebc
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,21 @@
+# Test against the latest version of this Node.js version
+environment:
+  nodejs_version: "6"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node.js or io.js
+  - ps: Install-Product node $env:nodejs_version
+  # install modules
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  # run tests
+  - npm test
+
+# Don't actually build.
+build: off

From b8c359cb56721b4af6446eba906bc9a6c1126b07 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 21:45:17 -0500
Subject: [PATCH 471/877] add appveyor badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 180f04468..8212349e5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg?maxAge=2592000)](https://www.npmjs.com/package/vue-loader)
+# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![Windows Build status](https://ci.appveyor.com/api/projects/status/8cdonrkbg6m4k1tm/branch/master?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-loader/branch/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg?maxAge=2592000)](https://www.npmjs.com/package/vue-loader)
 
 > Vue.js component loader for [Webpack](http://webpack.github.io).
 

From 733c810e4890bc75ffd33b42ea1a74053f62dc23 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 27 Jan 2017 22:22:12 -0500
Subject: [PATCH 472/877] use more idiomatic request stringfication for
 componentNormalizer

---
 lib/loader.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index d35d7ec02..1dabc7b86 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -248,7 +248,9 @@ module.exports = function (content) {
   //   scopeId,
   //   cssModules
   // )
-  output += 'var Component = require(' + JSON.stringify(componentNormalizerPath) + ')(\n'
+  output += 'var Component = require(' +
+    loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
+  ')(\n'
 
   // <script>
   output += '  /* script */\n  '

From cfcfc741ac5935d166cf51307b9573583e115808 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Tue, 31 Jan 2017 11:49:10 +0900
Subject: [PATCH 473/877] fix cannot apply css modules to vue instance (#609)

---
 lib/loader.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/loader.js b/lib/loader.js
index 1dabc7b86..48b8d0940 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -338,8 +338,15 @@ module.exports = function (content) {
         '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
         '  } else {\n' +
         // update
+        '    if (module.hot.data.cssModules && JSON.stringify(module.hot.data.cssModules) !== JSON.stringify(cssModules)) {\n' +
+        '      delete Component.options._Ctor\n' +
+        '    }\n' +
         '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
         '  }\n' +
+        // save cssModules
+        '  module.hot.dispose(function (data) {\n' +
+        '    data.cssModules = cssModules\n' +
+        '  })\n' +
         '})()}\n'
     }
     // final export

From bc8f5a3734891a185e835ace56f9276453558194 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Jan 2017 16:36:21 -0500
Subject: [PATCH 474/877] tweak style codegen for server-side rendering

---
 lib/loader.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 48b8d0940..c18d2b47b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -47,15 +47,21 @@ module.exports = function (content) {
   var moduleId = 'data-v-' + genId(filePath)
   var styleRewriter = styleRewriterPath + '?id=' + moduleId
 
-  var needCssSourceMap =
-    !isProduction &&
-    this.sourceMap &&
-    options.cssSourceMap !== false
+  var cssLoaderOptions = ''
+  if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
+    cssLoaderOptions += '?sourceMap'
+  }
+  if (isProduction) {
+    cssLoaderOptions += (cssLoaderOptions ? '&' : '?') + 'minimize'
+  }
+
+  var bubleOptions = hasBuble && options.buble
+    ? '?' + JSON.stringify(options.buble)
+    : ''
 
-  var bubleOptions = hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
   var defaultLoaders = {
     html: templateCompilerPath + '?id=' + moduleId,
-    css: (isServer ? '' : styleLoaderPath + '!') + 'css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
+    css: styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
     js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
 
@@ -205,14 +211,12 @@ module.exports = function (content) {
     output += '\n/* styles */\n'
     var hasModules = false
     parts.styles.forEach(function (style, i) {
-      var moduleName = (style.module === true) ? '$style' : style.module
-
       // require style
-      if (isServer && !moduleName) return
       var requireString = style.src
         ? getRequireForImport('styles', style, style.scoped)
         : getRequire('styles', style, i, style.scoped)
 
+      var moduleName = (style.module === true) ? '$style' : style.module
       // setCssModule
       if (moduleName) {
         if (!hasModules) {
@@ -225,10 +229,10 @@ module.exports = function (content) {
         } else {
           cssModules[moduleName] = true
 
-          // `style-loader` exposes the name-to-hash map directly
+          // `(vue-)style-loader` exposes the name-to-hash map directly
           // `css-loader` exposes it in `.locals`
-          // We drop `style-loader` in SSR, and add `.locals` here.
-          if (isServer) {
+          // add `.locals` if the user configured to not use style-loader.
+          if (requireString.indexOf('style-loader') < 0) {
             requireString += '.locals'
           }
 

From 26b3ca1530a72f3fc524e398566c57214c2f8d4a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Jan 2017 18:58:50 -0500
Subject: [PATCH 475/877] test vue-style-loader SSR style extraction

---
 package.json                |  3 ++-
 test/fixtures/ssr-style.js  |  4 ++++
 test/fixtures/ssr-style.vue | 20 ++++++++++++++++++
 test/test.js                | 41 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/ssr-style.js
 create mode 100644 test/fixtures/ssr-style.vue

diff --git a/package.json b/package.json
index 47816367f..2002a64e9 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
-    "vue-style-loader": "^1.0.0",
+    "vue-style-loader": "^2.0.0",
     "vue-template-es2015-compiler": "^1.2.2"
   },
   "peerDependencies": {
@@ -73,6 +73,7 @@
     "sugarss": "^0.2.0",
     "url-loader": "^0.5.7",
     "vue": "^2.1.0",
+    "vue-server-renderer": "^2.1.10",
     "vue-template-compiler": "^2.1.0",
     "webpack": "^2.2.0"
   }
diff --git a/test/fixtures/ssr-style.js b/test/fixtures/ssr-style.js
new file mode 100644
index 000000000..35f445ce3
--- /dev/null
+++ b/test/fixtures/ssr-style.js
@@ -0,0 +1,4 @@
+var Vue = require('vue')
+var App = require('./ssr-style.vue')
+
+module.exports = new Vue(App)
diff --git a/test/fixtures/ssr-style.vue b/test/fixtures/ssr-style.vue
new file mode 100644
index 000000000..059d4bf6d
--- /dev/null
+++ b/test/fixtures/ssr-style.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <h1>Hello</h1>
+    <basic/>
+  </div>
+</template>
+
+<script>
+import Basic from './basic.vue'
+
+export default {
+  components: { Basic }
+}
+</script>
+
+<style>
+h1 { color: green; }
+</style>
+
+<style src="./style-import.css"></style>
diff --git a/test/test.js b/test/test.js
index 79b21c89d..99cead9f5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -6,12 +6,14 @@ var webpack = require('webpack')
 var MemoryFS = require('memory-fs')
 var expect = require('chai').expect
 var genId = require('../lib/gen-id')
+var SSR = require('vue-server-renderer')
 var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 
-var loaderPath = 'expose-loader?vueModule!' + path.resolve(__dirname, '../index.js')
+var rawLoaderPath = path.resolve(__dirname, '../index.js')
+var loaderPath = 'expose-loader?vueModule!' + rawLoaderPath
 var mfs = new MemoryFS()
 var globalConfig = {
   output: {
@@ -49,6 +51,11 @@ function bundle (options, cb) {
         console.error(err.message)
       })
     }
+    if (stats.compilation.errors) {
+      stats.compilation.errors.forEach(err => {
+        console.error(err.message)
+      })
+    }
     expect(stats.compilation.errors).to.be.empty
     cb(mfs.readFileSync('/test.build.js').toString())
   })
@@ -511,4 +518,36 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('SSR style extraction', done => {
+    bundle({
+      target: 'node',
+      entry: './test/fixtures/ssr-style.js',
+      output: {
+        path: '/',
+        filename: 'test.build.js',
+        libraryTarget: 'commonjs2'
+      },
+      externals: ['vue'],
+      module: {
+        rules: [{ test: /\.vue$/, loader: rawLoaderPath }]
+      }
+    }, code => {
+      const renderer = SSR.createBundleRenderer(code)
+      const context = {}
+      renderer.renderToString(context, (err, res) => {
+        if (err) return done(err)
+        expect(res).to.contain('server-rendered')
+        expect(res).to.contain('<h1>Hello</h1>')
+        expect(res).to.contain('Hello from Component A!')
+        // from main component
+        expect(context.styles).to.contain('h1 { color: green;')
+        // from imported child component
+        expect(context.styles).to.contain('comp-a h2 {\n  color: #f00;')
+        // from imported css file
+        expect(context.styles).to.contain('h1 { color: red;')
+        done()
+      })
+    })
+  })
 })

From 5e110cb9a5a73920a5987a353fac65894c9e0eea Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 30 Jan 2017 22:21:36 -0500
Subject: [PATCH 476/877] bump deps

---
 lib/template-compiler.js |  4 +++-
 package.json             | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 224ec446d..28efd7271 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -100,5 +100,7 @@ module.exports = function (html) {
 }
 
 function toFunction (code) {
-  return 'function (){' + beautify(code, { indent_size: 2 }) + '}'
+  return 'function (){' + beautify(code, {
+    indent_size: 2 // eslint-disable-line camelcase
+  }) + '}'
 }
diff --git a/package.json b/package.json
index 2002a64e9..6e6b8ae13 100644
--- a/package.json
+++ b/package.json
@@ -53,15 +53,15 @@
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
     "css-loader": "^0.26.0",
-    "eslint": "^2.9.0",
-    "eslint-config-vue": "^1.0.0",
-    "eslint-plugin-html": "^1.5.2",
+    "eslint": "^3.14.1",
+    "eslint-config-vue": "^2.0.2",
+    "eslint-plugin-vue": "^2.0.0",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^2.0.0-rc.0",
-    "file-loader": "^0.9.0",
+    "file-loader": "^0.10.0",
     "inject-loader": "^2.0.0",
     "jsdom": "^9.2.1",
-    "memory-fs": "^0.3.0",
+    "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "node-libs-browser": "^2.0.0",

From f1df374d5fd5d921daf7d5b0619ce7fac4be0c1d Mon Sep 17 00:00:00 2001
From: Andre Asselin <github@aasselin.com>
Date: Tue, 31 Jan 2017 12:56:12 -0500
Subject: [PATCH 477/877] Add the vue template compiler onto any template
 loader specified in the vue.loaders configuration (#595)

* Tweak to add the vue template compiler onto any loader specified in the vue.loaders configuration.

This enables, for example, using a markdown loader via <template lang="md"> in a .vue file.  Without this tweak, the webpack config has
to specify both the loader that converts the markdown (e.g.) to HTML AND template-compiler to compile it.  That, however doesn't fully work
because the webpack config can't know the moduleId generated by lib/loader.js and pass it in via the `id` parameter, so scoped styles won't
work.

* adjustments

* add tests for custom html loader
---
 lib/loader.js              |  4 ++++
 package.json               |  1 +
 test/fixtures/markdown.vue |  1 +
 test/test.js               | 20 ++++++++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 test/fixtures/markdown.vue

diff --git a/lib/loader.js b/lib/loader.js
index c18d2b47b..4d08081e0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -150,6 +150,10 @@ module.exports = function (content) {
       if (type === 'styles') {
         loader = addCssModulesToLoader(loader, part, index)
       }
+      // if user defines custom loaders for html, add template compiler to it
+      if (type === 'template' && loader !== defaultLoaders.html) {
+        loader = defaultLoaders.html + '!' + loader
+      }
       // inject rewriter before css/html loader for
       // extractTextPlugin use cases
       if (rewriterInjectRE.test(loader)) {
diff --git a/package.json b/package.json
index 6e6b8ae13..3503c2b37 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "file-loader": "^0.10.0",
     "inject-loader": "^2.0.0",
     "jsdom": "^9.2.1",
+    "marked": "^0.3.6",
     "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
diff --git a/test/fixtures/markdown.vue b/test/fixtures/markdown.vue
new file mode 100644
index 000000000..ea398f3d6
--- /dev/null
+++ b/test/fixtures/markdown.vue
@@ -0,0 +1 @@
+<template>## {{msg}}</template>
diff --git a/test/test.js b/test/test.js
index 99cead9f5..2e7a8edd9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -504,6 +504,26 @@ describe('vue-loader', function () {
     })
   })
 
+  it('should allow adding custom html loaders', done => {
+    test({
+      entry: './test/fixtures/markdown.vue',
+      vue: {
+        loaders: {
+          html: 'marked'
+        }
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      // <h2 id="-msg-">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.attrs.id).to.equal('-msg-')
+      expect(vnode.children[0]).to.equal('hi')
+      done()
+    })
+  })
+
   it('support chaining with other loaders', done => {
     const mockLoaderPath = require.resolve('./mock-loader')
     test({

From 7d3e005d56781e8e5e4ae8f90212f782e4b3a509 Mon Sep 17 00:00:00 2001
From: Andre Asselin <github@aasselin.com>
Date: Tue, 31 Jan 2017 13:14:01 -0500
Subject: [PATCH 478/877] Rebase changes onto current version of master (#499)

Add in additional changes that add attributes on custom blocks as query parms for the loader
---
 docs/en/README.md                  |   1 +
 docs/en/configurations/advanced.md |   7 +-
 docs/en/start/spec.md              |  73 +++++++++++++++-
 lib/loader.js                      |  42 ++++++++-
 package.json                       |   3 +
 test/fixtures/custom-import.vue    |  22 +++++
 test/fixtures/custom-language.vue  |  31 +++++++
 test/fixtures/custom-options.vue   |   7 ++
 test/fixtures/unit-test.js         |   5 ++
 test/test.js                       | 135 +++++++++++++++++++++++++++--
 10 files changed, 314 insertions(+), 12 deletions(-)
 create mode 100644 test/fixtures/custom-import.vue
 create mode 100644 test/fixtures/custom-language.vue
 create mode 100644 test/fixtures/custom-options.vue
 create mode 100644 test/fixtures/unit-test.js

diff --git a/docs/en/README.md b/docs/en/README.md
index 2bb3116c8..21e30088a 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -10,6 +10,7 @@ There are many cool features provided by `vue-loader`:
 
 - ES2015 enabled by default;
 - Allows using other Webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
+- Allows custom sections in a .vue file that can have custom loader chains applied to them
 - Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with Webpack loaders;
 - Can simulate scoped CSS for each component;
 - Supports component hot-reloading during development.
diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 1f6667a08..6f82efe81 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -41,10 +41,13 @@ module.exports = {
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        // vue-loader options goes here
         options: {
           loaders: {
-            // ...
+            // load all <script> without "lang" attribute with coffee-loader
+            js: 'coffee',
+            // load <template> directly as HTML string, without piping it
+            // through vue-html-loader first
+            html: 'raw'
           }
         }
       }
diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 7e83a24ba..2c4dd84e8 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -1,6 +1,6 @@
 # Vue Component Spec
 
-A `*.vue` file is a custom file format that uses HTML-like syntax to describe a Vue component. Each `*.vue` file consists of three types of top-level language blocks: `<template>`, `<script>` and `<style>`:
+A `*.vue` file is a custom file format that uses HTML-like syntax to describe a Vue component. Each `*.vue` file consists of three types of top-level language blocks: `<template>`, `<script>`, and `<style>`, and optionally additional custom blocks:
 
 ``` html
 <template>
@@ -22,6 +22,10 @@ export default {
   color: red;
 }
 </style>
+
+<custom1>
+  This could be e.g. documentation for the component.
+</custom1>
 ```
 
 `vue-loader` will parse the file, extract each language block, pipe them through other loaders if necessary, and finally assemble them back into a CommonJS module whose `module.exports` is a Vue.js component options object.
@@ -66,6 +70,66 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
 
+### Custom Blocks
+
+Additional custom blocks can be included in a `*.vue` file for any project specific needs. `vue-loader` will use the tag name to look up which webpack loaders should be applied to the contents of the section. The webpack loaders should be specified in the `loaders` hash of the `vue` section of the webpack configuration in the same way that languages are specified for the standard sections of the file. See [Advanced Loader Configuration](../configurations/advanced.md).
+
+Example:
+
+#### component.vue
+``` html
+<unit-test>
+  describe('example', function () {
+    it('basic', function (done) {
+      done();
+    })
+  })
+</unit-test>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x (^2.1.0-beta.25)
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        // vue-loader options go here
+        options: {
+          loaders: {
+            unit-test: 'buble-loader',
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+
 ### Src Imports
 
 If you prefer splitting up your `*.vue` components into multiple files, you can use the `src` attribute to import an external file for a language block:
@@ -83,6 +147,13 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 <style src="todomvc-app-css/index.css">
 ```
 
+`src` imports also work with custom blocks, e.g.:
+
+``` html
+<unit-test src="./unit-test.js">
+</unit-test>
+```
+
 ### Syntax Highlighting
 
 Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by treating `*.vue` files as HTML in your editor.
diff --git a/lib/loader.js b/lib/loader.js
index 4d08081e0..5f8feb5a1 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -3,6 +3,7 @@ var parse = require('./parser')
 var genId = require('./gen-id')
 var normalize = require('./normalize')
 var loaderUtils = require('loader-utils')
+var querystring = require('querystring')
 
 // internal lib loaders
 var selectorPath = normalize.lib('selector')
@@ -128,6 +129,13 @@ module.exports = function (content) {
     })
   }
 
+  function buildCustomBlockLoaderString (attrs) {
+    var noSrcAttrs = Object.assign({}, attrs)
+    delete noSrcAttrs.src
+    var qs = querystring.stringify(noSrcAttrs)
+    return qs ? '?' + qs : qs
+  }
+
   // stringify an Array of loader objects
   function stringifyLoaders (loaders) {
     return loaders.map(function (obj) {
@@ -174,6 +182,12 @@ module.exports = function (content) {
           return loader + '!' + rewriter + ensureBang(ensureLoader(lang))
         case 'script':
           return injectString + ensureBang(ensureLoader(lang))
+        default:
+          loader = loaders[type]
+          if (Array.isArray(loader)) {
+            loader = stringifyLoaders(loader)
+          }
+          return ensureBang(loader + buildCustomBlockLoaderString(part.attrs))
       }
     }
   }
@@ -191,7 +205,7 @@ module.exports = function (content) {
 
   function getSelectorString (type, index) {
     return selectorPath +
-      '?type=' + type +
+      '?type=' + ((type === 'script' || type === 'template' || type === 'styles') ? type : 'customBlocks') +
       '&index=' + index + '!'
   }
 
@@ -249,6 +263,32 @@ module.exports = function (content) {
     output += '\n'
   }
 
+    // add requires for customBlocks
+  if (parts.customBlocks && parts.customBlocks.length) {
+    var addedPrefix = false
+
+    parts.customBlocks.forEach(function (customBlock, i) {
+      if (!loaders[customBlock.type]) {
+        loaderContext.emitWarning('Loader for custom block type "' + customBlock.type + '" not found in webpack configuration')
+      } else {
+        // require customBlock
+        customBlock.src = customBlock.attrs.src
+        var requireString = customBlock.src
+          ? getRequireForImport(customBlock.type, customBlock)
+          : getRequire(customBlock.type, customBlock, i)
+
+        if (!addedPrefix) {
+          output += '\n/* customBlocks */\n'
+          addedPrefix = true
+        }
+
+        output += requireString + '\n'
+      }
+    })
+
+    output += '\n'
+  }
+
   // we require the component normalizer function, and call it like so:
   // normalizeComponent(
   //   scriptExports,
diff --git a/package.json b/package.json
index 3503c2b37..51be4bedd 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,11 @@
     "mocha": "^3.2.0",
     "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",
+    "null-loader": "^0.1.1",
     "postcss": "^5.0.21",
     "pug": "^2.0.0-beta6",
+    "raw-loader": "^0.5.1",
+    "skeleton-loader": "0.0.5",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
diff --git a/test/fixtures/custom-import.vue b/test/fixtures/custom-import.vue
new file mode 100644
index 000000000..34eed79df
--- /dev/null
+++ b/test/fixtures/custom-import.vue
@@ -0,0 +1,22 @@
+<unit-test src="./unit-test.js">
+</unit-test>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
diff --git a/test/fixtures/custom-language.vue b/test/fixtures/custom-language.vue
new file mode 100644
index 000000000..3684d135b
--- /dev/null
+++ b/test/fixtures/custom-language.vue
@@ -0,0 +1,31 @@
+<unit-test>
+  describe('example', function () {
+    it('basic', function (done) {
+      done();
+    })
+  })
+</unit-test>
+
+<documentation>
+  This is example documentation for a component.
+</documentation>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
diff --git a/test/fixtures/custom-options.vue b/test/fixtures/custom-options.vue
new file mode 100644
index 000000000..c8249bbd6
--- /dev/null
+++ b/test/fixtures/custom-options.vue
@@ -0,0 +1,7 @@
+<unit-test foo="bar" opt2="value2">
+  describe('example', function () {
+    it('basic', function (done) {
+      done();
+    })
+  })
+</unit-test>
diff --git a/test/fixtures/unit-test.js b/test/fixtures/unit-test.js
new file mode 100644
index 000000000..422357802
--- /dev/null
+++ b/test/fixtures/unit-test.js
@@ -0,0 +1,5 @@
+  describe('example', function () {
+    it('basic', function (done) {
+      done();
+    })
+  })
diff --git a/test/test.js b/test/test.js
index 2e7a8edd9..69e716505 100644
--- a/test/test.js
+++ b/test/test.js
@@ -57,12 +57,12 @@ function bundle (options, cb) {
       })
     }
     expect(stats.compilation.errors).to.be.empty
-    cb(mfs.readFileSync('/test.build.js').toString())
+    cb(mfs.readFileSync('/test.build.js').toString(), stats.compilation.warnings)
   })
 }
 
 function test (options, assert) {
-  bundle(options, function (code) {
+  bundle(options, function (code, warnings) {
     jsdom.env({
       html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
       src: [code],
@@ -226,11 +226,10 @@ describe('vue-loader', function () {
   })
 
   it('source map', function (done) {
-    var config = Object.assign({}, globalConfig, {
+    bundle({
       entry: './test/fixtures/basic.vue',
       devtool: '#source-map'
-    })
-    bundle(config, function (code) {
+    }, function (code, warnings) {
       var map = mfs.readFileSync('/test.build.js.map').toString()
       var smc = new SourceMapConsumer(JSON.parse(map))
       var line
@@ -266,7 +265,7 @@ describe('vue-loader', function () {
   })
 
   it('extract CSS', function (done) {
-    bundle(Object.assign({}, globalConfig, {
+    bundle({
       entry: './test/fixtures/extract-css.vue',
       vue: {
         loaders: {
@@ -277,7 +276,7 @@ describe('vue-loader', function () {
       plugins: [
         new ExtractTextPlugin('test.output.css')
       ]
-    }), function () {
+    }, function (code, warnings) {
       var css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
       expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
@@ -488,7 +487,7 @@ describe('vue-loader', function () {
       output: Object.assign({}, globalConfig.output, {
         libraryTarget: 'commonjs2'
       })
-    }, function (code) {
+    }, function (code, warnings) {
       // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
       function requireFromString(src, filename) {
         var Module = module.constructor;
@@ -570,4 +569,124 @@ describe('vue-loader', function () {
       })
     })
   })
+
+  it('extract custom blocks to a separate file', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-language.vue',
+      vue: {
+        loaders: {
+          'documentation': ExtractTextPlugin.extract('raw-loader')
+        }
+      },
+      plugins: [
+        new ExtractTextPlugin('doc.md')
+      ]
+    }, function (code, warnings) {
+      var unitTest = mfs.readFileSync('/doc.md').toString()
+      unitTest = normalizeNewline(unitTest)
+      expect(unitTest).to.contain('This is example documentation for a component.')
+      done()
+    })
+  })
+
+  it('add custom blocks to the webpack output', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-language.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'babel-loader'
+        }
+      }
+    }, function (code, warnings) {
+      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('custom blocks work with src imports', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-import.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'babel-loader'
+        }
+      }
+    }, function (code, warnings) {
+      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('custom blocks can be removed from the output', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-language.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'null-loader'
+        }
+      }
+    }, function (code, warnings) {
+      expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('no warnings when loaders are specified for all custom blocks', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-language.vue',
+      vue: {
+        loaders: {
+          'documentation': 'null-loader',
+          'unit-test': 'null-loader'
+        }
+      }
+    }, function (code, warnings) {
+      expect(warnings.length).to.equal(0)
+      done()
+    })
+  })
+
+  it('warning should be raised when a loader is not specified for a custom block', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-language.vue',
+      vue: {
+        loaders: {
+          'documentation': 'null-loader'
+        }
+      }
+    }, function (code, warnings) {
+      expect(warnings.length).to.equal(1)
+      expect(warnings[0].message).to.equal('Loader for custom block type "unit-test" not found in webpack configuration')
+      done()
+    })
+  })
+
+  it('passes attributes as options to the loader', function (done) {
+    bundle({
+      entry: './test/fixtures/custom-options.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'babel-loader!skeleton-loader'
+        }
+      },
+      plugins: [
+        new webpack.LoaderOptionsPlugin({
+          options: {
+            skeletonLoader: {
+              procedure: function(content, sourceMap, callback, options) {
+                expect(options.foo).to.equal('bar');
+                expect(options.opt2).to.equal('value2');
+
+                // Return the content to output.
+                return content;
+              }
+            }
+          }
+        })
+      ]
+    }, function (code, warnings) {
+      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
 })

From 7ad0f8a8d2bef01c025421653ec1421297acb168 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 31 Jan 2017 12:20:50 -0500
Subject: [PATCH 479/877] meta

---
 LICENSE      | 3 +--
 package.json | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 2c8fd9923..21aee1be3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Q42
+Copyright (c) 2015-present Yuxi (Evan) You
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/package.json b/package.json
index 51be4bedd..c88543801 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-loader",
   "version": "10.1.2",
-  "description": "Vue.js component loader for Webpack",
+  "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
     "index.js",
     "lib"
   ],
-  "author": "Sjoerd Visscher",
+  "author": "Evan You",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/vuejs/vue-loader/issues"

From 7f8a6b5d1a38dd9a0cdf865e80f2ab374fe95219 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 31 Jan 2017 13:52:44 -0500
Subject: [PATCH 480/877] docs

---
 docs/en/SUMMARY.md                      |  1 +
 docs/en/configurations/advanced.md      | 18 +++----
 docs/en/configurations/custom-blocks.md | 67 +++++++++++++++++++++++++
 docs/en/configurations/extract-css.md   |  2 +-
 docs/en/start/spec.md                   | 58 ++-------------------
 5 files changed, 81 insertions(+), 65 deletions(-)
 create mode 100644 docs/en/configurations/custom-blocks.md

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 96dd8c380..5aecdfcf5 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -12,6 +12,7 @@
   - [Asset URL Handling](configurations/asset-url.md)
   - [Advanced Loader Configuration](configurations/advanced.md)
   - [Extracting CSS File](configurations/extract-css.md)
+  - [Custom Blocks](configurations/custom-blocks.md)
 - Workflow
   - [Production Build](workflow/production.md)
   - [Linting](workflow/linting.md)
diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 6f82efe81..9edee1fa1 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -21,16 +21,16 @@ module.exports = {
     // ... other vue options
     loaders: {
       // load all <script> without "lang" attribute with coffee-loader
-      js: 'coffee',
-      // load <template> directly as HTML string, without piping it
-      // through vue-html-loader first
-      html: 'raw'
+      js: 'coffee-loader',
+      // allows you to write markdown inside <template> tags...
+      // (note this only works for 10.2.0+)
+      html: 'marked'
     }
   }
 }
 ```
 
-### Webpack 2.x (^2.1.0-beta.25)
+### Webpack 2.x
 
 ``` js
 module.exports = {
@@ -44,10 +44,10 @@ module.exports = {
         options: {
           loaders: {
             // load all <script> without "lang" attribute with coffee-loader
-            js: 'coffee',
-            // load <template> directly as HTML string, without piping it
-            // through vue-html-loader first
-            html: 'raw'
+            js: 'coffee-loader',
+            // allows you to write markdown inside <template> tags...
+            // (note this only works for 10.2.0+)
+            html: 'marked'
           }
         }
       }
diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
new file mode 100644
index 000000000..b3420b864
--- /dev/null
+++ b/docs/en/configurations/custom-blocks.md
@@ -0,0 +1,67 @@
+# Custom Blocks
+
+> Requires 10.2.0+
+
+You can define custom language blocks inside `*.vue` files. The content of a custom block will be processed by the loaders specified in the `loaders` object of `vue-loader` options and then required by the component module. The configuration is similar to what is described in [Advanced Loader Configuration](../configurations/advanced.md), except the matching uses the tag name instead of the `lang` attribute.
+
+## Example
+
+Here's an example of extracting all `<docs>` custom blocks into a single docs file:
+
+#### component.vue
+
+``` html
+<docs>
+## This is an Example component.
+</docs>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            // extract all <docs> content as raw text
+            'docs': ExtractTextPlugin.extract('raw-loader'),
+          }
+        }
+      }
+    ],
+    plugins: [
+      // output all docs into a single file
+      new ExtractTextPlugin('docs.md')
+    ]
+  }
+}
+```
+
+Note that custom blocks would require specific configuration to work properly, so you probably want to avoid distributing reusable components with custom blocks in source form.
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index b1134406f..a6484180f 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -35,7 +35,7 @@ module.exports = {
 }
 ```
 
-### Webpack 2.x (^2.1.0-beta.25)
+### Webpack 2.x
 
 ``` bash
 npm install extract-text-webpack-plugin@2.x --save-dev
diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 2c4dd84e8..b271616a5 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -72,63 +72,11 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 ### Custom Blocks
 
-Additional custom blocks can be included in a `*.vue` file for any project specific needs. `vue-loader` will use the tag name to look up which webpack loaders should be applied to the contents of the section. The webpack loaders should be specified in the `loaders` hash of the `vue` section of the webpack configuration in the same way that languages are specified for the standard sections of the file. See [Advanced Loader Configuration](../configurations/advanced.md).
+> Only supported in vue-loader 10.2.0+
 
-Example:
-
-#### component.vue
-``` html
-<unit-test>
-  describe('example', function () {
-    it('basic', function (done) {
-      done();
-    })
-  })
-</unit-test>
-
-<template>
-  <h2 class="red">{{msg}}</h2>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-      msg: 'Hello from Component A!'
-    }
-  }
-}
-</script>
-
-<style>
-comp-a h2 {
-  color: #f00;
-}
-</style>
-```
-
-#### webpack.config.js
-
-``` js
-// Webpack 2.x (^2.1.0-beta.25)
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: 'vue',
-        // vue-loader options go here
-        options: {
-          loaders: {
-            unit-test: 'buble-loader',
-          }
-        }
-      }
-    ]
-  }
-}
-```
+Additional custom blocks can be included in a `*.vue` file for any project specific needs, for example a `<docs>` block. `vue-loader` will use the tag name to look up which webpack loaders should be applied to the contents of the section. The webpack loaders should be specified in the `loaders` section of `vue-loader` options.
 
+For mode details, see [Custom Blocks](../configurations/custom-blocks.md).
 
 ### Src Imports
 

From 89927c59bc079349ac494b9618ce6edb4da94147 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 31 Jan 2017 13:52:52 -0500
Subject: [PATCH 481/877] 10.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c88543801..bdce0c295 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.1.2",
+  "version": "10.2.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 757e854ebea5c40911177ebdbe306e7a064323ac Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 1 Feb 2017 09:45:02 -0500
Subject: [PATCH 482/877] fix cssModules hot reload (fix #614)

---
 lib/loader.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 5f8feb5a1..fd4634482 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -222,7 +222,7 @@ module.exports = function (content) {
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
 
   // css modules
-  var cssModules = {}
+  var cssModules
 
   // add requires for styles
   if (parts.styles.length) {
@@ -237,6 +237,9 @@ module.exports = function (content) {
       var moduleName = (style.module === true) ? '$style' : style.module
       // setCssModule
       if (moduleName) {
+        if (!cssModules) {
+          cssModules = {}
+        }
         if (!hasModules) {
           hasModules = true
           output += 'var cssModules = {}\n'
@@ -334,7 +337,7 @@ module.exports = function (content) {
 
   // cssModules
   output += '  /* cssModules */\n  '
-  if (Object.keys(cssModules).length) {
+  if (cssModules) {
     // inject style modules as computed properties
     output += 'cssModules'
   } else {
@@ -384,18 +387,25 @@ module.exports = function (content) {
         '  if (!module.hot.data) {\n' +
         // initial insert
         '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
-        '  } else {\n' +
-        // update
+        '  } else {\n'
+      // update
+      if (cssModules) {
+        output +=
         '    if (module.hot.data.cssModules && JSON.stringify(module.hot.data.cssModules) !== JSON.stringify(cssModules)) {\n' +
         '      delete Component.options._Ctor\n' +
-        '    }\n' +
+        '    }\n'
+      }
+      output +=
         '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
-        '  }\n' +
+        '  }\n'
+      if (cssModules) {
         // save cssModules
+        output +=
         '  module.hot.dispose(function (data) {\n' +
         '    data.cssModules = cssModules\n' +
-        '  })\n' +
-        '})()}\n'
+        '  })\n'
+      }
+      output += '})()}\n'
     }
     // final export
     if (options.esModule) {

From 71f7df8113c559ffb2499c0f892c7fe7db7e3865 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 1 Feb 2017 09:45:05 -0500
Subject: [PATCH 483/877] 10.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bdce0c295..9db725030 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 54501b40f8f0e067cfdca818e605193974e579cb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 2 Feb 2017 13:43:22 -0500
Subject: [PATCH 484/877] exclude eslint-loader from selector requests

---
 lib/loader.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index fd4634482..da40dfd99 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -34,6 +34,20 @@ var defaultLang = {
   script: 'js'
 }
 
+// When extracting parts from the source vue file, we want to apply the
+// loaders chained before vue-loader, but exclude some loaders that simply
+// produces side effects such as linting. This is a hard-coded list and
+// hopefully eslint-loader is the only one.
+var excludedPreLoadersRE = /eslint-loader/
+
+function getRawRequest (context) {
+  const clonedContext = Object.assign({}, context, {
+    loaders: context.loaders.filter(loader => !excludedPreLoadersRE.test(loader.path))
+  })
+  delete clonedContext.remainingRequest
+  return loaderUtils.getRemainingRequest(clonedContext)
+}
+
 module.exports = function (content) {
   this.cacheable()
   var isServer = this.options.target === 'node'
@@ -41,6 +55,7 @@ module.exports = function (content) {
 
   var loaderContext = this
   var query = loaderUtils.parseQuery(this.query)
+  var rawRequest = getRawRequest(this)
   var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
 
   var filePath = this.resourcePath
@@ -85,7 +100,7 @@ module.exports = function (content) {
       // select the corresponding part from the vue file
       getSelectorString(type, index || 0) +
       // the url to the actual vue file, including remaining requests
-      loaderUtils.getRemainingRequest(loaderContext)
+      rawRequest
     )
   }
 

From 17af9246d14953972b359ffba2314207b6891944 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 2 Feb 2017 13:43:25 -0500
Subject: [PATCH 485/877] 10.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9db725030..5ca43b83b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.2.1",
+  "version": "10.2.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From fe31fcd34173790646369b933e4c6d32371e58e4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 2 Feb 2017 16:04:12 -0500
Subject: [PATCH 486/877] fix compat with webpack 1

---
 lib/loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index da40dfd99..81a0cc0cd 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -41,11 +41,11 @@ var defaultLang = {
 var excludedPreLoadersRE = /eslint-loader/
 
 function getRawRequest (context) {
-  const clonedContext = Object.assign({}, context, {
+  return loaderUtils.getRemainingRequest({
+    resource: context.resource,
+    loaderIndex: context.loaderIndex,
     loaders: context.loaders.filter(loader => !excludedPreLoadersRE.test(loader.path))
   })
-  delete clonedContext.remainingRequest
-  return loaderUtils.getRemainingRequest(clonedContext)
 }
 
 module.exports = function (content) {

From 5d35c651fdf0b0e737de172839dd64c31fab5134 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 2 Feb 2017 16:04:14 -0500
Subject: [PATCH 487/877] 10.2.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ca43b83b..21055a472 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.2.2",
+  "version": "10.2.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 3abf38baf4e1a08416ebbcc6f07589e01eee036b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 10:55:10 -0500
Subject: [PATCH 488/877] ignore custom blocks with no matching loader

---
 docs/en/configurations/custom-blocks.md |  4 +-
 lib/loader.js                           | 52 ++++++++++++-------------
 test/test.js                            | 39 +------------------
 3 files changed, 29 insertions(+), 66 deletions(-)

diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index b3420b864..2066b59a5 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -4,6 +4,8 @@
 
 You can define custom language blocks inside `*.vue` files. The content of a custom block will be processed by the loaders specified in the `loaders` object of `vue-loader` options and then required by the component module. The configuration is similar to what is described in [Advanced Loader Configuration](../configurations/advanced.md), except the matching uses the tag name instead of the `lang` attribute.
 
+If a matching loader is found for a custom block, it will be processed; otherwise the custom block will simply be ignored.
+
 ## Example
 
 Here's an example of extracting all `<docs>` custom blocks into a single docs file:
@@ -63,5 +65,3 @@ module.exports = {
   }
 }
 ```
-
-Note that custom blocks would require specific configuration to work properly, so you probably want to avoid distributing reusable components with custom blocks in source form.
diff --git a/lib/loader.js b/lib/loader.js
index 81a0cc0cd..a26f5d488 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -174,7 +174,7 @@ module.exports = function (content) {
         loader = addCssModulesToLoader(loader, part, index)
       }
       // if user defines custom loaders for html, add template compiler to it
-      if (type === 'template' && loader !== defaultLoaders.html) {
+      if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
         loader = defaultLoaders.html + '!' + loader
       }
       // inject rewriter before css/html loader for
@@ -281,32 +281,6 @@ module.exports = function (content) {
     output += '\n'
   }
 
-    // add requires for customBlocks
-  if (parts.customBlocks && parts.customBlocks.length) {
-    var addedPrefix = false
-
-    parts.customBlocks.forEach(function (customBlock, i) {
-      if (!loaders[customBlock.type]) {
-        loaderContext.emitWarning('Loader for custom block type "' + customBlock.type + '" not found in webpack configuration')
-      } else {
-        // require customBlock
-        customBlock.src = customBlock.attrs.src
-        var requireString = customBlock.src
-          ? getRequireForImport(customBlock.type, customBlock)
-          : getRequire(customBlock.type, customBlock, i)
-
-        if (!addedPrefix) {
-          output += '\n/* customBlocks */\n'
-          addedPrefix = true
-        }
-
-        output += requireString + '\n'
-      }
-    })
-
-    output += '\n'
-  }
-
   // we require the component normalizer function, and call it like so:
   // normalizeComponent(
   //   scriptExports,
@@ -385,6 +359,30 @@ module.exports = function (content) {
     }
   }
 
+  // add requires for customBlocks
+  if (parts.customBlocks && parts.customBlocks.length) {
+    var addedPrefix = false
+
+    parts.customBlocks.forEach(function (customBlock, i) {
+      if (loaders[customBlock.type]) {
+        // require customBlock
+        customBlock.src = customBlock.attrs.src
+        var requireString = customBlock.src
+          ? getRequireForImport(customBlock.type, customBlock)
+          : getRequire(customBlock.type, customBlock, i)
+
+        if (!addedPrefix) {
+          output += '\n/* customBlocks */\n'
+          addedPrefix = true
+        }
+
+        output += requireString + '\n'
+      }
+    })
+
+    output += '\n'
+  }
+
   if (!query.inject) {
     // hot reload
     if (
diff --git a/test/test.js b/test/test.js
index 69e716505..9bad78d35 100644
--- a/test/test.js
+++ b/test/test.js
@@ -617,50 +617,15 @@ describe('vue-loader', function () {
     })
   })
 
-  it('custom blocks can be removed from the output', function (done) {
+  it('custom blocks can be ignored', function (done) {
     bundle({
-      entry: './test/fixtures/custom-language.vue',
-      vue: {
-        loaders: {
-          'unit-test': 'null-loader'
-        }
-      }
+      entry: './test/fixtures/custom-language.vue'
     }, function (code, warnings) {
       expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
     })
   })
 
-  it('no warnings when loaders are specified for all custom blocks', function (done) {
-    bundle({
-      entry: './test/fixtures/custom-language.vue',
-      vue: {
-        loaders: {
-          'documentation': 'null-loader',
-          'unit-test': 'null-loader'
-        }
-      }
-    }, function (code, warnings) {
-      expect(warnings.length).to.equal(0)
-      done()
-    })
-  })
-
-  it('warning should be raised when a loader is not specified for a custom block', function (done) {
-    bundle({
-      entry: './test/fixtures/custom-language.vue',
-      vue: {
-        loaders: {
-          'documentation': 'null-loader'
-        }
-      }
-    }, function (code, warnings) {
-      expect(warnings.length).to.equal(1)
-      expect(warnings[0].message).to.equal('Loader for custom block type "unit-test" not found in webpack configuration')
-      done()
-    })
-  })
-
   it('passes attributes as options to the loader', function (done) {
     bundle({
       entry: './test/fixtures/custom-options.vue',

From a12a2985490f17d49beb644b6dad341e13895e52 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 11:03:08 -0500
Subject: [PATCH 489/877] 10.2.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21055a472..4621cb09c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.2.3",
+  "version": "10.2.4",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From e5fea3aeb880e7bfc2b64f8d92a125c083e6640a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 12:23:43 -0500
Subject: [PATCH 490/877] generate module id from project root to ensure
 consistent hash regardless of project path (close #613)

---
 lib/gen-id.js | 7 ++++++-
 lib/loader.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/gen-id.js b/lib/gen-id.js
index 8c9621dbf..a537138e6 100644
--- a/lib/gen-id.js
+++ b/lib/gen-id.js
@@ -1,8 +1,13 @@
 // utility for generating a uid for each component file
 // used in scoped CSS rewriting
+var path = require('path')
 var hash = require('hash-sum')
 var cache = Object.create(null)
 
-module.exports = function genId (file) {
+module.exports = function genId (file, context) {
+  context = context || process.cwd()
+  var contextPath = context.split(path.sep)
+  var rootId = contextPath[contextPath.length - 1]
+  file = rootId + '/' + path.relative(context, file)
   return cache[file] || (cache[file] = hash(file))
 }
diff --git a/lib/loader.js b/lib/loader.js
index a26f5d488..7db1f0047 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -60,7 +60,7 @@ module.exports = function (content) {
 
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
-  var moduleId = 'data-v-' + genId(filePath)
+  var moduleId = 'data-v-' + genId(filePath, this._compiler.context)
   var styleRewriter = styleRewriterPath + '?id=' + moduleId
 
   var cssLoaderOptions = ''

From 60e5a1a154e7966db3eccabf37ef87984d9e5dd1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 12:27:45 -0500
Subject: [PATCH 491/877] adjust test to cover consistent hash generation

---
 lib/gen-id.js |  1 -
 test/test.js  | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/gen-id.js b/lib/gen-id.js
index a537138e6..198474d8d 100644
--- a/lib/gen-id.js
+++ b/lib/gen-id.js
@@ -5,7 +5,6 @@ var hash = require('hash-sum')
 var cache = Object.create(null)
 
 module.exports = function genId (file, context) {
-  context = context || process.cwd()
   var contextPath = context.split(path.sep)
   var rootId = contextPath[contextPath.length - 1]
   file = rootId + '/' + path.relative(context, file)
diff --git a/test/test.js b/test/test.js
index 9bad78d35..6cf06f981 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,7 +5,7 @@ var jsdom = require('jsdom')
 var webpack = require('webpack')
 var MemoryFS = require('memory-fs')
 var expect = require('chai').expect
-var genId = require('../lib/gen-id')
+var hash = require('hash-sum')
 var SSR = require('vue-server-renderer')
 var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
@@ -163,7 +163,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/scoped-css.vue'
     }, function (window, module) {
-      var id = 'data-v-' + genId(require.resolve('./fixtures/scoped-css.vue'))
+      var id = 'data-v-' + hash('vue-loader/test/fixtures/scoped-css.vue')
       expect(module._scopeId).to.equal(id)
 
       var vnode = mockRender(module, {
@@ -198,7 +198,7 @@ describe('vue-loader', function () {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
       // import with scoped
-      var id = 'data-v-' + genId(require.resolve('./fixtures/style-import.vue'))
+      var id = 'data-v-' + hash('vue-loader/test/fixtures/style-import.vue')
       expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
       done()
     })
@@ -258,7 +258,7 @@ describe('vue-loader', function () {
     }, function (window) {
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
-      var id = 'data-v-' + genId(require.resolve('./fixtures/media-query.vue'))
+      var id = 'data-v-' + hash('vue-loader/test/fixtures/media-query.vue')
       expect(style).to.contain('@media print {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
       done()
     })
@@ -465,7 +465,7 @@ describe('vue-loader', function () {
         // default module + pre-processor + scoped
         var anotherClassName = module.computed.$style().red
         expect(anotherClassName).to.match(regexToMatch).and.not.equal(className)
-        var id = 'data-v-' + genId(require.resolve('./fixtures/css-modules.vue'))
+        var id = 'data-v-' + hash('vue-loader/test/fixtures/css-modules.vue')
         expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
 
         cb()

From 497e4829807ed148c7f6a2270370ad3a53b0910b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 12:35:11 -0500
Subject: [PATCH 492/877] fix consistent hash for windows

---
 lib/gen-id.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gen-id.js b/lib/gen-id.js
index 198474d8d..191929324 100644
--- a/lib/gen-id.js
+++ b/lib/gen-id.js
@@ -3,10 +3,11 @@
 var path = require('path')
 var hash = require('hash-sum')
 var cache = Object.create(null)
+var sepRE = new RegExp(path.sep.replace('\\', '\\\\'), 'g')
 
 module.exports = function genId (file, context) {
   var contextPath = context.split(path.sep)
   var rootId = contextPath[contextPath.length - 1]
-  file = rootId + '/' + path.relative(context, file)
+  file = rootId + '/' + path.relative(context, file).replace(sepRE, '/')
   return cache[file] || (cache[file] = hash(file))
 }

From 56e845da55d4009366affaf78ade4213fab6682f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 13:09:08 -0500
Subject: [PATCH 493/877] feat: support pre/post loaders for language blocks

---
 lib/loader.js                               | 14 ++++++++++
 test/mock-loaders/css.js                    |  3 ++
 test/mock-loaders/html.js                   |  3 ++
 test/{mock-loader.js => mock-loaders/js.js} |  0
 test/test.js                                | 31 ++++++++++++++++++++-
 5 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/mock-loaders/css.js
 create mode 100644 test/mock-loaders/html.js
 rename test/{mock-loader.js => mock-loaders/js.js} (100%)

diff --git a/lib/loader.js b/lib/loader.js
index 7db1f0047..dbb404a63 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -84,6 +84,8 @@ module.exports = function (content) {
   // check if there are custom loaders specified via
   // webpack config, otherwise use defaults
   var loaders = Object.assign({}, defaultLoaders, options.loaders)
+  var preLoaders = options.preLoaders || {}
+  var postLoaders = options.postLoaders || {}
 
   function getRequire (type, part, index, scoped) {
     return 'require(' +
@@ -161,6 +163,18 @@ module.exports = function (content) {
   }
 
   function getLoaderString (type, part, index, scoped) {
+    var loader = getRawLoaderString(type, part, index, scoped)
+    var lang = part.lang || defaultLang[type]
+    if (preLoaders[lang]) {
+      loader = loader + ensureBang(preLoaders[lang])
+    }
+    if (postLoaders[lang]) {
+      loader = ensureBang(postLoaders[lang]) + loader
+    }
+    return loader
+  }
+
+  function getRawLoaderString (type, part, index, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
diff --git a/test/mock-loaders/css.js b/test/mock-loaders/css.js
new file mode 100644
index 000000000..fe5d6d1e2
--- /dev/null
+++ b/test/mock-loaders/css.js
@@ -0,0 +1,3 @@
+module.exports = function (content) {
+  return content.replace(/#f00/, '#00f')
+}
diff --git a/test/mock-loaders/html.js b/test/mock-loaders/html.js
new file mode 100644
index 000000000..182d66e49
--- /dev/null
+++ b/test/mock-loaders/html.js
@@ -0,0 +1,3 @@
+module.exports = function (content) {
+  return content.replace(/red/, 'green')
+}
diff --git a/test/mock-loader.js b/test/mock-loaders/js.js
similarity index 100%
rename from test/mock-loader.js
rename to test/mock-loaders/js.js
diff --git a/test/test.js b/test/test.js
index 6cf06f981..2379ce84f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -524,7 +524,7 @@ describe('vue-loader', function () {
   })
 
   it('support chaining with other loaders', done => {
-    const mockLoaderPath = require.resolve('./mock-loader')
+    const mockLoaderPath = require.resolve('./mock-loaders/js')
     test({
       entry: './test/fixtures/basic.vue',
       module: {
@@ -654,4 +654,33 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('pre/post loaders', done => {
+    test({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        preLoaders: {
+          js: require.resolve('./mock-loaders/js'),
+          css: require.resolve('./mock-loaders/css')
+        },
+        postLoaders: {
+          html: require.resolve('./mock-loaders/html')
+        }
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      // <h2 class="green">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('green')
+      expect(vnode.children[0]).to.equal('hi')
+
+      expect(module.data().msg).to.contain('Changed!')
+      var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('comp-a h2 {\n  color: #00f;\n}')
+      done()
+    })
+  })
 })

From 18742087bbf4e5309a166f6f7229f96fe3c0cbe4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 13:32:12 -0500
Subject: [PATCH 494/877] document pre/post loaders

---
 docs/en/configurations/advanced.md    | 81 +++++++++++++++++----------
 docs/en/configurations/extract-css.md | 50 ++++++++---------
 docs/en/options.md                    | 65 ++++++++++++++-------
 3 files changed, 122 insertions(+), 74 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 9edee1fa1..5c48d64cf 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -1,57 +1,80 @@
 # Advanced Loader Configuration
 
-Sometimes you may want to apply a custom loader string to a language instead of letting `vue-loader` infer it. Or you may simply want to overwrite the built-in loader configuration for the default languages. To do that, add a `vue` block in your Webpack config file, and specify the `loaders` option.
+Sometimes the you may want to:
 
-### Webpack 1.x
+1. Apply a custom loader string to a language instead of letting `vue-loader` infer it;
+
+2. Overwrite the built-in loader configuration for the default languages;
+
+3. Pre-process or post-process a specific language block with custom loaders.
+
+To do that, specify the `loaders` option for `vue-loader`:
+
+> Note that `preLoaders` and `postLoaders` are only supported in >=10.3.0
+
+### Webpack 2.x
 
 ``` js
-// webpack.config.js
 module.exports = {
   // other options...
   module: {
-    loaders: [
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader',
+        options: {
+          // `loaders` will overwrite the default loaders.
+          // The following config will cause all <script> tags without "lang"
+          // attribute to be loaded with coffee-loader
+          loaders: {
+            js: 'coffee-loader'
+          },
+
+          // `preLoaders` are attached before the default loaders.
+          // You can use this to pre-process language blocks - a common use
+          // case would be build-time i18n.
+          preLoaders: {
+            js: '/path/to/custom/loader'
+          },
+
+          // `postLoaders` are attached after the default loaders.
+          //
+          // - For `html`, the result returned by the default loader
+          //   will be compiled JavaScript render function code.
+          //
+          // - For `css`, the result will be returned by vue-style-loader
+          //   which isn't particularly useful in most cases. Using a postcss
+          //   plugin will be a better option.
+          postLoaders: {
+            html: 'babel-loader'
+          }
+        }
       }
     ]
-  },
-  // vue-loader configurations
-  vue: {
-    // ... other vue options
-    loaders: {
-      // load all <script> without "lang" attribute with coffee-loader
-      js: 'coffee-loader',
-      // allows you to write markdown inside <template> tags...
-      // (note this only works for 10.2.0+)
-      html: 'marked'
-    }
   }
 }
 ```
 
-### Webpack 2.x
+### Webpack 1.x
 
 ``` js
+// webpack.config.js
 module.exports = {
   // other options...
   module: {
-    // module.rules is the same as module.loaders in 1.x
-    rules: [
+    loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          loaders: {
-            // load all <script> without "lang" attribute with coffee-loader
-            js: 'coffee-loader',
-            // allows you to write markdown inside <template> tags...
-            // (note this only works for 10.2.0+)
-            html: 'marked'
-          }
-        }
+        loader: 'vue'
       }
     ]
+  },
+  // vue-loader configurations
+  vue: {
+    loaders: {
+      // same configuration rules as above
+    }
   }
 }
 ```
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index a6484180f..750f65a9c 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -2,10 +2,10 @@
 
 Example config to extract all the processed CSS in all Vue components into a single CSS file:
 
-### Webpack 1.x
+### Webpack 2.x
 
 ``` bash
-npm install extract-text-webpack-plugin --save-dev
+npm install extract-text-webpack-plugin@2.x --save-dev
 ```
 
 ``` js
@@ -15,30 +15,31 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin")
 module.exports = {
   // other options...
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
-        loader: 'vue'
-      },
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              loader: 'css-loader',
+              fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+            })
+          }
+        }
+      }
     ]
   },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // you can also include <style lang="less"> or other langauges
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
   plugins: [
     new ExtractTextPlugin("style.css")
   ]
 }
 ```
 
-### Webpack 2.x
+### Webpack 1.x
 
 ``` bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js
@@ -48,21 +49,20 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin")
 module.exports = {
   // other options...
   module: {
-    rules: [
+    loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          loaders: {
-            css: ExtractTextPlugin.extract({
-              loader: 'css-loader',
-              fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
-            })
-          }
-        }
-      }
+        loader: 'vue'
+      },
     ]
   },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // you can also include <style lang="less"> or other langauges
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
   plugins: [
     new ExtractTextPlugin("style.css")
   ]
diff --git a/docs/en/options.md b/docs/en/options.md
index 7f0d883a4..74d6610cb 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -2,18 +2,7 @@
 
 ## Usage Difference Between Webpack 1 & 2
 
-For Webpack 1.x: add a root `vue` block in your Webpack config:
-
-``` js
-module.exports = {
-  // ...
-  vue: {
-    // vue-loader options
-  }
-}
-```
-
-For Webpack 2 (^2.1.0-beta.25):
+For Webpack 2: pass the options directly to the loader rule.
 
 ``` js
 module.exports = {
@@ -32,11 +21,22 @@ module.exports = {
 }
 ```
 
+For Webpack 1.x: add a root `vue` block in your Webpack config.
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader options
+  }
+}
+```
+
 ### loaders
 
-- type: `Object`
+- type: `{ [lang: string]: string }`
 
-  An object specifying Webpack loaders to use for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+  An object specifying Webpack loaders to overwrite the default loaders used for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -45,18 +45,43 @@ module.exports = {
   For example, to use `babel-loader` and `eslint-loader` to process all `<script>` blocks:
 
   ``` js
-  // ...
-  vue: {
-    loaders: {
-      js: 'babel!eslint'
-    }
+  // Webpack 2.x config
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: 'babel-loader!eslint-loader'
+          }
+        }
+      }
+    ]
   }
   ```
 
+### preLoaders
+
+- type: `{ [lang: string]: string }`
+- only supported in >=10.3.0
+
+  The config format is the same as `loaders`, but `preLoaders` are applied to corresponding language blocks before the default loaders. You can use this to pre-process language blocks - a common use case would be build-time i18n.
+
+### postLoaders
+
+- type: `{ [lang: string]: string }`
+- only supported in >=10.3.0
+
+  The config format is the same as `loaders`, but `postLoaders` are applied after the default loaders. You can use this to post-process language blocks. However note that this is a bit more complicated:
+
+  - For `html`, the result returned by the default loader will be compiled JavaScript render function code.
+
+  - For `css`, the result will be returned by `vue-style-loader` which isn't particularly useful in most cases. Using a postcss plugin will be a better option.
+
 ### postcss
 
 - type: `Array` or `Function` or `Object`
-- `Object` format only supported in ^8.5.0
 
   Specify custom PostCSS plugins to be applied to CSS inside `*.vue` files. If using a function, the function will called using the same loader context and should return an Array of plugins.
 

From f4b7f4eeedc47ae97bb46ffc2396be188d8d643f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Feb 2017 13:33:02 -0500
Subject: [PATCH 495/877] 10.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4621cb09c..f302e6896 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.2.4",
+  "version": "10.3.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 3521a9c11c516136a80f999c2ce7febe7f7e814b Mon Sep 17 00:00:00 2001
From: Alexander <Alex-Sokolov@users.noreply.github.com>
Date: Mon, 6 Feb 2017 09:44:39 +0300
Subject: [PATCH 496/877] - Fix typo (#623)

---
 docs/en/configurations/asset-url.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/asset-url.md b/docs/en/configurations/asset-url.md
index 938e258fb..eeceef709 100644
--- a/docs/en/configurations/asset-url.md
+++ b/docs/en/configurations/asset-url.md
@@ -18,6 +18,6 @@ Because `.png` is not a JavaScript file, you will need to configure Webpack to u
 
 The benefits of all this are:
 
-1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreoever, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, Webpack will auto-rewrite the file paths into correct URLs in the bundled output.
+1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreover, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, Webpack will auto-rewrite the file paths into correct URLs in the bundled output.
 
 2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.

From 53df458e811781ac98c5bbe3358985ecfe4cc788 Mon Sep 17 00:00:00 2001
From: Mark Tran <mark.tran@gmail.com>
Date: Mon, 6 Feb 2017 13:44:56 +0700
Subject: [PATCH 497/877] fix typo (#616)

---
 docs/en/workflow/linting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index a88e55be2..63bab5e39 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -2,7 +2,7 @@
 
 You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
 
-You will also need the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) with supports extracting and linting the JavaScript inside `*.vue` files.
+You will also need the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) which supports extracting and linting the JavaScript inside `*.vue` files.
 
 Make sure to include the plugin in your ESLint config:
 

From 65a0845c5239a2efe3395d80874a5d9e7aa6d682 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 6 Feb 2017 12:28:28 -0500
Subject: [PATCH 498/877] silence bluebird warning (close #625)

---
 lib/style-rewriter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 814516e15..a124f3d18 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -97,6 +97,7 @@ module.exports = function (css, map) {
     .then(function (result) {
       var map = result.map && result.map.toJSON()
       cb(null, result.css, map)
+      return null // silence bluebird warning
     })
     .catch(function (e) {
       console.log(e)

From 9b65ed19f3c3f43c7b51b2557fe6677566404c83 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 6 Feb 2017 16:55:39 -0500
Subject: [PATCH 499/877] support loading postcss config file (close #585)

---
 lib/style-rewriter.js | 117 ++++++++++++++++++++------------------
 package.json          |   1 +
 test/test.js          | 128 +++++++++++++++++++++++-------------------
 3 files changed, 135 insertions(+), 111 deletions(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index a124f3d18..228f4a8a8 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,6 +1,7 @@
 var postcss = require('postcss')
-var selectorParser = require('postcss-selector-parser')
 var loaderUtils = require('loader-utils')
+var loadPostcssConfig = require('postcss-load-config')
+var selectorParser = require('postcss-selector-parser')
 
 var addId = postcss.plugin('add-id', function (opts) {
   return function (root) {
@@ -42,67 +43,75 @@ module.exports = function (css, map) {
   var cb = this.async()
 
   var query = loaderUtils.parseQuery(this.query)
-  var options = this.options.__vueOptions__
-  var postcssOptions = options.postcss
+  var vueOptions = this.options.__vueOptions__
 
-  // postcss plugins
-  var plugins
-  if (Array.isArray(postcssOptions)) {
-    plugins = postcssOptions
-  } else if (typeof postcssOptions === 'function') {
-    plugins = postcssOptions.call(this, this)
-  } else if (isObject(postcssOptions) && postcssOptions.plugins) {
-    plugins = postcssOptions.plugins
-  }
-  plugins = [trim].concat(plugins || [])
+  // use the same config loading interface as postcss-loader
+  loadPostcssConfig({ webpack: this }).catch(() => {
+    // postcss-load-config throws error when no config file is found,
+    // but for us it's optional.
+  }).then(config => {
+    var plugins
+    var options
 
-  // scoped css
-  if (query.scoped) {
-    plugins.push(addId({ id: query.id }))
-  }
+    // inline postcss options for vue-loader
+    var rawInlineOptions = vueOptions.postcss
+    if (typeof rawInlineOptions === 'function') {
+      rawInlineOptions = rawInlineOptions.call(this, this)
+    }
+    if (Array.isArray(rawInlineOptions)) {
+      plugins = rawInlineOptions
+    } else if (isObject(rawInlineOptions)) {
+      plugins = rawInlineOptions.plugins
+      options = rawInlineOptions.options
+    }
 
-  // postcss options, for source maps
-  var file = this.resourcePath
-  var opts
-  opts = {
-    from: file,
-    to: file,
-    map: false
-  }
-  if (
-    this.sourceMap &&
-    !this.minimize &&
-    options.cssSourceMap !== false &&
-    process.env.NODE_ENV !== 'production' &&
-    !(isObject(postcssOptions) && postcssOptions.options && postcssOptions.map)
-  ) {
-    opts.map = {
-      inline: false,
-      annotation: false,
-      prev: map
+    plugins = [trim].concat(plugins || [])
+    options = Object.assign({
+      to: this.resourcePath,
+      from: this.resourcePath,
+      map: false
+    }, options)
+
+    // merge postcss config file
+    if (config && config.plugins) {
+      plugins = plugins.concat(config.plugins)
+    }
+    if (config && config.options) {
+      options = Object.assign({}, config.options, options)
+    }
+
+    // add plugin for vue-loader scoped css rewrite
+    if (query.scoped) {
+      plugins.push(addId({ id: query.id }))
     }
-  }
 
-  // postcss options from configuration
-  if (isObject(postcssOptions) && postcssOptions.options) {
-    for (var option in postcssOptions.options) {
-      if (!opts.hasOwnProperty(option)) {
-        opts[option] = postcssOptions.options[option]
+    // source map
+    if (
+      this.sourceMap &&
+      !this.minimize &&
+      vueOptions.cssSourceMap !== false &&
+      process.env.NODE_ENV !== 'production' &&
+      !options.map
+    ) {
+      options.map = {
+        inline: false,
+        annotation: false,
+        prev: map
       }
     }
-  }
 
-  postcss(plugins)
-    .process(css, opts)
-    .then(function (result) {
-      var map = result.map && result.map.toJSON()
-      cb(null, result.css, map)
-      return null // silence bluebird warning
-    })
-    .catch(function (e) {
-      console.log(e)
-      cb(e)
-    })
+    postcss(plugins)
+      .process(css, options)
+      .then(function (result) {
+        var map = result.map && result.map.toJSON()
+        cb(null, result.css, map)
+        return null // silence bluebird warning
+      })
+      .catch(function (e) {
+        console.log(e)
+        cb(e)
+      })
+  })
 }
 
 function isObject (val) {
diff --git a/package.json b/package.json
index f302e6896..615062f12 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "loader-utils": "^0.2.10",
     "lru-cache": "^4.0.1",
     "postcss": "^5.0.10",
+    "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.1",
diff --git a/test/test.js b/test/test.js
index 2379ce84f..579789a83 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,5 +1,6 @@
 process.env.VUE_LOADER_TEST = true
 
+var fs = require('fs')
 var path = require('path')
 var jsdom = require('jsdom')
 var webpack = require('webpack')
@@ -44,10 +45,10 @@ function bundle (options, cb) {
 
   var webpackCompiler = webpack(config)
   webpackCompiler.outputFileSystem = mfs
-  webpackCompiler.run(function (err, stats) {
+  webpackCompiler.run((err, stats) => {
     expect(err).to.be.null
     if (stats.compilation.errors.length) {
-      stats.compilation.errors.forEach(function (err) {
+      stats.compilation.errors.forEach((err) => {
         console.error(err.message)
       })
     }
@@ -62,11 +63,11 @@ function bundle (options, cb) {
 }
 
 function test (options, assert) {
-  bundle(options, function (code, warnings) {
+  bundle(options, (code, warnings) => {
     jsdom.env({
       html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
       src: [code],
-      done: function (err, window) {
+      done: (err, window) => {
         if (err) {
           console.log(err[0].data.error.stack)
           expect(err).to.be.null
@@ -110,10 +111,10 @@ function interopDefault (module) {
 }
 
 describe('vue-loader', function () {
-  it('basic', function (done) {
+  it('basic', done => {
     test({
       entry: './test/fixtures/basic.vue'
-    }, function (window, module, rawModule) {
+    }, (window, module, rawModule) => {
       var vnode = mockRender(module, {
         msg: 'hi'
       })
@@ -130,19 +131,19 @@ describe('vue-loader', function () {
     })
   })
 
-  it('expose filename', function (done) {
+  it('expose filename', done => {
     test({
       entry: './test/fixtures/basic.vue'
-    }, function (window, module, rawModule) {
+    }, (window, module, rawModule) => {
       expect(module.__file).to.equal(path.resolve(__dirname, './fixtures/basic.vue'))
       done()
     })
   })
 
-  it('pre-processors', function (done) {
+  it('pre-processors', done => {
     test({
       entry: './test/fixtures/pre.vue'
-    }, function (window, module) {
+    }, (window, module) => {
       var vnode = mockRender(module)
       // div
       //   h1 This is the app
@@ -159,10 +160,10 @@ describe('vue-loader', function () {
     })
   })
 
-  it('scoped style', function (done) {
+  it('scoped style', done => {
     test({
       entry: './test/fixtures/scoped-css.vue'
-    }, function (window, module) {
+    }, (window, module) => {
       var id = 'data-v-' + hash('vue-loader/test/fixtures/scoped-css.vue')
       expect(module._scopeId).to.equal(id)
 
@@ -191,10 +192,10 @@ describe('vue-loader', function () {
     })
   })
 
-  it('style import', function (done) {
+  it('style import', done => {
     test({
       entry: './test/fixtures/style-import.vue'
-    }, function (window) {
+    }, (window) => {
       var styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
       // import with scoped
@@ -204,10 +205,10 @@ describe('vue-loader', function () {
     })
   })
 
-  it('template import', function (done) {
+  it('template import', done => {
     test({
       entry: './test/fixtures/template-import.vue'
-    }, function (window, module) {
+    }, (window, module) => {
       var vnode = mockRender(module)
       // '<div><h1>hello</h1></div>'
       expect(vnode.children[0].tag).to.equal('h1')
@@ -216,26 +217,26 @@ describe('vue-loader', function () {
     })
   })
 
-  it('script import', function (done) {
+  it('script import', done => {
     test({
       entry: './test/fixtures/script-import.vue'
-    }, function (window, module) {
+    }, (window, module) => {
       expect(module.data().msg).to.contain('Hello from Component A!')
       done()
     })
   })
 
-  it('source map', function (done) {
+  it('source map', done => {
     bundle({
       entry: './test/fixtures/basic.vue',
       devtool: '#source-map'
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       var map = mfs.readFileSync('/test.build.js.map').toString()
       var smc = new SourceMapConsumer(JSON.parse(map))
       var line
       var col
       var targetRE = /^\s+msg: 'Hello from Component A!'/
-      code.split(/\r?\n/g).some(function (l, i) {
+      code.split(/\r?\n/g).some((l, i) => {
         if (targetRE.test(l)) {
           line = i + 1
           col = 0
@@ -252,10 +253,10 @@ describe('vue-loader', function () {
     })
   })
 
-  it('media-query', function (done) {
+  it('media-query', done => {
     test({
       entry: './test/fixtures/media-query.vue'
-    }, function (window) {
+    }, (window) => {
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       var id = 'data-v-' + hash('vue-loader/test/fixtures/media-query.vue')
@@ -264,7 +265,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('extract CSS', function (done) {
+  it('extract CSS', done => {
     bundle({
       entry: './test/fixtures/extract-css.vue',
       vue: {
@@ -276,7 +277,7 @@ describe('vue-loader', function () {
       plugins: [
         new ExtractTextPlugin('test.output.css')
       ]
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       var css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
       expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
@@ -284,10 +285,10 @@ describe('vue-loader', function () {
     })
   })
 
-  it('dependency injection', function (done) {
+  it('dependency injection', done => {
     test({
       entry: './test/fixtures/inject.js'
-    }, function (window) {
+    }, (window) => {
       // console.log(window.injector.toString())
       var module = interopDefault(window.injector({
         './service': {
@@ -303,7 +304,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('translates relative URLs and respects resolve alias', function (done) {
+  it('translates relative URLs and respects resolve alias', done => {
     test({
       entry: './test/fixtures/resolve.vue',
       resolve: {
@@ -317,7 +318,7 @@ describe('vue-loader', function () {
           { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
         ]
       }
-    }, function (window, module) {
+    }, (window, module) => {
       var vnode = mockRender(module)
       // <div>
       //   <img src="logo.c9e00e.png">
@@ -335,7 +336,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('transformToRequire option', function (done) {
+  it('transformToRequire option', done => {
     test({
       entry: './test/fixtures/transform.vue',
       module: {
@@ -347,7 +348,7 @@ describe('vue-loader', function () {
           }
         ]
       }
-    }, function (window, module) {
+    }, (window, module) => {
       function includeDataURL (s) {
         return !!s.match(/\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*/i)
       }
@@ -363,7 +364,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('postcss options', function (done) {
+  it('postcss options', done => {
     test({
       entry: './test/fixtures/postcss.vue',
       vue: {
@@ -373,18 +374,31 @@ describe('vue-loader', function () {
           }
         }
       }
-    }, function (window) {
+    }, (window) => {
+      var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      done()
+    })
+  })
+
+  it('load postcss config file', done => {
+    fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
+    test({
+      entry: './test/fixtures/postcss.vue'
+    }, (window) => {
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      fs.unlinkSync('.postcssrc')
       done()
     })
   })
 
-  it('transpile ES2015 features in template', function (done) {
+  it('transpile ES2015 features in template', done => {
     test({
       entry: './test/fixtures/es2015.vue'
-    }, function (window, module) {
+    }, (window, module) => {
       var vnode = mockRender(module, {
         a: 'hello',
         b: true
@@ -397,10 +411,10 @@ describe('vue-loader', function () {
     })
   })
 
-  it('allows to export extended constructor', function (done) {
+  it('allows to export extended constructor', done => {
     test({
       entry: './test/fixtures/extend.vue'
-    }, function (window, Module) {
+    }, (window, Module) => {
       // extend.vue should export Vue constructor
       var vnode = mockRender(Module.options, {
         msg: 'success'
@@ -412,13 +426,13 @@ describe('vue-loader', function () {
     })
   })
 
-  it('support es compatible modules', function (done) {
+  it('support es compatible modules', done => {
     test({
       entry: './test/fixtures/basic.vue',
       vue: {
         esModule: true
       }
-    }, function (window, module, rawModule) {
+    }, (window, module, rawModule) => {
       expect(rawModule.__esModule).to.equal(true)
       var vnode = mockRender(rawModule.default, {
         msg: 'hi'
@@ -432,7 +446,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('css-modules', function (done) {
+  it('css-modules', done => {
     function testWithIdent (localIdentName, regexToMatch, cb) {
       test({
         entry: './test/fixtures/css-modules.vue',
@@ -441,7 +455,7 @@ describe('vue-loader', function () {
             localIdentName: localIdentName
           }
         }
-      }, function (window) {
+      }, (window) => {
         var module = window.vueModule
 
         // get local class name
@@ -449,7 +463,7 @@ describe('vue-loader', function () {
         expect(className).to.match(regexToMatch)
 
         // class name in style
-        var style = [].slice.call(window.document.querySelectorAll('style')).map(function (style) {
+        var style = [].slice.call(window.document.querySelectorAll('style')).map((style) => {
           return style.textContent
         }).join('\n')
         style = normalizeNewline(style)
@@ -472,7 +486,7 @@ describe('vue-loader', function () {
       })
     }
     // default localIdentName
-    testWithIdent(undefined, /^\w{23}/, function () {
+    testWithIdent(undefined, /^\w{23}/, () => {
       // specified localIdentName
       var ident = '[path][name]---[local]---[hash:base64:5]'
       var regex = /^test-fixtures-css-modules---red---\w{5}/
@@ -480,14 +494,14 @@ describe('vue-loader', function () {
     })
   })
 
-  it('css-modules in SSR', function (done) {
+  it('css-modules in SSR', done => {
     bundle({
       entry: './test/fixtures/css-modules.vue',
       target: 'node',
       output: Object.assign({}, globalConfig.output, {
         libraryTarget: 'commonjs2'
       })
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
       function requireFromString(src, filename) {
         var Module = module.constructor;
@@ -532,7 +546,7 @@ describe('vue-loader', function () {
           { test: /\.vue$/, loader: loaderPath + '!' + mockLoaderPath }
         ]
       }
-    }, function (window, module) {
+    }, (window, module) => {
       expect(module.data().msg).to.equal('Changed!')
       done()
     })
@@ -570,7 +584,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('extract custom blocks to a separate file', function (done) {
+  it('extract custom blocks to a separate file', done => {
     bundle({
       entry: './test/fixtures/custom-language.vue',
       vue: {
@@ -581,7 +595,7 @@ describe('vue-loader', function () {
       plugins: [
         new ExtractTextPlugin('doc.md')
       ]
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       var unitTest = mfs.readFileSync('/doc.md').toString()
       unitTest = normalizeNewline(unitTest)
       expect(unitTest).to.contain('This is example documentation for a component.')
@@ -589,7 +603,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('add custom blocks to the webpack output', function (done) {
+  it('add custom blocks to the webpack output', done => {
     bundle({
       entry: './test/fixtures/custom-language.vue',
       vue: {
@@ -597,13 +611,13 @@ describe('vue-loader', function () {
           'unit-test': 'babel-loader'
         }
       }
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
     })
   })
 
-  it('custom blocks work with src imports', function (done) {
+  it('custom blocks work with src imports', done => {
     bundle({
       entry: './test/fixtures/custom-import.vue',
       vue: {
@@ -611,22 +625,22 @@ describe('vue-loader', function () {
           'unit-test': 'babel-loader'
         }
       }
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
     })
   })
 
-  it('custom blocks can be ignored', function (done) {
+  it('custom blocks can be ignored', done => {
     bundle({
       entry: './test/fixtures/custom-language.vue'
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
     })
   })
 
-  it('passes attributes as options to the loader', function (done) {
+  it('passes attributes as options to the loader', done => {
     bundle({
       entry: './test/fixtures/custom-options.vue',
       vue: {
@@ -638,7 +652,7 @@ describe('vue-loader', function () {
         new webpack.LoaderOptionsPlugin({
           options: {
             skeletonLoader: {
-              procedure: function(content, sourceMap, callback, options) {
+              procedure: (content, sourceMap, callback, options) => {
                 expect(options.foo).to.equal('bar');
                 expect(options.opt2).to.equal('value2');
 
@@ -649,7 +663,7 @@ describe('vue-loader', function () {
           }
         })
       ]
-    }, function (code, warnings) {
+    }, (code, warnings) => {
       expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
     })

From 9e06970c4bf981c5a08c727f776a8b30dd98418f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 6 Feb 2017 17:06:33 -0500
Subject: [PATCH 500/877] docs for postcss config

---
 docs/en/features/postcss.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index cb5c9e531..e7417535a 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -2,6 +2,20 @@
 
 Any CSS output processed by `vue-loader` is piped through [PostCSS](https://github.com/postcss/postcss) for scoped CSS rewriting. You can also add custom PostCSS plugins to the process, for example [autoprefixer](https://github.com/postcss/autoprefixer) or [CSSNext](http://cssnext.io/).
 
+## Using a Config File
+
+Starting in 11.0 `vue-loader` supports auto-loading the same PostCss config files supported by `postcss-loader`:
+
+- `postcss.config.js`
+- `.postcssrc`
+- `postcss` field in `package.json`
+
+Using a config file allows you to share the same config between your normal CSS files processed by `postcss-loader` and the CSS inside `*.vue` files, and is recommended.
+
+## Inline Options
+
+Alternatively, you can specify postcss config specifically for `*.vue` files using the `postcss` option for `vue-loader`.
+
 Example usage in Webpack 1.x:
 
 ``` js

From c1778ff9888b77f5a6b1f49e5fa29858ebbb812a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 6 Feb 2017 19:51:24 -0500
Subject: [PATCH 501/877] tweak parser warning output

---
 lib/template-compiler.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 28efd7271..0d8aabdda 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -64,10 +64,10 @@ module.exports = function (html) {
   }, defaultCompileOptions))
   var code
   if (compiled.errors.length) {
-    var self = this
-    compiled.errors.forEach(function (err) {
-      self.emitError('\n  Vue template syntax error:\n\n  ' + err + '\n')
-    })
+    this.emitError(
+      `\n  Error compiling template:\n${pad(html)}\n` +
+      compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
+    )
     code = 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
     var bubleOptions = vueOptions.buble
@@ -104,3 +104,7 @@ function toFunction (code) {
     indent_size: 2 // eslint-disable-line camelcase
   }) + '}'
 }
+
+function pad (html) {
+  return html.split(/\r?\n/).map(line => `  ${line}`).join('\n')
+}

From 375c0c73d00aed33b707af5d1c8328e8e8511085 Mon Sep 17 00:00:00 2001
From: HelloYou <helloyou2012@yeah.net>
Date: Thu, 9 Feb 2017 10:15:07 +0800
Subject: [PATCH 502/877] `extract-text-webpack-plugin@>=2` api changed (#632)

---
 docs/en/configurations/extract-css.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index 750f65a9c..952211b51 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -22,8 +22,8 @@ module.exports = {
         options: {
           loaders: {
             css: ExtractTextPlugin.extract({
-              loader: 'css-loader',
-              fallbackLoader: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+              use: 'css-loader',
+              fallback: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
             })
           }
         }

From e3390f8ce3e142afd876152765c0758e56a223bf Mon Sep 17 00:00:00 2001
From: Alexander <Alex-Sokolov@users.noreply.github.com>
Date: Fri, 10 Feb 2017 06:35:49 +0300
Subject: [PATCH 503/877] Update extract-css.md (#633)

https://github.com/vuejs/vue-loader/pull/632
---
 docs/kr/configurations/extract-css.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/kr/configurations/extract-css.md b/docs/kr/configurations/extract-css.md
index 6e0598daa..8d6793896 100644
--- a/docs/kr/configurations/extract-css.md
+++ b/docs/kr/configurations/extract-css.md
@@ -55,8 +55,8 @@ module.exports = {
         options: {
           loaders: {
             css: ExtractTextPlugin.extract({
-              loader: 'css-loader',
-              fallbackLoader: 'vue-style-loader' // <- 이것은 vue-loader의 의존성이므로, npm3를 사용하는 경우에는 명시적으로 설치할 필요가 없습니다.
+              use: 'css-loader',
+              fallback: 'vue-style-loader' // <- 이것은 vue-loader의 의존성이므로, npm3를 사용하는 경우에는 명시적으로 설치할 필요가 없습니다.
             })
           }
         }

From 892aa3d4072919e8d33a30ab03390a002989bbcc Mon Sep 17 00:00:00 2001
From: David Bazile <dbazile@users.noreply.github.com>
Date: Fri, 10 Feb 2017 20:38:31 -0500
Subject: [PATCH 504/877] Fix typo (#639)

---
 docs/en/workflow/linting.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index 63bab5e39..2971c1232 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -2,7 +2,7 @@
 
 You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
 
-You will also need the [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) which supports extracting and linting the JavaScript inside `*.vue` files.
+You will also need the [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) which supports extracting and linting the JavaScript inside `*.vue` files.
 
 Make sure to include the plugin in your ESLint config:
 

From 566807008e0556474da5974361b93ef2473961a3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 11 Feb 2017 13:47:38 -0500
Subject: [PATCH 505/877] improve stringifyLoaders to handle objects

---
 lib/loader.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index dbb404a63..6c8ab922a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -179,9 +179,11 @@ module.exports = function (content) {
     var loader = loaders[lang]
     var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
     var injectString = (type === 'script' && query.inject) ? 'inject-loader!' : ''
-    if (loader !== undefined) {
+    if (loader != null) {
       if (Array.isArray(loader)) {
         loader = stringifyLoaders(loader)
+      } else if (typeof loader === 'object') {
+        loader = stringifyLoaders([loader])
       }
       // add css modules
       if (type === 'styles') {

From 0afde0e4e6250a03f01f2c3374a94558b6e17dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Mon, 13 Feb 2017 13:07:59 -0200
Subject: [PATCH 506/877] Translation into portuguese. (#629)

---
 docs/LANGS.md                            |   3 +-
 docs/pt/README.md                        |  37 ++++++
 docs/pt/SUMMARY.md                       |  20 +++
 docs/pt/configurations/advanced.md       |  56 ++++++++
 docs/pt/configurations/asset-url.md      |  23 ++++
 docs/pt/configurations/extract-css.md    |  70 ++++++++++
 docs/pt/configurations/pre-processors.md |  81 ++++++++++++
 docs/pt/features/css-modules.md          | 117 +++++++++++++++++
 docs/pt/features/es2015.md               |  65 ++++++++++
 docs/pt/features/hot-reload.md           |   7 +
 docs/pt/features/postcss.md              |  54 ++++++++
 docs/pt/features/scoped-css.md           |  51 ++++++++
 docs/pt/options.md                       | 157 +++++++++++++++++++++++
 docs/pt/start/setup.md                   |  13 ++
 docs/pt/start/spec.md                    |  92 +++++++++++++
 docs/pt/workflow/linting.md              |  93 ++++++++++++++
 docs/pt/workflow/production.md           |  39 ++++++
 docs/pt/workflow/testing-with-mocks.md   |  70 ++++++++++
 docs/pt/workflow/testing.md              | 101 +++++++++++++++
 19 files changed, 1148 insertions(+), 1 deletion(-)
 create mode 100644 docs/pt/README.md
 create mode 100644 docs/pt/SUMMARY.md
 create mode 100644 docs/pt/configurations/advanced.md
 create mode 100644 docs/pt/configurations/asset-url.md
 create mode 100644 docs/pt/configurations/extract-css.md
 create mode 100644 docs/pt/configurations/pre-processors.md
 create mode 100644 docs/pt/features/css-modules.md
 create mode 100644 docs/pt/features/es2015.md
 create mode 100644 docs/pt/features/hot-reload.md
 create mode 100644 docs/pt/features/postcss.md
 create mode 100644 docs/pt/features/scoped-css.md
 create mode 100644 docs/pt/options.md
 create mode 100644 docs/pt/start/setup.md
 create mode 100644 docs/pt/start/spec.md
 create mode 100644 docs/pt/workflow/linting.md
 create mode 100644 docs/pt/workflow/production.md
 create mode 100644 docs/pt/workflow/testing-with-mocks.md
 create mode 100644 docs/pt/workflow/testing.md

diff --git a/docs/LANGS.md b/docs/LANGS.md
index 42957cdb2..60a72c858 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1,2 +1,3 @@
 * [English](en/)
-* [한국어](kr/)
+* [Português](pt/)
+* [한국어](kr/)
\ No newline at end of file
diff --git a/docs/pt/README.md b/docs/pt/README.md
new file mode 100644
index 000000000..44b29a666
--- /dev/null
+++ b/docs/pt/README.md
@@ -0,0 +1,37 @@
+# Introdução
+
+### O que é `vue-loader`?
+
+`vue-loader` é um carregador para Webpack que pode transformar componentes Vue no seguinte formato em um módulo JavaScript simples:
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+Existem muitas características interessantes fornecidos por `vue-loader`:
+
+* ES2015 habilitado por padrão;
+* Permite usar outros carregadores Webpack para cada pedaço de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
+* Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores Webpack;
+* Pode simular escopo CSS para cada componente;
+* Suporta componente hot-reloading durante desenvolvimento;
+
+Em poucas palavras, a combinação de Webpack e `vue-loader` dá-lhe um moderno, flexível e extremamente poderoso fluxo de trabalho front-end para criação de aplicações Vue.js.
+
+### O que é Webpack?
+
+Se você já está familiarizado com Webpack, sinta-se livre para pular está explicação. Mas para aqueles de vocês que são novos com Webpack, aqui está uma pequena introdução:
+
+[Webpack](http://webpack.github.io/) é um empacotador de módulo. Ele carrega um grupo de arquivos tratando cada um como um módulo, descobrindo as dependências entre eles e empacotando em ativos estáticos prontos para implantação.
+
+![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+
+Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. Eles não podem rodar diretamente dentro do navegador, então precisamos empacotá-los dentro de um único arquivo que pode ser incluído através de uma tag `<script>`. Webpack pode seguir as dependências das chamadas  `require()` e fazer isso para nós.
+
+Mas Webpack pode fazer mais do que isso. Com "carregadores", podemos ensinar Webpack a transformar todos os tipos de arquivos dá maneira que quisermos antes da saída final do pacote. Alguns exemplos incluem:
+
+* Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
+* Opcionalmente você pode canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
+* Transpilar modelos Jade em HTML simples em seguida colocao-o como uma sequência de string JavaScript;
+* Traspilar arquivos SASS em CSS simples, em seguida os converte em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
+* Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5; 
+
+Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `Vue-loader`.
\ No newline at end of file
diff --git a/docs/pt/SUMMARY.md b/docs/pt/SUMMARY.md
new file mode 100644
index 000000000..3d4684033
--- /dev/null
+++ b/docs/pt/SUMMARY.md
@@ -0,0 +1,20 @@
+* Começando
+  * [Especificação do Vue Component](start/spec.md)
+  * [Configurando um projeto](start/setup.md)
+* Características
+  * [ES2015](features/es2015.md)
+  * [CSS com Escopo](features/scoped-css.md)
+  * [Módulos CSS](features/css-modules.md)
+  * [PostCSS](features/postcss.md)
+  * [Hot Reload](features/hot-reload.md)
+* Configurações
+  * [Pré-Processadores](configurations/pre-processors.md)
+  * [Manipulação de URls de ativos](configurations/asset-url.md)
+  * [Configuração avançado do loader](configurations/advanced.md)
+  * [Extraindo arquivos css](configurations/extract-css.md)
+* Fluxo de trabalho
+  * [Produção](workflow/production.md)
+  * [Análise estática do código \(Linting\)](workflow/linting.md)
+  * [Testando](workflow/testing.md)
+  * [Testando com Mocks](workflow/testing-with-mocks.md)
+* [Referência de opções](options.md)
\ No newline at end of file
diff --git a/docs/pt/configurations/advanced.md b/docs/pt/configurations/advanced.md
new file mode 100644
index 000000000..2221ef517
--- /dev/null
+++ b/docs/pt/configurations/advanced.md
@@ -0,0 +1,56 @@
+# Configurações avançadas do carregador
+
+Às vezes você pode querer aplicar um carregador de string a uma linguagem em vez de deixar `vue-loader` responsável. Ou você pode simplesmente querer sobrescrever a configuração embutida do carregador para a linguagem padrão. Para fazer isso, adicione um bloco `vue` em seu arquivo de configuração Webpack, e especifique a opção `loaders`.
+
+### Webpack 1.x
+
+```js
+// webpack.config.js
+module.exports = {
+  // outras opções...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // configurações vue-loader 
+  vue: {
+    // ... outras opções vue
+    loaders: {
+      // carrega todo <script> sem o atributo "lang" com coffee-loader
+      js: 'coffee',
+      // carrega <template> diretamente como string HTML, 
+      // canalizá-lo atravé de vue-html-loader primeiro
+      html: 'raw'
+    }
+  }
+}
+```
+
+### Webpack 2.x \(^2.1.0-beta.25\)
+
+```js
+module.exports = {
+  // outras opções...
+  module: {
+    // module.rules é o mesmo que module.loaders em 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        // opções de vue-loader
+        options: {
+          loaders: {
+            // ...
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+Um uso mais prático das configurações avançadas do carregador é [extrair o CSS do componente em um único arquivo](./extract-css.md).
\ No newline at end of file
diff --git a/docs/pt/configurations/asset-url.md b/docs/pt/configurations/asset-url.md
new file mode 100644
index 000000000..f9a798dc1
--- /dev/null
+++ b/docs/pt/configurations/asset-url.md
@@ -0,0 +1,23 @@
+# Manipulação de recursos de URL
+
+Por padrão, `vue-loader` automaticamente processa seus arquivos de estilos [css-loader](https://github.com/webpack/css-loader) e seus templates com o compilador de template Vue. Neste processo de compilação, todos os recursos de URLs como `<img src="...">`, `background: url(...)` e CSS `@import` são **resolvidos como dependência de módulo**.
+
+Por exemplo, `url(./image.png)` irá ser traduzido em `require('./image.png')`, e
+
+```html
+<img src="../image.png">
+```
+
+será compilado em:
+
+```js
+createElement('img', { attrs: { src: require('../image.png') }})
+```
+
+Como `.png` não é um arquivo JavaScript, você precisará configurar o Webpack para usar [file-loader](https://github.com/webpack/file-loader) ou [url-loader](https://github.com/webpack/url-loader) para lidar com eles. O projeto estruturado com `vue-cli` também configurou isso pra você.
+
+Os benefícios de tudo isso são:
+
+1. `file-loader` permite a você configurar onde copiar e colar os arquivos de ativos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos **`.vue`** e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, Webpack irá automaticamente escrever o caminho dos arquivos em URLs corretas na saída empacotada.
+
+2. `url-loader` permite a você colocar condicionalmente em linha um arquivo de dados URL base64 se eles forem menor que um determinado limite. Se o arquivo for maior do que o limite ele automaticamente será jogado para `file-loader`.
\ No newline at end of file
diff --git a/docs/pt/configurations/extract-css.md b/docs/pt/configurations/extract-css.md
new file mode 100644
index 000000000..b64f9ec47
--- /dev/null
+++ b/docs/pt/configurations/extract-css.md
@@ -0,0 +1,70 @@
+# Extraindo CSS em um único arquivo
+
+Exemplo de configuração para extrair todo CSS processado de todos componentes Vue em um único arquivo CSS:
+
+### Webpack 1.x
+
+```bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+```js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // outras opções...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // você também pode incluir <style lang="less"> ou outras linguagens
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+### Webpack 2.x \(^2.1.0-beta.25\)
+
+```bash
+npm install extract-text-webpack-plugin@2.x --save-dev
+```
+
+```js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // outras opções...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              loader: 'css-loader',
+              fallbackLoader: 'vue-style-loader' // <- isto é uma dependência de vue-loader, então não é necessário instalar explicitamente se estiver usando npm3
+            })
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
\ No newline at end of file
diff --git a/docs/pt/configurations/pre-processors.md b/docs/pt/configurations/pre-processors.md
new file mode 100644
index 000000000..77fe43d63
--- /dev/null
+++ b/docs/pt/configurations/pre-processors.md
@@ -0,0 +1,81 @@
+# Unsando Pré-Processadores
+
+No Webpack, todos os pré-processadores precisam ser aplicados com um carregador \(loader\) correspondente. `vue-loader` permite que você use outros carregadores para processar parte do seu componente Vue. Ele irá automaticamente indicar os carregadores apropriados para usar a partir do atributo `lang` de um bloco de linguagem.
+
+### CSS
+
+Por exemplo, vamos compilar nossa tag `<style>` com SASS:
+
+```bash
+npm install sass-loader node-sass --save-dev
+```
+
+```html
+<style lang="sass">
+  /* Escreva sass aqui */
+</style>
+```
+
+Por baixo do capô, o conteúdo de texto dentro da tag `<style>` será primeiramente compilado por `sass-loader` antes de ser passado para processadores posteriores.
+
+#### Advertências de sass-loader
+
+Ao contrário do que seu nome indica, [sass-loader](https://github.com/jtangelder/sass-loader) analisa a sintaxe SCSS por padrão. Se você atualmente deseja usar a indentação da sintaxe SASS, você tem que configurar as opções de vue-loader para sass-loader adequadamente.
+
+```javascript
+{
+  test: /\.vue$/,
+  loader: 'vue-loader',
+  options: {
+    loaders: {
+      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
+    }
+  }
+}
+```
+
+Consulte a seção de [configurações avançadas do carregador](./advanced.md)  para obter mais informações sobre como configurar vue-loader.
+
+### JavaScript
+
+Todos JavaScript dentro dos componentes Vue são processados por `babel-loader` por padrão. Mas você pode naturalmente mudar isto:
+
+```bash
+npm install coffee-loader --save-dev
+```
+
+```html
+<script lang="coffee">
+  # Escreva coffeescript!
+</script>
+```
+
+### Templates
+
+O processamento de templates é um pouco diferente, porque a maioria dos carregadores de template do Webpack, como `pug-loader` retornam uma função de template em vez de uma sequência de caracteres HTML compilado. Em vez de usar `pug-loader`, podemos simplesmente instalar o `pug` original.
+
+```bash
+npm install pug --save-dev
+```
+
+```html
+<template lang="pug">
+div
+  h1 Olá Mundo!
+</template>
+```
+
+> **Importante:** Se você está usando `vue-loader@<8.2.0`, você também precisa instalar `template-html-loader`.
+
+### Solicitação de Carregamento em Linha
+
+Você pode usar \[solicitação de carregador Webpack\] no atributo `lang`:
+
+```html
+<style lang="sass?outputStyle=expanded">
+  /* use sass aqui com saída expandida */
+</style>
+```
+
+Contudo, observe que isso faz com que seu componente Vue se torne especifico para Webpack e não compatível com Browserify e [vueify](https://github.com/vuejs/vueify). **Se você pretende enviar seu componente Vue como um componente reutilizável para terceiros, evite usar está sintaxe**.
\ No newline at end of file
diff --git a/docs/pt/features/css-modules.md b/docs/pt/features/css-modules.md
new file mode 100644
index 000000000..c1fbba6bb
--- /dev/null
+++ b/docs/pt/features/css-modules.md
@@ -0,0 +1,117 @@
+# Módulos CSS
+
+> Requer versão ^9.8.0
+
+[Módulos CSS](https://github.com/css-modules/css-modules) é um sistema popula para modularização e composição de CSS. `vue-loader` fornece integração de alto nível com módulos CSS como uma alternativa para simular escopo CSS.
+
+### Uso
+
+Basta adicionar o atributo `module` ao seu `<style>`;
+
+```html
+<style module>
+  .red {
+    color: red;
+  }
+  .bold {
+    font-weight: bold;
+  }
+</style>
+```
+
+Isto ativará o modo Módulo CSS para `css-loader`, e a classe resultante que identifica o objeto será injetada dentro do componente como uma propriedade computada com o nome `$style`. Você pode usá-lo em seus templates com uma ligação de classe dinâmica.
+
+```html
+<template>
+  <p :class="$style.red">
+    Isto deve ser vermelho
+  </p>
+</template>
+```
+
+Uma vez que a propriedade é computada, ela também funciona com a sintaxe object/array de `:class`:
+
+```html
+<template>
+  <div>
+    <p :class="{ [$style.red]: isRed }">
+      Eu sou vermelho?
+    </p>
+    <p :class="[$style.red, $style.bold]">
+      Vermelho e negrito
+    </p>
+  </div>
+</template>
+```
+
+E você também pode acessá-la com JavaScript:
+
+```html
+<script>
+  export default {
+    created () {
+      console.log(this.$style.red)
+      // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
+      // identificador gerado baseado no nome do arquivo e nome da classe.
+    }
+  }
+</script>
+```
+
+Consulte a [especificação do Módulo CSS](https://github.com/css-modules/css-modules) para detalhes como modo [exceções globais](https://github.com/css-modules/css-modules#exceptions) e [composição](https://github.com/css-modules/css-modules#composition).
+
+### Nome de Injeção Personalizado
+
+Você pode ter mais de uma tag `<style>` em um único componente `*.vue`. Para evitar que estilos injetados substitua um ao outro, você pode personalizar o nome da propriedade computada injetada fornecendo um valor para o atributo `module`:
+
+```html
+<style module="a">
+  /* identificadores injetado como a */
+</style>
+
+<style module="b">
+  /* identificadores injetados como b */
+</style>
+```
+
+### Configurando consulta `css-loader`
+
+Módulos CSS são processados via [css-loader](https://github.com/webpack/css-loader). Com `<style module>`, a consulta padrão usada para `css-loader` é:
+
+```js
+{
+  modules: true,
+  importLoaders: true,
+  localIdentName: '[hash:base64]'
+}
+```
+
+Você pode usar as opções `cssModules` do vue-loader para fornecer opções de consulta adicionais para `css-loader`:
+
+```js
+// webpack 1
+vue: {
+  cssModules: {
+    // sobrescreve o localIdentName
+    localIdentName: '[path][name]---[local]---[hash:base64:5]',
+    // Ativa camelCase
+    camelCase: true
+  }
+}
+
+// webpack 2
+module: {
+  rules: [
+    {
+      test: '\.vue$',
+      loader: 'vue-loader',
+      options: {
+        cssModules: {
+          localIdentName: '[path][name]---[local]---[hash:base64:5]',
+          camelCase: true
+        }
+      }
+    }
+  ]
+}
+```
\ No newline at end of file
diff --git a/docs/pt/features/es2015.md b/docs/pt/features/es2015.md
new file mode 100644
index 000000000..34e7d63ed
--- /dev/null
+++ b/docs/pt/features/es2015.md
@@ -0,0 +1,65 @@
+# ES2015
+
+Quando `vue-loader` detecta a presença de `babel-loader` ou `buble-loader` no mesmo projeto, ele irá usá-los para processar pedaços `<script>` de todos os arquivos `*.vue`, permitindo-nos usar ES2015 em nossos componentes Vue. Se você ainda não conhece estes novos recursos, você definitivamente deve. Alguns bons recursos para aprendizagem:
+
+* [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+* [ES6 Features](https://github.com/lukehoban/es6features)
+* [Exploring ES6 \(book\)](https://leanpub.com/exploring-es6)
+
+Aqui está um padrão típico que você irá ver quando importar outros componentes Vue:
+
+```html
+<script>
+  import ComponentA from './ComponentA.vue'
+  import ComponentB from './ComponentB.vue'
+
+  export default {
+    components: {
+      ComponentA,
+      ComponentB
+    }
+  }
+</script>
+```
+
+Estamos usando a abreviação de objeto literal do ES2015 para definir componentes filho. `{ ComponentA }` é simplesmente uma abreviatura para `{ ComponentA: ComponentA }`. Vue irá automaticamente converter a chave para `component-a`, então você pode usar o componente importado no template como `<component-a>`.
+
+### ES2015 em Templates
+
+`<template>` em arquivos `*.vue` são compilados em funções de renderização do JavaScript e então processados por uma compilação personalizada de [Buble](https://buble.surge.sh/guide/) para suportar características ES2015. Isso permite que você use recursos como p[ropriedade de abreviatura do objeto](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) e [propriedades computadas](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
+
+```html
+<div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
+```
+
+Pode ser simplificado para:
+
+```html
+<div :class="{ active, [`${prefix}-button`]: isButton }">
+```
+
+**vue@^2.1.0 somente:** você pode usar desestruturação de parâmetro com `v-for` ou escopo de slots:
+
+```html
+<li v-for="{ id, text } in items">
+  {{ id }} {{ text }}
+</li>
+```
+
+```html
+<my-component>
+  <template scope="{ id, text }">
+    <span>{{ id }} {{ text }}</span>
+  </template>
+</my-component>
+```
+
+Você também pode personalizar os recursos suportados em template usando as [opções de `buble`](../options.md#buble).
+
+### Transpilação normal de arquivos `.js`
+
+Uma vez que `vue-loader` apenas processa arquivos `*.vue`, você precisa informar ao Webpack para processar arquivos `*.js` normais com `babel-loader` ou `buble-loader` em seu arquivo de configuração Webpack. O projeto modelo criado com `vue-cli` já faz isso pra você.
+
+### Configurando Babel com `.babelrc`
+
+`babel-loader` respeita [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), portanto essa é a abordagem recomentada para configurar as predefinições e os plugins Babel.
\ No newline at end of file
diff --git a/docs/pt/features/hot-reload.md b/docs/pt/features/hot-reload.md
new file mode 100644
index 000000000..67576439a
--- /dev/null
+++ b/docs/pt/features/hot-reload.md
@@ -0,0 +1,7 @@
+# Hot Reload
+
+"Hot Reload" \(Recarga Automática\) não é simplesmente recarregar a página quando você editar um arquivo. Com hot reload ativado, quando você edita um arquivo `*.vue`, todas as instâncias desse componente serão trocadas **sem recarregar a página**. Ele ainda preserva o estado atual de sua aplicação e dos componentes trocados. Isto melhora drasticamente a experiência de desenvolvimento quando você está ajustando os modelos ou estilo de seus componentes.
+
+![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
+
+Quando o esqueleto do projeto é criado com `vue-cli`, Hot Reload é ativado e proto para o uso.
\ No newline at end of file
diff --git a/docs/pt/features/postcss.md b/docs/pt/features/postcss.md
new file mode 100644
index 000000000..1a85bdb0e
--- /dev/null
+++ b/docs/pt/features/postcss.md
@@ -0,0 +1,54 @@
+# PostCSS
+
+Qualquer saída CSS processada por `vue-loader` é canalizada através de [PostCSS](https://github.com/postcss/postcss) para escrever o escopo CSS. Você também pode adicionar plugins PostCSS personalizado ao processador, por exemplo [autoprefixer](https://github.com/postcss/autoprefixer) or [CSSNext](http://cssnext.io/).
+
+Exemplo de uso no Webpack 1.x:
+
+```js
+// webpack.config.js
+module.exports = {
+  // outras configurações...
+  vue: {
+    // use plugins personalizado de postcss
+    postcss: [require('postcss-cssnext')()]
+  }
+}
+```
+
+Para Webpack 2.x:
+
+```js
+// webpack.config.js
+module.exports = {
+  // outras opções...
+  module: {
+    // module.rules é o mesmo que module.loaders em 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        // opções vue-loader options vai aqui
+        options: {
+          // ...
+          postcss: [require('postcss-cssnext')()]
+        }
+      }
+    ]
+  }
+}
+```
+
+Além de fornecer uma coleção de plugins, a opção de `postcss` também aceita:
+
+* Uma função que retorna uma coleção de plugins:
+
+* Um objeto que contém opções para ser passado para o processador PostCSS. Isto é útil quando você está usando projetos com PostCSS que depende de analisadores/stringifiers personalizados:
+
+  ```js
+  postcss: {
+    plugins: [...], // Lista de Plugins
+    options: {
+      parser: sugarss // Use o analisador sugarss
+    }
+  }
+  ```
\ No newline at end of file
diff --git a/docs/pt/features/scoped-css.md b/docs/pt/features/scoped-css.md
new file mode 100644
index 000000000..700cfc9af
--- /dev/null
+++ b/docs/pt/features/scoped-css.md
@@ -0,0 +1,51 @@
+# CSS com Escopo
+
+Quando uma tag `<style>` tem o atributo `scoped`, seu CSS será aplicado somente a elementos do componente atual. Isto é semelhante a encapsulamento de estilo encontrado em Shadow DOM. Ele vem com algumas ressalvas, mas não requer nenhum polyfills. Isto é alcançado usando PostCSS para transformar o seguinte:
+
+```html
+<style scoped>
+  .example {
+    color: red;
+  }
+</style>
+
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+Para o seguinte:
+
+```html
+<style>
+  .example[_v-f3f3eg9] {
+    color: red;
+  }
+</style>
+
+<template>
+  <div class="example" _v-f3f3eg9>hi</div>
+</template>
+```
+
+#### Observações
+
+1. Você pode incluir ambos os estilos com escopo e sem escopo no mesmo componente:
+
+   ```html
+   <style>
+       /* Estilo global */
+   </style>
+
+   <style scoped>
+       /* Estilo local */
+   </style>
+   ```
+
+2. Um nó raiz do componente filho irá ser afetado por ambos os CSS com escopo dos parentes e o CSS com escopo dos filhos.
+
+3. Templates parciais não são afetados por estilo com escopo.
+
+4. **Os estilos com escopo não eliminam a necessidade de classes**. Devido a forma como navegadores processam vários seletores CSS, `p { color: red }` irá ser muitas vezes mais lento quando com escopo \(exemplo: quando combinado com um seletor de atributo\). Se você usa classes ou ids ao invés, como em `.example { color: red }`, então você elimina praticamente esse desempenho atingido. [Aqui está um playground](http://stevesouders.com/efws/css-selectors/csscreate.php) onde você pode testar as diferenças você mesmo.
+
+5. **Tenha cuidado com seletores descendentes em componentes recursivos!** Para uma regra CSS com o seletor `.a .b`, se o elemento que coincide com `.a` contém um componente filho recursivo, então todos os `.b` nesse componente filho serão correspondidos pela regra.
\ No newline at end of file
diff --git a/docs/pt/options.md b/docs/pt/options.md
new file mode 100644
index 000000000..8ba51605e
--- /dev/null
+++ b/docs/pt/options.md
@@ -0,0 +1,157 @@
+# Opções de Referência
+
+### Diferença do uso entre Webpack 1 e 2
+
+Para Webpack 1.x: Adicione um bloco \`vue\` na raiz nas suas configurações Webpack:
+
+```js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader options
+  }
+}
+```
+
+Para Webpack 2 \(^2.1.0-beta.25\)
+
+```js
+module.exports = {
+  // ...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // vue-loader options
+        }
+      }
+    ]
+  }
+}
+```
+
+### loaders
+
+* type: `Object`
+
+  Um objeto que especifica carregadores de Webpack para usar para blocos de linguagem dentro de arquivos `*.vue`. A chave corresponde ao atributo `lang` para o bloco de linguagem, se especificado. O padrão `lang` para cada tipo é:
+
+  * `<template>`: `html`
+  * `<script>`:`js`
+  * `<style>`: `css`
+
+  Por exemplo, para usar `babel-loader` e `eslint-loader` para processar todos os blocos `<script>`:
+
+  ```js
+  // ...
+  vue: {
+    loaders: {
+      js: 'babel!eslint'
+    }
+  }
+  ```
+
+### postcss
+
+* type: `Array` ou `Function` ou `Object`
+* Formato `Object` suportado apenas em ^8.5.0
+
+  Especifica plugins PostCSS customizados para serem aplicado a CSS dentro de arquivos `*.vue`. Se estiver usando uma função, a função irá ser chamada usando o mesmo contexto do loader e deve retornar uma coleção de plugins.
+
+  ```js
+  // ...
+  vue: {
+    // Nota: não alinhe a opção `postcss` sobre `loaders`
+    postcss: [require('postcss-cssnext')()],
+    loaders: {
+      // ...
+    }
+  }
+  ```
+
+  Está opção também pode ser um objeto que contém opções para ser passada para o processador PostCSS. Isto é útil quando você está usando projetos PostCSS que entrega um parser/stringifiers personalizado:
+
+  ```js
+  postcss: {
+    plugins: [...], // lista de plugins
+    options: {
+      parser: sugarss // use o analizador de sugarss
+    }
+  }
+  ```
+
+### cssSourceMap
+
+* tipo: `Boolean`
+* padrão: `true`
+
+  Se deve habilitar mapas de origem para CSS. Desativar isso pode evitar alguns erros relacionado a caminho relativo em `css-loader` e fazer a construção um pouco mais rápida.
+
+  Observe que isso é automaticamente definido para `false` se a opção `devtoo` não estiver presente na configurações principai de Webpack.
+
+### esModule
+
+* tipo: `Boolean`
+* padrão: `undefined`
+
+  Se deve emitir código compatível esModule. Por padrão vue-loader irá emitir a exportação padrão em formato CommonJs como `module.exports = ...`. Quando `esModule` estiver definido como true, a exportação padrão irá ser transpilada em `exports.__esModule = true; exports = ...`. Útil para interoperação com transpiladores diferente de Babel, como TypeScript.
+
+### preserveWhitespace
+
+* tipo: `Boolean`
+* padrão: `true`
+
+  Se definido para `false`, os espaços em branco entre as tags HTML em templates serão ignorados.
+
+### transformToRequire
+
+* tipo: `{ [tag: string]: string | Array<string> }`
+* padrão: `{ img: 'src' }`
+
+  Durante a compilação do template, o compilador pode transformar certos atributos, tais como URLs `src`, em chamadas `require`, para que o recurso de destino possa ser manipulado pelo Webpack. A configuração padrão transforma o atributo `src` em tags `<img>`.
+
+### buble
+
+* tipo: `Object`
+* padrão: `{}`
+
+  Opções de configuração para o `buble-loader` \(Se estiver presente\), E a compilação buble passa para o template as funções de renderização.
+
+  > Nota de versão: Na versão 9.x, as expressões do template são configuradas separadamente através da opção `templateBudle` agora removida.
+
+  A função de renderização do template suporta uma transformação especial `stripWith` \(habilitada por padrão\), que remove o `with` usado em funções de renderização geradas para torná-las compatíveis com modelo estrito.
+
+  Exemplo de configuração:
+
+  ```js
+  // webpack 1
+  vue: {
+    buble: {
+      // ativa o objeto de propagação 
+      // NOTA: Você precisa fornecer o polyfill Object.assign por si mesmo!
+      objectAssign: 'Object.assign',
+
+      // desliga a remoção 'com'
+      transforms: {
+        stripWith: false
+      }
+    }
+  }
+
+  // webpack 2
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          buble: {
+            // mesmas opções
+          }
+        }
+      }
+    ]
+  }
+  ```
\ No newline at end of file
diff --git a/docs/pt/start/setup.md b/docs/pt/start/setup.md
new file mode 100644
index 000000000..9a6667537
--- /dev/null
+++ b/docs/pt/start/setup.md
@@ -0,0 +1,13 @@
+# Configurando um Projeto
+
+### Usando `vue-cli`
+
+Recomenda-se o gerador de esqueleto do projeto usando `vue-loader` com `vue-cli`:
+
+``` bash
+npm install -g vue-cli
+vue init webpack-simple hello-vue
+cd hello-vue
+npm install
+npm run dev # pronto para ir!
+```
\ No newline at end of file
diff --git a/docs/pt/start/spec.md b/docs/pt/start/spec.md
new file mode 100644
index 000000000..cf5823e31
--- /dev/null
+++ b/docs/pt/start/spec.md
@@ -0,0 +1,92 @@
+# Especificação do componente Vue
+
+Um arquivo `*.vue` é um formato de arquivo personalizado que usa sintaxe semelhante HTML para descrever um componente Vue. Cada arquivo `*.vue` consiste em três tipos de bloco de linguagem de nível superior: `<template>`, `<script>` e `<style>`:
+
+```html
+<template>
+  <div class="example">{{ msg }}</div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        msg: 'Olá Mundo!'
+      }
+    }
+  }
+</script>
+
+<style>
+  .example {
+    color: red;
+  }
+</style>
+```
+
+`vue-loader` analisará o arquivo, em seguida extrair cada bloco de linguagem e canaliza-lo através de outros carregadores se necessário, e finalmente montá-lo  de volta em um módulo CommonJs cujo `module.exports` seja um objeto de opções de componente Vue.js.
+
+`vue-loader` suporta o uso de linguagens não-padrão, tais como pré-processadores CSS e linguagem que compila para HTML a partir de um template, especificando o atributo `lang` para um bloco de linguagem. Por exemplo, você pode usar SASS para o estilo do seu componente como este:
+
+```html
+<style lang="sass">
+  /* escreva SASS! */
+</style>
+```
+
+Mais detalhes podem ser encontrados em [Usando Pré-Processadores](../configurations/pre-processors.md).
+
+### Blocos de Linguagem
+
+#### `<template>`
+
+* Linguagem padrão: `html`.
+
+* Cada arquivo `*.vue` pode conter no máximo um bloco `<template>` por vez.
+
+* O Conteúdo será extraído como uma string e usado como a opção `template` para o componente Vue compilado.
+
+#### `<script>`
+
+* Linguagem padrão: `js` \(ES2015 é suportado automaticamente se `babel-loader` ou `buble-loader` for detectado\).
+
+* Cada arquivo `*.vue` pode conter no máximo um bloco de `<script>` por vez.
+
+* O script é executado em um ambiente CommonJs \(Como um módulo `.js` normal manipulado via webpack\), o que significa que você pode usar `require()` para requisitar outras dependências. E com ES2015 suportado, você também pode usar a sintaxe `import` e `export`.
+
+* O script deve exportar um objeto de opções de componente Vue. Também é suportador exportar um construtor estendido criado por `Vue.extend()`, mas um objeto simples é preferível.
+
+#### `<style>`
+
+* Linguagem padrão: `css`.
+
+* Várias tags `<style>` são suportadas em um único arquivo `*.vue`.
+
+* Uma tag `<style>` pode ter atributos `scoped`ou `module` \(consulte [CSS Escopado](../features/scoped-css.md) e [Módulos CSS](../features/css-modules.md)\)\) para ajudar encapsular o estilo para o seu componente atual. Várias tags `<style>` com diferente modos de encapsulamento pode ser misturados em um mesmo componente.
+
+* Por padrão, o conteúdo será extraído e inserido dinamicamente no `<head>` do documento atual como uma tag `<style>` usando `style-loader`. Também é possível [configurar o Webpack para que todos os estilos em todos os componentes sejam extraídos em um único arquivo CSS](../configurations/extract-css.md).
+
+### Importações src
+
+Se você preferir dividir seus componentes `*.vue` em vários arquivos, você pode usar o atributo `src` para importar um arquivo externo para um bloco de linguagem:
+
+```html
+<template src="./template.html"></template>
+<style src="./style.css"></style>
+<script src="./script.js"></script>
+```
+
+Tenha em mente que as importações `src` seguem as mesmas regras de resolução de caminho que as chamadas `require()` do CommonJs, isto significa que para caminhos relativo você precisará iniciar com `./`, e você pode importar recursos diretamente a partir de pacotes instalado com NPM, exemplo:
+
+```html
+<!-- importa um arquivo do pacote npm "todomvc-app-css" instalado -->
+<style src="todomvc-app-css/index.css">
+```
+
+### Realce de Sintaxe
+
+Atualmente existem realce de sintaxe \(ou [coloração de sintaxe](https://pt.wikipedia.org/wiki/Realce_de_sintaxe)\) suportado para [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), e [JetBrains products](https://plugins.jetbrains.com/plugin/8057) \(WebStorm, PhpStorm, etc\). Contribuições para outros editores/IDEs são incentivadas e muito bem-vindas! Se você não estiver usando nenhum pré-processador em componentes Vue, você também pode tratar arquivos `*.vue` como HTML em seu editor.
+
+### Comentários
+
+Dentro de cada bloco você deve usar a sintaxe de comentário da linguagem que está sendo usada \(HTML, CSS, JavaScript, Jade, etc\). Para comentários de nível superior, use a sintaxe de comentário HTML: `<!-- conteúdo do comentário aqui -->`
\ No newline at end of file
diff --git a/docs/pt/workflow/linting.md b/docs/pt/workflow/linting.md
new file mode 100644
index 000000000..2f1865a14
--- /dev/null
+++ b/docs/pt/workflow/linting.md
@@ -0,0 +1,93 @@
+# Análise estática do código \(Linting\)
+
+Você pode ter se perguntado como você analisa seu código dentro dos seus arquivos `*.vue`, uma vez que eles não são JavaScript. Vamos supor que você está usando [ESLint](http://eslint.org/) \(se você não está, deveria\).
+
+Você também precisará do [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) com suporte de extração e análise estática \(linting\) do JavasScript dentro dos arquivos `*.vue`.
+
+Certifique-se de incluir o plugin dentro de suas configurações ESLint:
+
+```json
+"plugins": [
+    "html"
+]
+```
+
+Em seguida, a partir da linha de comando:
+
+```bash
+eslint --ext js,vue MeuComponente.vue
+```
+
+Outra opção é usar [eslint-loader](https://github.com/MoOx/eslint-loader) para que seus arquivos `*.vue` sejam automaticamente analisados ao serem salvo durante o desenvolvimento:
+
+```bash
+npm install eslint eslint-loader --save-dev
+```
+
+```js
+// webpack.config.js
+module.exports = {
+    // ... outras opções
+    module: {
+        loaders: [
+            {
+                test: /.vue$/,
+                loader: 'vue!eslint'
+            }
+        ]
+    }
+}
+```
+
+Lembre-se que a sequência dos carregadores Webpack são aplicados da **direita para esquerda**. Certifique-se de aplicar `eslint` antes de `vue`, de modo que estamos analisando o código fonte pré-compilado.
+
+Uma coisa que precisamos considerar é o uso de componente `*.vue` de terceiros enviados em pacote NPM. Neste caso, usaremos `vue-loader` para processar os componentes de terceiros, mas não queremos aplicar a análise de código estático \(linting\). Para isso nós podemos separar o linting em [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) do Webpack.
+
+```js
+// webpack.config.js
+module.exports = {
+    // ... outras opções
+    module: {
+        // lint apenas em arquivos *.vue locais
+        preLoaders: [
+            {
+                test: /.vue$/,
+                loader: 'eslint',
+                exclude: /node_modules/
+            }
+        ],
+        // mas usa vue-loader para todos arquivos *.vue
+        loaders: [
+            {
+                test: /.vue$/,
+                loader: 'vue'
+            }
+        ]
+    }
+}
+```
+
+Para Webpack 2.x:
+
+```js
+// webpack.config.js
+module.exports = {
+    // ... outras opções
+    module: {
+        rules: [
+            // lint apenas em arquivos *.vue locais
+            {
+                enforce: 'pre',
+                test: /.vue$/,
+                loader: 'eslint-loader',
+                exclude: /node_modules/
+            },
+            // mas usa vue-loader para todos arquivos *.vue
+            {
+                test: /.vue$/,
+                loader: 'vue-loader'
+            }
+        ]
+    }
+}
+```
\ No newline at end of file
diff --git a/docs/pt/workflow/production.md b/docs/pt/workflow/production.md
new file mode 100644
index 000000000..c9a7e5e97
--- /dev/null
+++ b/docs/pt/workflow/production.md
@@ -0,0 +1,39 @@
+# Construir produção
+
+Há duas coisas a fazer ao construir nosso pacote para produção:
+
+1. Minificar o código de nossa aplicação;
+2. Use a [configuração descrita no guia Vue.js](https://vuejs.org/guide/deployment.html) para remover todos os avisos de código-fonte Vue.js;
+
+Aqui está um exemplo de configuração:
+
+```js
+// webpack.config.js
+module.exports = {
+  // ...outras opções
+  plugins: [
+    // liga em curto-circuito todo código de aviso Vue.js
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    // minifica com eliminação de código morto
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    // otimiza ids de módulos por contagem de ocorrência
+    new webpack.optimize.OccurenceOrderPlugin()
+  ]
+}
+```
+
+Obviamente não queremos usar estás configurações durante o desenvolvimento, então há várias maneiras de abordar isso:
+
+1. Crie dinamicamente o objeto de configuração com base em uma variável de ambiente.
+
+2. Ou use dois arquivos de configuração do Webpack separados,  um para o desenvolvimento e outro para produção. E talvez compartilhe algumas opções comuns entre eles em um terceiro arquivo, como mostrado em [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+
+Isto é com você, desde que o objetivo seja atingido
\ No newline at end of file
diff --git a/docs/pt/workflow/testing-with-mocks.md b/docs/pt/workflow/testing-with-mocks.md
new file mode 100644
index 000000000..d38bd33f3
--- /dev/null
+++ b/docs/pt/workflow/testing-with-mocks.md
@@ -0,0 +1,70 @@
+# Testes com Mocks
+
+Em uma aplicação do mundo real, nossos componentes provavelmente tem uma dependência externa. Ao escrever testes de unidades para componentes, seria ideal se pudéssemos simular \(mock\) essas dependências externas de modo que nossos testes dependam apenas do comportamento do componente que está sendo testado.
+
+`vue-loader` fornece um recurso que permite você injetar dependências arbitrária para um componente `*.vue`, usando o [inject-loader](https://github.com/plasticine/inject-loader). A ideia geral é que, em vez de importar diretamente o módulo componente, nós usaremos `inject-loader` para criar uma função "fábrica de módulos" para este módulo. Quando está função é chamada com um objeto de mocks, ele retorna uma instância do módulo com os mocks injetados.
+
+Suponha que temos um componente como este:
+
+```html
+<!-- exemplo.vue -->
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+// está dependência precisa ser encadeada
+import AgumServico from '../servico'
+
+export default {
+  data () {
+    return {
+      msg: AgumServico.msg
+    }
+  }
+}
+</script>
+```
+
+Veja como importá-lo com simulações:
+
+> Nota: inject-loader@3.x está atualmente instável.
+
+```bash
+npm install inject-loader@^2.0.0 --save-dev
+```
+
+```js
+// exemplo.spec.js
+const ExemploInjecao = require('!!vue?inject!./exemplo.vue')
+```
+
+Observe que ele requer uma sequência de caracteres - nós estamos usando algumas [requisições de carregador webpack](https://webpack.github.io/docs/loaders.html) em linha aqui. Uma explicação rápida:
+
+* `!!` no início significa "desative todos os carregadores da configuração global";
+* `vue?inject!` significa "use o carregador de `vue`, e passe o `?inject` na consulta". Isso informa ao `vue-loader` para compilar o componente no modo injeção de dependência.
+
+O retorno de `ExemploInjecao` é uma função de fábrica que pode ser chamada para criar instâncias do módulo `exemplo.vue`.
+
+```js
+const ExemploComMocks = ExemploInjecao({
+  // simulação de serviço
+  '../servico': {
+    msg: 'Olá de uma simulação de serviço!'
+  }
+})
+```
+
+Finalmente, podemos testar o componente como de costume:
+
+```js
+it('Deve renderizar', () => {
+  const vm = new Vue({
+    template: '<div><test></test></div>',
+    components: {
+      'test': ExemploComMocks
+    }
+  }).$mount()
+  expect(vm.$el.querySelector('.msg').textContent).toBe('Olá de uma simulação de serviço!')
+})
+```
\ No newline at end of file
diff --git a/docs/pt/workflow/testing.md b/docs/pt/workflow/testing.md
new file mode 100644
index 000000000..c911891af
--- /dev/null
+++ b/docs/pt/workflow/testing.md
@@ -0,0 +1,101 @@
+# Testando
+
+> O [template vue-cli do webpack](https://github.com/vuejs-templates/webpack)  oferece testes de unidade pré-configurados e configurações de teste es2 para você.
+
+Ao testar arquivos `*.vue` não podemos usar um corredor de teste simples baseado em CommonJs, porque ele não sabe como manipular arquivos `*.vue`. Em vez disso, nós ainda usaremos Webpack + vue-loader para manipular nossos arquivos de teste. A configuração recomendada é usando [Karma](http://karma-runner.github.io/0.13/index.html) e [karma-webpack](https://github.com/webpack/karma-webpack).
+
+Karma é um corredor de teste que inicia navegadores e executa seus testes. Você pode escolher qual navegador você quer para testar e qual framework \(exemplo: Mocha ou Jasmine\) você quer usar. Aqui está um exemplo de configuração Karma que executa os testes dentro de [PhantomJS](http://phantomjs.org/) com o framework de teste [Jasmine](http://jasmine.github.io/edge/introduction.html).
+
+```bash
+npm install\
+  karma karma-webpack\
+  karma-jasmine jasmine-core\
+  karma-phantomjs-launcher phantomjs\
+  --save-dev
+```
+
+```js
+// podemos usar a mesma configuração que é exigida pelo webpackm
+// entretanto, lembre-se de remover a entrada original, uma vez 
+// que não precisamo durante os testes
+var webpackConfig = require('./webpack.config.js')
+delete webpackConfig.entry
+
+// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    browsers: ['PhantomJS'],
+    frameworks: ['jasmine'],
+    // este é o arquivo de entrada para todos os nossos testes
+    files: ['test/index.js'],
+    // vamos passar o arquivo de entrada para webpack empacotar
+    preprocessors: {
+      'test/index.js': ['webpack']
+    },
+    // use a configuração do webpack
+    webpack: webpackConfig,
+    // evita pedaços de texto inúteis
+    webpackMiddleware: {
+      noInfo: true
+    },
+    singleRun: true
+  })
+}
+```
+
+E para o arquivo `test/index.js` de entrada:
+
+```js
+// test/index.js
+// requisita todos os arquivos de testes usando 0 recursos especial do Webpack
+// https://webpack.github.io/docs/context.html#require-context
+var testsContext = require.context('.', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+```
+
+Este recurso de entrada simplesmente requisita todos os outros arquivos na pasta que terminam com `.spec.js`. Agora podemos realmente escrever alguns testes:
+
+```js
+// test/component-a.spec.js
+var Vue = require('vue')
+var ComponentA = require('../../src/components/a.vue')
+
+describe('a.vue', function () {
+
+  // Opções JavaScript de afirmação (asserting)
+  it('should have correct message', function () {
+    expect(ComponentA.data().msg).toBe('Olá do componente A!')
+  })
+
+  // Afirmando o resultado renderizado fornecido pelo componente
+  it('should render correct message', function () {
+    var vm = new Vue({
+      template: '<div><test></test></div>',
+      components: {
+        'test': ComponentA
+      }
+    }).$mount()
+    expect(vm.$el.querySelector('h2.red').textContent).toBe('Olá do componente A!')
+  })
+})
+```
+
+Para executar os testes, adicione o seguinte script NPM:
+
+```js
+// package.json
+...
+"scripts": {
+  ...
+  "test": "karma start karma.conf.js"
+}
+...
+```
+
+Finalmente execute:
+
+```bash
+npm test
+```
+
+Novamente, [template vue-cli webpack](https://github.com/vuejs-templates/webpack) contém um exemplo totalmente funcional com testes.
\ No newline at end of file

From 8e38245bd627496d18ec42a4a15e5a3e2626fa70 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 13 Feb 2017 16:45:13 -0500
Subject: [PATCH 507/877] compatibility with HappyPack

---
 docs/en/features/postcss.md |  2 +-
 docs/en/options.md          | 15 +++++++----
 lib/loader.js               | 53 +++++++++++++++++++++++++------------
 lib/style-rewriter.js       | 13 +++++++++
 lib/template-compiler.js    | 15 +++++------
 5 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index e7417535a..d4d16beff 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -4,7 +4,7 @@ Any CSS output processed by `vue-loader` is piped through [PostCSS](https://gith
 
 ## Using a Config File
 
-Starting in 11.0 `vue-loader` supports auto-loading the same PostCss config files supported by `postcss-loader`:
+Starting in 11.0 `vue-loader` supports auto-loading the same PostCss config files supported by [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
 
 - `postcss.config.js`
 - `.postcssrc`
diff --git a/docs/en/options.md b/docs/en/options.md
index 74d6610cb..c08a4bd73 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -81,17 +81,22 @@ module.exports = {
 
 ### postcss
 
+> Note: in >=11.0.0 it is recommended to use a PostCSS config file instead. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+
 - type: `Array` or `Function` or `Object`
 
   Specify custom PostCSS plugins to be applied to CSS inside `*.vue` files. If using a function, the function will called using the same loader context and should return an Array of plugins.
 
   ``` js
   // ...
-  vue: {
-    // note: do not nest the `postcss` option under `loaders`
-    postcss: [require('postcss-cssnext')()],
-    loaders: {
-      // ...
+  {
+    loader: 'vue-loader',
+    options: {
+      // note: do not nest the `postcss` option under `loaders`
+      postcss: [require('postcss-cssnext')()],
+      loaders: {
+        // ...
+      }
     }
   }
   ```
diff --git a/lib/loader.js b/lib/loader.js
index 6c8ab922a..46aea1061 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -50,7 +50,7 @@ function getRawRequest (context) {
 
 module.exports = function (content) {
   this.cacheable()
-  var isServer = this.options.target === 'node'
+  var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
 
   var loaderContext = this
@@ -60,8 +60,9 @@ module.exports = function (content) {
 
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
-  var moduleId = 'data-v-' + genId(filePath, this._compiler.context)
-  var styleRewriter = styleRewriterPath + '?id=' + moduleId
+
+  var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
+  var moduleId = 'data-v-' + genId(filePath, context)
 
   var cssLoaderOptions = ''
   if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
@@ -75,8 +76,15 @@ module.exports = function (content) {
     ? '?' + JSON.stringify(options.buble)
     : ''
 
+  var templateCompilerOptions = '?' + JSON.stringify({
+    id: moduleId,
+    transformToRequire: options.transformToRequire,
+    preserveWhitespace: options.preserveWhitespace,
+    buble: options.buble
+  })
+
   var defaultLoaders = {
-    html: templateCompilerPath + '?id=' + moduleId,
+    html: templateCompilerPath + templateCompilerOptions,
     css: styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
     js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
@@ -177,31 +185,42 @@ module.exports = function (content) {
   function getRawLoaderString (type, part, index, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
-    var rewriter = type === 'styles' ? styleRewriter + (scoped ? '&scoped=true!' : '!') : ''
-    var injectString = (type === 'script' && query.inject) ? 'inject-loader!' : ''
+
+    var styleRewriter = ''
+    if (type === 'styles') {
+      styleRewriter = styleRewriterPath + '?' + JSON.stringify({
+        id: moduleId,
+        scoped: !!scoped,
+        hasInlineConfig: !!query.postcss
+      }) + '!'
+    }
+
+    var injectString = (type === 'script' && query.inject)
+      ? 'inject-loader!'
+      : ''
+
     if (loader != null) {
       if (Array.isArray(loader)) {
         loader = stringifyLoaders(loader)
       } else if (typeof loader === 'object') {
         loader = stringifyLoaders([loader])
       }
-      // add css modules
       if (type === 'styles') {
+        // add css modules
         loader = addCssModulesToLoader(loader, part, index)
+        // inject rewriter before css loader for extractTextPlugin use cases
+        if (rewriterInjectRE.test(loader)) {
+          loader = loader.replace(rewriterInjectRE, function (m, $1) {
+            return ensureBang($1) + styleRewriter
+          })
+        } else {
+          loader = ensureBang(loader) + styleRewriter
+        }
       }
       // if user defines custom loaders for html, add template compiler to it
       if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
         loader = defaultLoaders.html + '!' + loader
       }
-      // inject rewriter before css/html loader for
-      // extractTextPlugin use cases
-      if (rewriterInjectRE.test(loader)) {
-        loader = loader.replace(rewriterInjectRE, function (m, $1) {
-          return ensureBang($1) + rewriter
-        })
-      } else {
-        loader = ensureBang(loader) + rewriter
-      }
       return injectString + ensureBang(loader)
     } else {
       // unknown lang, infer the loader to be used
@@ -210,7 +229,7 @@ module.exports = function (content) {
           return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + rewriter + ensureBang(ensureLoader(lang))
+          return loader + '!' + styleRewriter + ensureBang(ensureLoader(lang))
         case 'script':
           return injectString + ensureBang(ensureLoader(lang))
         default:
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 228f4a8a8..b64566402 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -45,6 +45,19 @@ module.exports = function (css, map) {
   var query = loaderUtils.parseQuery(this.query)
   var vueOptions = this.options.__vueOptions__
 
+  if (!vueOptions) {
+    if (query.hasInlineConfig) {
+      this.emitError(
+        `\n  [vue-loader] It seems you are using HappyPack with inline postcss ` +
+        `options for vue-loader. This is not supported because loaders running ` +
+        `in different threads cannot share non-serializable options. ` +
+        `It is recommended to use a postcss config file instead.\n` +
+        `\n  See http://vue-loader.vuejs.org/en/features/postcss.html#using-a-config-file for more details.\n`
+      )
+    }
+    vueOptions = Object.assign({}, this.options.vue, this.vue)
+  }
+
   // use the same config loading interface as postcss-loader
   loadPostcssConfig({ webpack: this }).catch(() => {
     // postcss-load-config throws error when no config file is found,
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 0d8aabdda..19dd928ed 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -48,19 +48,18 @@ function rewrite (attr, name) {
 
 module.exports = function (html) {
   this.cacheable()
+  var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  var query = loaderUtils.parseQuery(this.query)
-  var isServer = this.options.target === 'node'
-  var vueOptions = this.options.__vueOptions__
-  if (vueOptions.transformToRequire) {
+  var options = loaderUtils.parseQuery(this.query)
+  if (options.transformToRequire) {
     transformToRequire = Object.assign(
       {},
       defaultTransformToRequire,
-      vueOptions.transformToRequire
+      options.transformToRequire
     )
   }
   var compiled = compiler.compile(html, Object.assign({
-    preserveWhitespace: vueOptions.preserveWhitespace
+    preserveWhitespace: options.preserveWhitespace
   }, defaultCompileOptions))
   var code
   if (compiled.errors.length) {
@@ -70,7 +69,7 @@ module.exports = function (html) {
     )
     code = 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
-    var bubleOptions = vueOptions.buble
+    var bubleOptions = options.buble
     code = transpile('module.exports={' +
       'render:' + toFunction(compiled.render) + ',' +
       'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
@@ -92,7 +91,7 @@ module.exports = function (html) {
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("' + hotReloadAPIPath + '").rerender("' + query.id + '", module.exports)\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
       '  }\n' +
       '}'
   }

From 94baaad54db3d568b790cc7f45052d7bfa8115ef Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 13 Feb 2017 16:45:17 -0500
Subject: [PATCH 508/877] 11.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 615062f12..8486354c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "10.3.0",
+  "version": "11.0.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From f99c329658826b898772783faef2ec7dc450d716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Tue, 14 Feb 2017 00:04:47 -0200
Subject: [PATCH 509/877] Minor fixes and updates (#643)

---
 docs/pt/README.md                       | 25 +++----
 docs/pt/SUMMARY.md                      | 42 +++++------
 docs/pt/configurations/advanced.md      | 79 +++++++++++++-------
 docs/pt/configurations/asset-url.md     |  2 +-
 docs/pt/configurations/custom-blocks.md | 67 +++++++++++++++++
 docs/pt/options.md                      | 95 ++++++++++++++++---------
 6 files changed, 217 insertions(+), 93 deletions(-)
 create mode 100644 docs/pt/configurations/custom-blocks.md

diff --git a/docs/pt/README.md b/docs/pt/README.md
index 44b29a666..c3fe2470d 100644
--- a/docs/pt/README.md
+++ b/docs/pt/README.md
@@ -6,13 +6,14 @@
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
-Existem muitas características interessantes fornecidos por `vue-loader`:
+Existem muitos recursos interessantes fornecidos por `vue-loader`:
 
-* ES2015 habilitado por padrão;
-* Permite usar outros carregadores Webpack para cada pedaço de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
-* Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores Webpack;
-* Pode simular escopo CSS para cada componente;
-* Suporta componente hot-reloading durante desenvolvimento;
+- ES2015 habilitado por padrão;
+- Permite usar outros carregadores Webpack para cada pedaço de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
+- Permite seções customizadas em um arquivo .vue que pode ter carregadores encadeados personalizados aplicados a eles;
+- Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores Webpack;
+- Pode simular escopo CSS para cada componente;
+- Suporta componente hot-reloading durante desenvolvimento;
 
 Em poucas palavras, a combinação de Webpack e `vue-loader` dá-lhe um moderno, flexível e extremamente poderoso fluxo de trabalho front-end para criação de aplicações Vue.js.
 
@@ -20,7 +21,7 @@ Em poucas palavras, a combinação de Webpack e `vue-loader` dá-lhe um moderno,
 
 Se você já está familiarizado com Webpack, sinta-se livre para pular está explicação. Mas para aqueles de vocês que são novos com Webpack, aqui está uma pequena introdução:
 
-[Webpack](http://webpack.github.io/) é um empacotador de módulo. Ele carrega um grupo de arquivos tratando cada um como um módulo, descobrindo as dependências entre eles e empacotando em ativos estáticos prontos para implantação.
+[Webpack](http://webpack.github.io/) é um empacotador de módulo. Ele pega um grupo de arquivos, trata cada um como um módulo, descobre as dependências entre eles e empacota em ativos estáticos prontos para implantação.
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
@@ -28,10 +29,10 @@ Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. E
 
 Mas Webpack pode fazer mais do que isso. Com "carregadores", podemos ensinar Webpack a transformar todos os tipos de arquivos dá maneira que quisermos antes da saída final do pacote. Alguns exemplos incluem:
 
-* Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
-* Opcionalmente você pode canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
-* Transpilar modelos Jade em HTML simples em seguida colocao-o como uma sequência de string JavaScript;
-* Traspilar arquivos SASS em CSS simples, em seguida os converte em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
-* Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5; 
+- Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
+- Opcionalmente você pode canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
+- Transpilar modelos Jade em HTML simples em seguida colocá-lo como uma sequência de string JavaScript;
+- Traspilar arquivos SASS em CSS simples, em seguida os converte em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
+- Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5; 
 
 Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `Vue-loader`.
\ No newline at end of file
diff --git a/docs/pt/SUMMARY.md b/docs/pt/SUMMARY.md
index 3d4684033..669657654 100644
--- a/docs/pt/SUMMARY.md
+++ b/docs/pt/SUMMARY.md
@@ -1,20 +1,22 @@
-* Começando
-  * [Especificação do Vue Component](start/spec.md)
-  * [Configurando um projeto](start/setup.md)
-* Características
-  * [ES2015](features/es2015.md)
-  * [CSS com Escopo](features/scoped-css.md)
-  * [Módulos CSS](features/css-modules.md)
-  * [PostCSS](features/postcss.md)
-  * [Hot Reload](features/hot-reload.md)
-* Configurações
-  * [Pré-Processadores](configurations/pre-processors.md)
-  * [Manipulação de URls de ativos](configurations/asset-url.md)
-  * [Configuração avançado do loader](configurations/advanced.md)
-  * [Extraindo arquivos css](configurations/extract-css.md)
-* Fluxo de trabalho
-  * [Produção](workflow/production.md)
-  * [Análise estática do código \(Linting\)](workflow/linting.md)
-  * [Testando](workflow/testing.md)
-  * [Testando com Mocks](workflow/testing-with-mocks.md)
-* [Referência de opções](options.md)
\ No newline at end of file
+- [Introdução](README.md)
+- Começando
+  - [Especificação do Vue Component](start/spec.md)
+  - [Configurando um projeto](start/setup.md)
+- Características
+  - [ES2015](features/es2015.md)
+  - [CSS com Escopo](features/scoped-css.md)
+  - [Módulos CSS](features/css-modules.md)
+  - [PostCSS](features/postcss.md)
+  - [Hot Reload](features/hot-reload.md)
+- Configurações
+  - [Pré-Processadores](configurations/pre-processors.md)
+  - [Manipulação de URls de ativos](configurations/asset-url.md)
+  - [Configuração avançado do loader](configurations/advanced.md)
+  - [Extraindo arquivos css](configurations/extract-css.md)
+  - [Blocos customizados](configurations/custom-blocks.md)
+- Fluxo de trabalho
+  - [Produção](workflow/production.md)
+  - [Análise estática do código \(Linting\)](workflow/linting.md)
+  - [Testando](workflow/testing.md)
+  - [Testando com Mocks](workflow/testing-with-mocks.md)
+- [Referência de opções](options.md)
\ No newline at end of file
diff --git a/docs/pt/configurations/advanced.md b/docs/pt/configurations/advanced.md
index 2221ef517..f0730940b 100644
--- a/docs/pt/configurations/advanced.md
+++ b/docs/pt/configurations/advanced.md
@@ -1,54 +1,83 @@
 # Configurações avançadas do carregador
 
-Às vezes você pode querer aplicar um carregador de string a uma linguagem em vez de deixar `vue-loader` responsável. Ou você pode simplesmente querer sobrescrever a configuração embutida do carregador para a linguagem padrão. Para fazer isso, adicione um bloco `vue` em seu arquivo de configuração Webpack, e especifique a opção `loaders`.
+Às vezes você pode querer:
 
-### Webpack 1.x
+1. Aplicar um carregador personalizado de string a uma linguagem em vez de deixar `vue-loader` responsável. 
+
+2. Sobrescrever a configuração embutida do carregador para a linguagem padrão. 
+
+3. Pré-processar ou pós-processar um bloco de linguagem especifico com carregadores personalizado.
+
+Para fazer isto, especifique a opção `loaders` para `vue-loader`:
+
+> Observe que `preLoaders` e`postLoaders` são suportados apenas em verões >=10.3.0
+
+
+
+### Webpack 2.x
 
 ```js
 // webpack.config.js
 module.exports = {
   // outras opções...
   module: {
-    loaders: [
+    // module.rules é o mesmo que module.loaders em 1.x
+    rules : [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader',
+        options: {
+          // `loaders` substituirá os carregadores padrões.
+          // A configuração a seguir fará com que todas as tags <script> sem 
+          // o atributo "lang" sejam carrega com coffee-loader
+          loaders: {
+            js: 'coffee-loader'
+          },
+          
+          // `preLoaders` são anexados antes dos carregadores padrões
+          // Você pode usar isso para pré-processar blocos de linguagem 
+          // - um caso de uso comum seria i18n em tempo de construção.
+          preLoaders: {
+            js: '/caminho/personalizado/para/carregador'
+          },
+          
+          // `postLoaders` são anexados após os carregadores padrões.
+          // 
+          // - Para `html`, o resultado retornado pelo carregador padrão
+          //   será compilado em código de função de renderização JavaScript.
+          //
+          // - Para `css`, o resultado será retornado por vue-style-loader
+          //   que não é particulamente útil em muitos casos. Usando um plugin
+          //   postcss será uma opção melhor.
+          postLoaders: {
+            html: 'babel-loader'
+          }
+        }
       }
     ]
-  },
-  // configurações vue-loader 
-  vue: {
-    // ... outras opções vue
-    loaders: {
-      // carrega todo <script> sem o atributo "lang" com coffee-loader
-      js: 'coffee',
-      // carrega <template> diretamente como string HTML, 
-      // canalizá-lo atravé de vue-html-loader primeiro
-      html: 'raw'
-    }
   }
 }
 ```
 
-### Webpack 2.x \(^2.1.0-beta.25\)
+### Webpack 1.x
 
 ```js
+// webpack.config.js
 module.exports = {
   // outras opções...
   module: {
-    // module.rules é o mesmo que module.loaders em 1.x
-    rules: [
+    loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
-        // opções de vue-loader
-        options: {
-          loaders: {
-            // ...
-          }
-        }
+        loader: 'vue'
       }
     ]
+  },
+  // configurações vue-loader
+  vue: {
+    loaders: {
+      // mesmo que as regras de configurações acima
+    }
   }
 }
 ```
diff --git a/docs/pt/configurations/asset-url.md b/docs/pt/configurations/asset-url.md
index f9a798dc1..2f3c086cc 100644
--- a/docs/pt/configurations/asset-url.md
+++ b/docs/pt/configurations/asset-url.md
@@ -18,6 +18,6 @@ Como `.png` não é um arquivo JavaScript, você precisará configurar o Webpack
 
 Os benefícios de tudo isso são:
 
-1. `file-loader` permite a você configurar onde copiar e colar os arquivos de ativos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos **`.vue`** e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, Webpack irá automaticamente escrever o caminho dos arquivos em URLs corretas na saída empacotada.
+1. `file-loader` permite a você configurar onde copiar e colar os arquivos de ativos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos `.vue` e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, Webpack irá automaticamente escrever o caminho dos arquivos em URLs corretas na saída empacotada.
 
 2. `url-loader` permite a você colocar condicionalmente em linha um arquivo de dados URL base64 se eles forem menor que um determinado limite. Se o arquivo for maior do que o limite ele automaticamente será jogado para `file-loader`.
\ No newline at end of file
diff --git a/docs/pt/configurations/custom-blocks.md b/docs/pt/configurations/custom-blocks.md
new file mode 100644
index 000000000..ab55766a3
--- /dev/null
+++ b/docs/pt/configurations/custom-blocks.md
@@ -0,0 +1,67 @@
+# Blocos customizados
+
+> Requer versão 10.2.0+
+
+Você pode definir um bloco de linguagem customizado dentro de arquivos `*.vue`. O conteúdo do bloco customizado será processado por carregadores especificado na opção `loaders` do objeto de configuração `vue-loader` e então requerido pelo módulo componente. A configuração é semelhante a descrita em [Configurações Avançada do Carregador](../configurations/advanced.md). exceto o uso padrão do nome da tag em vez do atributo `lang`;
+
+Se for encontrado um carregador correspondente para um bloco customizado, ele será processado. Caso contrário o bloco customizado será simplesmente ignorado.
+
+## Exemplo
+
+Aqui está um exemplo de extração de todos os blocos customizados `<docs>` em um único arquivo docs;
+
+#### componente.vue
+
+``` html
+<docs>
+  ## Isto é um componente de exemplo.
+</docs>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Olá do Componente A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            // extrai todo conteúdo de <docs> em texto bruto
+            'docs': ExtractTextPlugin.extract('raw-loader'),
+          }
+        }
+      }
+    ],
+    plugins: [
+      // saída de todos os docs em um único arquivo
+      new ExtractTextPlugin('docs.md')
+    ]
+  }
+}
+```
diff --git a/docs/pt/options.md b/docs/pt/options.md
index 8ba51605e..3b78b95ce 100644
--- a/docs/pt/options.md
+++ b/docs/pt/options.md
@@ -1,19 +1,8 @@
-# Opções de Referência
+# Referência de Opções
 
-### Diferença do uso entre Webpack 1 e 2
+## Diferença do uso entre Webpack 1 & 2
 
-Para Webpack 1.x: Adicione um bloco \`vue\` na raiz nas suas configurações Webpack:
-
-```js
-module.exports = {
-  // ...
-  vue: {
-    // vue-loader options
-  }
-}
-```
-
-Para Webpack 2 \(^2.1.0-beta.25\)
+Para Webpack 2: passe as opções diretamente para a regra do carregador.
 
 ```js
 module.exports = {
@@ -24,7 +13,7 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          // vue-loader options
+          // opções de vue-loader
         }
       }
     ]
@@ -32,11 +21,22 @@ module.exports = {
 }
 ```
 
+Para Webpack 1.x: Adicione um bloco \`vue\` na raiz de suas configurações Webpack:
+
+```js
+module.exports = {
+  // ...
+  vue: {
+    // opções de vue-loader
+  }
+}
+```
+
 ### loaders
 
-* type: `Object`
+* tipo: `{ [lang: string]: string }`
 
-  Um objeto que especifica carregadores de Webpack para usar para blocos de linguagem dentro de arquivos `*.vue`. A chave corresponde ao atributo `lang` para o bloco de linguagem, se especificado. O padrão `lang` para cada tipo é:
+  Um objeto especificando carregadores de Webpack para substituir carregadores padrão usados para blocos de linguagem dentro de arquivos `*.vue`. A chave corresponde ao atributo `lang` para o bloco de linguagem, se especificado. O padrão `lang` para cada tipo é:
 
   * `<template>`: `html`
   * `<script>`:`js`
@@ -44,29 +44,51 @@ module.exports = {
 
   Por exemplo, para usar `babel-loader` e `eslint-loader` para processar todos os blocos `<script>`:
 
-  ```js
-  // ...
-  vue: {
-    loaders: {
-      js: 'babel!eslint'
+```js
+  // Configuração Webpack 2.X
+  module: {
+    rules: {
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          js: 'babel-loader!eslint-loader'
+        }
+      }
     }
   }
-  ```
+```
+
+### preLoaders
+
+* tipo: `{ [lang: string]: string }`
+* suportado apenas em &gt;=10.3.0
+
+  O formato de configuração é o mesmo que `loaders`, mas `preLoaders` são aplicados depois dos carregadores padrões. Você pode usar isto para pós-processar blocos de linguagem. No entanto observe que isso é um pouco mais complicado:
+  
+  * Para `html`, o resultado retornado pelo carregador padrão será compilado em código de função de renderização JavaScript.
+
+  * Para `css`, o resultado será retornado por `vue-style-loader` que não é particularmente útil na maioria dos casos. Usando um plugin postcss será uma opção melhor.
+
 
 ### postcss
 
-* type: `Array` ou `Function` ou `Object`
-* Formato `Object` suportado apenas em ^8.5.0
+> Nota: em versões &gt;=11.0.0 é recomendável usar um arquivo de configuração PostCSS em vez disso. O uso é o mesmo que [postcss-loader](https://github.com/postcss/postcss-loader#usage).
 
-  Especifica plugins PostCSS customizados para serem aplicado a CSS dentro de arquivos `*.vue`. Se estiver usando uma função, a função irá ser chamada usando o mesmo contexto do loader e deve retornar uma coleção de plugins.
+* tipo: `Array` ou `Function` ou `Object`
+
+  Especifica plugins PostCSS personalizados para serem aplicado a CSS dentro de arquivos `*.vue`. Se estiver usando uma função, a função irá ser chamada usando o mesmo contexto do loader e deve retornar uma coleção de plugins.
 
   ```js
   // ...
-  vue: {
-    // Nota: não alinhe a opção `postcss` sobre `loaders`
-    postcss: [require('postcss-cssnext')()],
-    loaders: {
-      // ...
+  {
+    loader: 'vue-loader',
+    options: {
+      // Nota: não alinhe a opção `postcss` sob `loaders`
+      postcss: [require('postcss-cssnext')()],
+      loaders: {
+        // ...
+      }
     }
   }
   ```
@@ -77,7 +99,7 @@ module.exports = {
   postcss: {
     plugins: [...], // lista de plugins
     options: {
-      parser: sugarss // use o analizador de sugarss
+      parser: sugarss // use o analisador de sugarss
     }
   }
   ```
@@ -89,7 +111,7 @@ module.exports = {
 
   Se deve habilitar mapas de origem para CSS. Desativar isso pode evitar alguns erros relacionado a caminho relativo em `css-loader` e fazer a construção um pouco mais rápida.
 
-  Observe que isso é automaticamente definido para `false` se a opção `devtoo` não estiver presente na configurações principai de Webpack.
+  Observe que isso é automaticamente definido para `false` se a opção `devtoo` não estiver presente na configuração princípai de Webpack.
 
 ### esModule
 
@@ -110,7 +132,7 @@ module.exports = {
 * tipo: `{ [tag: string]: string | Array<string> }`
 * padrão: `{ img: 'src' }`
 
-  Durante a compilação do template, o compilador pode transformar certos atributos, tais como URLs `src`, em chamadas `require`, para que o recurso de destino possa ser manipulado pelo Webpack. A configuração padrão transforma o atributo `src` em tags `<img>`.
+  Durante a compilação do template, o compilador pode transformar certos atributos, tais como URLs `src`, em chamadas `require`, para que o recurso de destino possa ser manipulado pelo Webpack. A configuração padrão transforma o atributo `src` em tags `<img>` e atributos `xlink:href` em tags `<image>` de SVG.
 
 ### buble
 
@@ -154,4 +176,7 @@ module.exports = {
       }
     ]
   }
-  ```
\ No newline at end of file
+  ```
+
+
+

From 3414e3ad14de9d4a1841b639c3dab8946ed8aba8 Mon Sep 17 00:00:00 2001
From: Grigoriy Beziuk <me@gbezyuk.ru>
Date: Tue, 14 Feb 2017 20:34:57 +0300
Subject: [PATCH 510/877] [DONE][Just Merge Me][Community Translation] Russian
 Docs Translation (#587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* - Initial commit

* - Добавлен русский в LANGS.md

* - extract-css переведён

* - postcss.md переведён

* - setup.md переведён

* - scoped-css.md частично переведён

* - options.md переведён не до конца

* - es2015.md частичный перевод

* - README.md переведены заголовки

* - advanced.md частичный перевод

* - hot-reload.md переведён

* - pre-processors.md частичный перевод

* - css-modules.md частичный перевод

* - SUMMARY.md

* - options.md

* spec.md

* - es2015.md переведен

* - css-modules.md переведен

* - scoped-css.md переведен

* - advanced.md переведен

* - pre-processor.md частично переведен

* - Мелкая правка в spec.md

* - asset-url частично переведен

* - pre-processors допереведен

* - asset-url переведен

* Translated README.md, testing.md and testing-with-mocks.md (first approach)

* Readme reading fixes

* Fixed 'powerful' translation in README.md and some punctuation in testing-with-mocks.md

* Fixed ndashes in definitions

* Review fixes

* Minor fix for README.md

* Added a paragraph about mocks and replaced "mock" with "mock-object"

* Punctuation fixes for testing-with-mocks.md

* Added translation to production.md

* Translated linting.md

* Removed archaic expression

* - README.md добавлена новая строка (пока не переведено)

* - advanced.md добавленения для конфига Webpack 2

* - spec.md добавлены пользовательские секции vue-файлов

* - extract-css правка версии вебпака

* advanced.md правка версии вебпака + примеров

* - spec.md сокращен раздел о пользовательских блоках

* - Добавлены пользовательские блоки в оглавление

* - custom-blocks.md добавлен и переведен новый раздел

* - custom-block.md обновление к новой версии vue-loader

* - css-modules.md переведён заголовок

* - summary.md приведены ссылок в соответствие с заголовками в файлах

* - extract-css.md Webpack 2 перенесен выше

* - options.md Webpack 2 вынесен в начало. Добавлены упоминания preLoader & postLoaders

* - advanced.md Webpack 2 поставлен раньше.  Добавлены упоминания preLoaders & postLoaders

* - extract-css исправления для extract-text-webpack-plugin второй версии

* - PostCSS.md добавлена секция про поддержку файлов конфигов

* - Доработки по postcss

* - options.md допереведено
---
 docs/LANGS.md                            |   5 +-
 docs/ru/README.md                        |  38 +++++
 docs/ru/SUMMARY.md                       |  21 +++
 docs/ru/configurations/advanced.md       |  82 ++++++++++
 docs/ru/configurations/asset-url.md      |  23 +++
 docs/ru/configurations/custom-blocks.md  |  67 ++++++++
 docs/ru/configurations/extract-css.md    |  70 +++++++++
 docs/ru/configurations/pre-processors.md |  81 ++++++++++
 docs/ru/features/css-modules.md          | 117 ++++++++++++++
 docs/ru/features/es2015.md               |  65 ++++++++
 docs/ru/features/hot-reload.md           |   7 +
 docs/ru/features/postcss.md              |  68 +++++++++
 docs/ru/features/scoped-css.md           |  51 +++++++
 docs/ru/options.md                       | 187 +++++++++++++++++++++++
 docs/ru/start/setup.md                   |  13 ++
 docs/ru/start/spec.md                    | 111 ++++++++++++++
 docs/ru/workflow/linting.md              |  93 +++++++++++
 docs/ru/workflow/production.md           |  39 +++++
 docs/ru/workflow/testing-with-mocks.md   |  72 +++++++++
 docs/ru/workflow/testing.md              | 102 +++++++++++++
 20 files changed, 1310 insertions(+), 2 deletions(-)
 create mode 100644 docs/ru/README.md
 create mode 100644 docs/ru/SUMMARY.md
 create mode 100644 docs/ru/configurations/advanced.md
 create mode 100644 docs/ru/configurations/asset-url.md
 create mode 100644 docs/ru/configurations/custom-blocks.md
 create mode 100644 docs/ru/configurations/extract-css.md
 create mode 100644 docs/ru/configurations/pre-processors.md
 create mode 100644 docs/ru/features/css-modules.md
 create mode 100644 docs/ru/features/es2015.md
 create mode 100644 docs/ru/features/hot-reload.md
 create mode 100644 docs/ru/features/postcss.md
 create mode 100644 docs/ru/features/scoped-css.md
 create mode 100644 docs/ru/options.md
 create mode 100644 docs/ru/start/setup.md
 create mode 100644 docs/ru/start/spec.md
 create mode 100644 docs/ru/workflow/linting.md
 create mode 100644 docs/ru/workflow/production.md
 create mode 100644 docs/ru/workflow/testing-with-mocks.md
 create mode 100644 docs/ru/workflow/testing.md

diff --git a/docs/LANGS.md b/docs/LANGS.md
index 60a72c858..ab4640e05 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1,3 +1,4 @@
 * [English](en/)
-* [Português](pt/)
-* [한국어](kr/)
\ No newline at end of file
+* [한국어](kr/)
+* [Русский](ru/)
+* [Português](pt/)
\ No newline at end of file
diff --git a/docs/ru/README.md b/docs/ru/README.md
new file mode 100644
index 000000000..4b8ddbde5
--- /dev/null
+++ b/docs/ru/README.md
@@ -0,0 +1,38 @@
+# Введение
+
+### Что такое `vue-loader`?
+
+`vue-loader` – это загрузчик для Webpack, который преобразует Vue компоненты, написанные в следующем формате в обычные JavaScript модули:
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+`vue-loader` предлагает множество полезных возможностей:
+
+- Поддержка ES2015 по умолчанию;
+- Позволяет использовать разные загрузчики Webpack для разных частей Vue компонента, например, SASS для `<style>` и Jade для `<template>`;
+- Позволяет использовать пользовательские секции во .vue-файлах, применяя к ним пользовательские цепочки загрузчиков
+- Обращается со статическими ресурсами, указанными в `<style>` и `<template>`, как с зависимостями модуля, и обрабатывает их Webpack загрузчиками;
+- Может эмулировать scoped CSS для компонентов;
+- Поддерживает горячую замену модулей.
+
+В двух словах, сочетание Webpack и `vue-loader` предоставляет вам современный, гибкий и невероятно эффективный подход к написанию клиентских приложений на Vue.js.
+
+### Что такое Webpack?
+
+Если вы уже знакомы с Webpack, можете пропустить дальнейшее объяснение. Для тех же, кому Webpack в новинку, вот краткая вводная:
+
+[Webpack](http://webpack.github.io/) – это сборщик модулей. Он берёт кучу файлов, рассматривая каждый как модуль, разрешает зависимости между ними и собирает их в статические ресурсы, готовые к развёртыванию.
+
+![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+
+В качестве простого примера, представим, что у нас есть набор модулей CommonJS. Они не могут запускаться прямо в браузере, так что нам нужно "собрать" их в единый файл, который можно будет вставить на страницу через тег `<script>`. Webpack может сделать это за нас, следуя инструкциям `require()`.
+
+Но Webpack может делать и больше. С "загрузчиками", мы можем научить Webpack преобразовывать любые типы файлов любым нужным нам образом, прежде чем выдать финальную сборку. Например:
+
+- Скомпилировать ES2015, CoffeeScript или TypeScript модули в обычные ES5 CommonJS модули;
+- Пропустить код через статический анализатор, прежде чем приступать к компиляции;
+- Скомпилировать Jade шаблоны в обычный HTML и добавить его на страницу в виде строки JavaScript;
+- Скомпилировать SASS файлы в обычный CSS, затем конвертировать его в JS скрипт, который будет добавлять полученный CSS как тег `<style>`;
+- Обработать файлы изображений, указанные в HTML или CSS, переместить их в нужное место, согласно файлу конфигурации, и переименовать, используя их md5 хеш.
+
+Webpack настолько крут, что когда вы поймете, как он работает, он значительно улучшит ваш процесс разработки клиентской части. Его основным недостатком является многословная и сложная конфигурация; но с этим руководством вы сможете найти решения для большинства задач, возникающих при работе с Webpack в сочетании с Vue.js и `vue-loader`.
diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
new file mode 100644
index 000000000..c2735607a
--- /dev/null
+++ b/docs/ru/SUMMARY.md
@@ -0,0 +1,21 @@
+- Начало работы
+  - [Из чего состоит компонент Vue](start/spec.md)
+  - [Создание проекта](start/setup.md)
+- Возможности
+  - [ES2015](features/es2015.md)
+  - [Локальный CSS](features/scoped-css.md)
+  - [CSS модули](features/css-modules.md)
+  - [PostCSS](features/postcss.md)
+  - [Горячая замена](features/hot-reload.md)
+- Настройка
+  - [Пре-процессоры](configurations/pre-processors.md)
+  - [Обработка вложенных URL](configurations/asset-url.md)
+  - [Продвинутая конфигурация](configurations/advanced.md)
+  - [Извлечение CSS в файл](configurations/extract-css.md)
+  - [Пользовательские блоки](configurations/custom-blocks.md)
+- Workflow
+  - [Production Build](workflow/production.md)
+  - [Линтинг](workflow/linting.md)
+  - [Тестирование](workflow/testing.md)
+  - [Тестирование с моками](workflow/testing-with-mocks.md)
+- [Перечень настроек](options.md)
diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
new file mode 100644
index 000000000..277a85e3c
--- /dev/null
+++ b/docs/ru/configurations/advanced.md
@@ -0,0 +1,82 @@
+# Продвинутая конфигурация vue-loader
+
+Иногда может потребоваться сделать:
+
+1. Применить пользовательский загрузчик (loader) к языку, вместо обработки его с помощью `vue-loader`;
+
+2. Переопределить встроенные настройки загрузчиков для языков по умолчанию.
+
+3. Добавить предварительную обработку или пост-обработку специфичной секции другим загрузчиком.
+
+Чтобы сделать это укажите опцию `loaders` для `vue-loader`:
+
+> Опции `preLoaders` и `postLoaders` доступны только в версиях >=10.3.0
+
+### Webpack 2.x
+
+``` js
+module.exports = {
+  // другие настройки...
+  module: {
+    // module.rules тоже самое, что и module.loaders в 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // указанные `loaders` переопределят загрузчики используемые по умолчанию
+          // Конфигурация ниже будет обрабатывать все теги <script> без атрибута "lang"
+          // с помощью coffee-loader
+          loaders: {
+            js: 'coffee-loader'
+          },
+
+          // `preLoaders` будут применены перед стандартными загрузчиками.
+          // Вы можете использовать это для предварительной обработки секций
+          // часто используемая потребность для локализации на этапе сборки.
+          preLoaders: {
+            js: '/path/to/custom/loader'
+          },
+
+          // `postLoaders` будут применены после стандартных загрузчиков.
+          //
+          // - Для `html`, результат возвращаемый стандартным загрузчиком
+          //   будет скомпилированный в JavaScript код render-функции.
+          //
+          // - Для `css`, результат возвращаемый из vue-style-loader
+          //   что не является особенно полезным в большинстве случаев.
+          //   Использование postcss-плагина будет лучшим вариантом.
+          postLoaders: {
+            html: 'babel-loader'
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+### Webpack 1.x
+
+``` js
+// webpack.config.js
+module.exports = {
+  // другие настройки...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // настройки vue-loader
+  vue: {
+    loaders: {
+      // такая же конфигурация правил как и выше
+    }
+  }
+}
+```
+
+Примером использования продвинутой конфигурации может быть например [извлечение CSS из компонентов в отдельный файл](./extract-css.md).
diff --git a/docs/ru/configurations/asset-url.md b/docs/ru/configurations/asset-url.md
new file mode 100644
index 000000000..3ccb40724
--- /dev/null
+++ b/docs/ru/configurations/asset-url.md
@@ -0,0 +1,23 @@
+# Обработка вложенных URL
+
+По умолчанию `vue-loader` автоматически обрабатывает стили и файлы шаблонов с помощью [css-loader](https://github.com/webpack/css-loader) и компилятора шаблонов Vue. В процессе компиляции, все использованные URL, такие как `<img src="...">`, `background: url(...)` и CSS `@import` будут **обрабатаны как зависимости модуля**.
+
+Например, `url(./image.png)` будет преобразовано в `require('./image.png')`, а затем
+
+``` html
+<img src="../image.png">
+```
+
+будет скомпилировано в:
+
+``` js
+createElement('img', { attrs: { src: require('../image.png') }})
+```
+
+Так как `.png` это не JavaScript-файл, вам необходимо настроить Webpack использовать [file-loader](https://github.com/webpack/file-loader) или [url-loader](https://github.com/webpack/url-loader) для их обработки. Проект создаваемый с помощью `vue-cli` уже сделает это за вас.
+
+Преимущества подобного подхода:
+
+1. `file-loader` позволяет определить куда нужно скопировать и поместить файл, а также как именовать его с добавлением в имя хэша для лучшего кеширования. Кроме того, это означает что **вы можете просто поместить изображения рядом с вашим `*.vue` файлами и использовать относительные пути, основанные на структуре каталогов, не беспокоясь об адресах при развёртывании**. При правильной конфигурации, Webpack будет автоматически заменять пути к файлам в корректные URL в итоговой сборке.
+
+2. `url-loader` позволяет вставлять файлы как base-64 ссылки если они меньше указанного размера. Это позволит уменьшить количество HTTP-запросов при использовании маленьких файлов. Если же файл больше указанного порога, то он автоматически подключится с помощью `file-loader`.
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
new file mode 100644
index 000000000..4fd39ef07
--- /dev/null
+++ b/docs/ru/configurations/custom-blocks.md
@@ -0,0 +1,67 @@
+# Пользовательские блоки
+
+> Доступно в версиях 10.2.0+
+
+Вы можете определять пользовательски блоки внутри `*.vue` файлов. Содержимое пользовательских блоков будет обрабатываться загрузчиками, указанными с объекте `loaders` настроек `vue-loader` и затем подключено модулем к компоненту. Конфигурация аналогична тому, что описано в разделе [продвинутой конфигурации загрузчиков](../configurations/advanced.md), за исключением совпадений по имени тега, вместо атрибута `lang`.
+
+Если подходящий загрузчик будет найден для пользовательского блока, он будет обработан; в противном случае пользовательский блок будет просто проигнорирован.
+
+## Пример
+
+Пример извлечения всех пользовательских блоков `<docs>` в отдельный файл документации:
+
+#### component.vue
+
+``` html
+<docs>
+## Это пример компонента.
+</docs>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            // извлечь всё содержимое тегов <docs> как обычный текст
+            'docs': ExtractTextPlugin.extract('raw-loader'),
+          }
+        }
+      }
+    ],
+    plugins: [
+      // вывести всю документацию в отдельный файл
+      new ExtractTextPlugin('docs.md')
+    ]
+  }
+}
+```
\ No newline at end of file
diff --git a/docs/ru/configurations/extract-css.md b/docs/ru/configurations/extract-css.md
new file mode 100644
index 000000000..0664bf186
--- /dev/null
+++ b/docs/ru/configurations/extract-css.md
@@ -0,0 +1,70 @@
+# Извлечение CSS в отдельный файл
+
+Пример конфигурации для извлечения CSS из всех компонентов Vue в отдельный CSS-файл:
+
+### Webpack 2.x
+
+``` bash
+npm install extract-text-webpack-plugin@2.x --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // другие настройки...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              use: 'css-loader',
+              fallback: 'vue-style-loader' // <- это внутренняя часть vue-loader, поэтому нет необходимости его устанавливать через NPM
+            })
+          }
+        }
+      },
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+### Webpack 1.x
+
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // другие настройки...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // вы также можете добавить <style lang="less"> или другие языки
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
new file mode 100644
index 000000000..67346a1ec
--- /dev/null
+++ b/docs/ru/configurations/pre-processors.md
@@ -0,0 +1,81 @@
+# Использование пре-процессоров
+
+В Webpack все пре-процессоры должны быть применены с соответствующим загрузчиком. `vue-loader` позволяет вам использовать другие загрузчики Webpack для обработки секций компонентов Vue. Они будут автоматически вызваны для обработки секций на основе указанного атрибута `lang` у секции файла.
+
+### CSS
+
+Например, пусть в теге `<style>` будет использоваться SASS:
+
+``` bash
+npm install sass-loader node-sass --save-dev
+```
+
+``` html
+<style lang="sass">
+  /* используем SASS здесь */
+</style>
+```
+
+В недрах, текстовое содержимое тега `<style>` будет сперва скомпилировано с помощью `sass-loader` перед передачей для дальнейшей обработки.
+
+#### Особенность sass-loader
+
+Вопреки тому, что он называется [*sass*-loader](https://github.com/jtangelder/sass-loader), по умолчанию парсится синтаксис *SCSS*. Если вы на самом деле хотите использовать синтаксис *SASS* с отступами, вам требуется настроить vue-loader для sass-loader соответственно.
+
+```javascript
+{
+  test: /\.vue$/,
+  loader: 'vue-loader',
+  options: {
+    loaders: {
+      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
+    }
+  }
+}
+```
+
+Обратитесь к разделу [продвинутой конфигурации загрузчиков](./advanced.md) для получения дополнительной информации о том, как настраивать vue-loader.
+
+### JavaScript
+
+Весь JavaScript внутри Vue компонентов обрабатывается `babel-loader` по умолчанию. При необходимости это можно изменить:
+
+``` bash
+npm install coffee-loader --save-dev
+```
+
+``` html
+<script lang="coffee">
+  # Пишем на coffeescript!
+</script>
+```
+
+### Шаблоны
+
+Обработка шаблонов выполняется несколько иначе, потому что большинство loader'ов шаблонов Webpack, например `pug-loader`, возвращают функцию шаблона вместо скомпилированного в строку HTML. Поэтому вместо использования `pug-loader`, можно просто установить оригинальный `pug`:
+
+``` bash
+npm install pug --save-dev
+```
+
+``` html
+<template lang="pug">
+div
+  h1 Hello world!
+</template>
+```
+
+> **Внимание:** При использовании `vue-loader@<8.2.0`, вам также необходимо установить `template-html-loader`.
+
+### Непосредственное указание loader'ов
+
+Вы можете указывать [опции для loader'ов Webpack](https://webpack.github.io/docs/loaders.html#introduction) в атрибуте `lang`:
+
+``` html
+<style lang="sass?outputStyle=expanded">
+  /* используем SASS с расширенным выводом */
+</style>
+```
+
+Обратите внимание, это сделает ваш компонент Vue зависимым от Webpack и несовместимым с Browserify и [vueify](https://github.com/vuejs/vueify). **Если вы планируете распространять ваш компонент Vue, избегайте использования этого синтаксиса.**
diff --git a/docs/ru/features/css-modules.md b/docs/ru/features/css-modules.md
new file mode 100644
index 000000000..d73760a90
--- /dev/null
+++ b/docs/ru/features/css-modules.md
@@ -0,0 +1,117 @@
+# CSS модули
+
+> требуется версия 9.8.0 или выше
+
+[CSS модули](https://github.com/css-modules/css-modules) — это популярная система для модульности и компоновки CSS. `vue-loader` предоставляет первоклассную интеграцию с CSS модулями как возможную альтернативу эмулируемого scoped CSS.
+
+### Использование
+
+Просто добавьте атрибут `module` к тегу `<style>`:
+
+``` html
+<style module>
+.red {
+  color: red;
+}
+.bold {
+  font-weight: bold;
+}
+</style>
+```
+
+Это включит режим CSS-модулей в `css-loader`, и полученный индентификатор объекта класса будет внедрен в компонент как вычисляемое свойство с именем `$style`. Вы можете использовать его в своих шаблонах для динамического добавления классов:
+
+``` html
+<template>
+  <p :class="$style.red">
+    Этот текст будет красным
+  </p>
+</template>
+```
+
+Поскольку это вычисляемое свойство, оно также будет работает с объектом/массивом в `:class`:
+
+``` html
+<template>
+  <div>
+    <p :class="{ [$style.red]: isRed }">
+      Буду ли я красным?
+    </p>
+    <p :class="[$style.red, $style.bold]">
+      Красный и жирный
+    </p>
+  </div>
+</template>
+```
+
+Вы также можете получить доступ в JavaScript:
+
+``` html
+<script>
+export default {
+  created () {
+    console.log(this.$style.red)
+    // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
+    // идентификатор генерируется на основе имени файла и className.
+  }
+}
+</script>
+```
+
+Обратитесь к [спецификации CSS-модулей](https://github.com/css-modules/css-modules) для получения информации о [глобальных исключениях](https://github.com/css-modules/css-modules#exceptions) и [композиции](https://github.com/css-modules/css-modules#composition).
+
+### Указание внедряемого имени модуля
+
+У вас может быть более одного `<style>` тега в одном `*.vue` компоненте. Во избежание перезаписи внедряемых стилей вы можете указать имя внедряемого вычисляемого свойства в значении атрибута `module`:
+
+``` html
+<style module="a">
+  /* идентификатор будет внедрён как a */
+</style>
+
+<style module="b">
+  /* идентификатор будет внедрён как b */
+</style>
+```
+
+### Настройка параметров `css-loader`
+
+CSS-модули обрабатываются с помощью [css-loader](https://github.com/webpack/css-loader). При использовании `<style module>` настройки `css-loader` по умолчанию будут такими:
+
+``` js
+{
+  modules: true,
+  importLoaders: true,
+  localIdentName: '[hash:base64]'
+}
+```
+
+Вы можете использовать в `vue-loader` опцию `cssModules` чтобы добавить дополнительные параметры для `css-loader`:
+
+``` js
+// webpack 1
+vue: {
+  cssModules: {
+    // другой шаблон для локального имени идентификатора
+    localIdentName: '[path][name]---[local]---[hash:base64:5]',
+    // использование camelCase
+    camelCase: true
+  }
+}
+
+// webpack 2
+module: {
+  rules: [
+    {
+      test: '\.vue$',
+      loader: 'vue-loader',
+      options: {
+        cssModules: {
+          localIdentName: '[path][name]---[local]---[hash:base64:5]',
+          camelCase: true
+        }
+      }
+    }
+  ]
+}
+```
diff --git a/docs/ru/features/es2015.md b/docs/ru/features/es2015.md
new file mode 100644
index 000000000..ec3ea09c0
--- /dev/null
+++ b/docs/ru/features/es2015.md
@@ -0,0 +1,65 @@
+# ES2015
+
+Когда `vue-loader` обнаруживает наличие `babel-loader` или `buble-loader` в том же проекте, он будет использовать их для обработки секций `<script>` всех `*.vue` файлов, позволяя использовать возможности ES2015 в компонентах Vue. Если вы ещё не использовали новые возможности языка, вам определённо стоит начать. Несколько хороших учебных ресурсов:
+
+- [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+- [ES6 Features](https://github.com/lukehoban/es6features)
+- [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
+
+Например типичный шаблон, который вы видите при импорте других компонентов Vue:
+
+``` html
+<script>
+import ComponentA from './ComponentA.vue'
+import ComponentB from './ComponentB.vue'
+
+export default {
+  components: {
+    ComponentA,
+    ComponentB
+  }
+}
+</script>
+```
+
+В нём была использована краткая запись свойства объекта, доступная в ES2015 для определения дочерних компонентов. `{ ComponentA }` это попросту сокращение от `{ ComponentA: ComponentA }`. Vue автометически преобразует ключ в `component-a`, так что вы можете использовать импортированный компонент в шаблоне как `<component-a>`.
+
+### ES2015 в шаблонах
+
+Секция `<template>` в `*.vue` файлах компилируется в `render`-функцию на JavaScript и потом обрабатывается собственной сборкой [Buble](https://buble.surge.sh/guide/) для поддержки ES2015. Это позволяет вам использовать такие возможности как [краткую запись свойства объекта](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) и [вычисляемые свойства](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
+
+``` html
+<div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
+```
+
+можно упростить до:
+
+``` html
+<div :class="{ active, [`${prefix}-button`]: isButton }">
+```
+
+**только для версий vue@^2.1.0:** Вы можете использовать деструктуризацию параметров в `v-for` или слотах с ограниченной областью видимости:
+
+``` html
+<li v-for="{ id, text } in items">
+  {{ id }} {{ text }}
+</li>
+```
+
+``` html
+<my-component>
+  <template scope="{ id, text }">
+    <span>{{ id }} {{ text }}</span>
+  </template>
+</my-component>
+```
+
+Вы также можете настроить доступные возможности в шаблонах с помощью [опции `buble`](../options.md#buble).
+
+### Транспиляция обычных `.js` файлов
+
+Так как `vue-loader` обрабатывает только `*.vue` файлы, вам нужно настроить в файле конфигурации Webpack чтобы обычные `*.js` файлы обрабатывались с помощью `babel-loader` или `buble-loader`. Проект созданный с помощью `vue-cli` уже настроен таким образом.
+
+### Настройка Babel с помощью `.babelrc`
+
+`babel-loader` предпочитает [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), поэтому рекомендуем использовать именно его для настройки пресетов и плагинов Babel.
diff --git a/docs/ru/features/hot-reload.md b/docs/ru/features/hot-reload.md
new file mode 100644
index 000000000..58844d5f5
--- /dev/null
+++ b/docs/ru/features/hot-reload.md
@@ -0,0 +1,7 @@
+# Горячая замена
+
+"Горячая замена" это не просто обновление страницы, когда вы отредактируете файл. При использовании горячей замены, когда вы отредактируете `*.vue` файл, все экземпляры этого компонента будут заменены **без перезагрузки страницы**. При этом даже будет сохранено текущее состояние вашего приложения и заменяемых компонентов! Это значительно улучшает процесс разработки, особенно когда вы занимаетесь тонкой настройкой шаблонов или стилей ваших компонентов.
+
+![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
+
+При создании проекта с помощью `vue-cli`, горячая замена включена по умолчанию.
diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
new file mode 100644
index 000000000..5229e69ac
--- /dev/null
+++ b/docs/ru/features/postcss.md
@@ -0,0 +1,68 @@
+# PostCSS
+
+Любой CSS проходящий через `vue-loader` обрабатывается [PostCSS](https://github.com/postcss/postcss) для реализации функциональности scoped CSS. Вы также можете добавить другие плагины PostCSS к процессу обработки. Например, [autoprefixer](https://github.com/postcss/autoprefixer) или [CSSNext](http://cssnext.io/).
+
+## Использование файла конфигурации
+
+Начиная с версии 11.0 `vue-loader` поддерживает файлы конфигурации PostCSS поддерживаемые с помощью [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
+
+- `postcss.config.js`
+- `.postcssrc`
+- `postcss` поле в `package.json`
+
+Рекомендуется использовать файл конфигурации, это позволяет использовать один и тот же конфиг для обработки ваших CSS файлов, обрабатываемых `postcss-loader` и CSS внутри `*.vue` файлов.
+
+## Указание настроек в опциях vue-loader
+
+В качестве альтернативы, вы можете указать конфигурацию PostCSS специально для `*.vue` файлов с помощью опции `postcss` для `vue-loader`.
+
+Пример использования с Webpack 1.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // другие настройки...
+  vue: {
+    // использование плагинов postcss
+    postcss: [require('postcss-cssnext')()]
+  }
+}
+```
+
+Для Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // другие настройки...
+  module: {
+    // module.rules тоже самое, что и module.loaders в 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        // настройки vue-loader
+        options: {
+          // ...
+          postcss: [require('postcss-cssnext')()]
+        }
+      }
+    ]
+  }
+}
+```
+
+В дополнение к возможности использовать массив плагинов, опция `postcss` также принимает:
+
+- Функцию, возвращающую массив плагинов;
+
+- Объект, который содержит настройки для передачи в PostCSS. Это пригодится если вы используете проекты с PostCSS которые опираются на пользовательские парсеры/сериализаторы:
+
+  ``` js
+  postcss: {
+    plugins: [...], // список плагинов
+    options: {
+      parser: sugarss // использование парсера sugarss
+    }
+  }
+  ```
diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
new file mode 100644
index 000000000..46448e7d3
--- /dev/null
+++ b/docs/ru/features/scoped-css.md
@@ -0,0 +1,51 @@
+# Локальный CSS
+
+Когда у тега `<style>` есть атрибут `scoped`, то его CSS будет применяться только к элементам текущего компонента. Это похоже на инкапсуляцию стилей в Shadow DOM. Ими можно пользоваться с некоторыми оговорками, но не требуется никаких полифиллов. Это достигается за счёт использования PostCSS для преобразования следующего:
+
+``` html
+<style scoped>
+.example {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+В что-то подобное:
+
+``` html
+<style>
+.example[_v-f3f3eg9] {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example" _v-f3f3eg9>hi</div>
+</template>
+```
+
+#### Примечания
+
+1. Вы можете использовать в компоненте локальные и глобальные стили одновременно:
+
+  ``` html
+  <style>
+  /* глобальные стили */
+  </style>
+
+  <style scoped>
+  /* локальные стили */
+  </style>
+  ```
+
+2. Корневой тег компонента потомка будет попадать под область видимости родительского локального CSS и своего локального CSS.
+
+3. Partials не затрагиваются локальными стилями.
+
+4. **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](http://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
+
+5. **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.
diff --git a/docs/ru/options.md b/docs/ru/options.md
new file mode 100644
index 000000000..4855dbcf9
--- /dev/null
+++ b/docs/ru/options.md
@@ -0,0 +1,187 @@
+# Перечень настроек
+
+## Отличия в использовании с Webpack 1 & 2
+
+Для Webpack 2: настройки можно передавать непосредственно в правилах загрузчиков.
+
+``` js
+module.exports = {
+  // ...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // настройки vue-loader
+        }
+      }
+    ]
+  }
+}
+```
+
+Для Webpack 1.x: добавить блок `vue` в корень конфигурации Webpack:
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // настройки vue-loader
+  }
+}
+```
+
+### loaders
+
+- Тип: `{ [lang: string]: string }`
+
+  Объект определяющий какие загрузчики Webpack переопределят стандартные загрузчики, используемые для обработки секций `*.vue` файлов. Ключ соответствует атрибуту `lang` у секции файла, если таковой был указан. Значения `lang` по умолчанию:
+
+  - `<template>`: `html`
+  - `<script>`: `js`
+  - `<style>`: `css`
+
+  Например, чтобы использовать `babel-loader` и `eslint-loader` для обработки всех секций `<script>`:
+
+  ``` js
+  // Конфигурация Webpack 2.x
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: 'babel-loader!eslint-loader'
+          }
+        }
+      }
+    ]
+  }
+  ```
+
+### preLoaders
+
+- Тип: `{ [lang: string]: string }`
+- поддерживается только в версиях >=10.3.0
+
+  Конфигурация подобна как и в `loaders`, но `preLoaders` будут применены к соответствующим секциям перед стандартными загрузчиками. Вы можете использовать это для предварительной обработки секций - например для локализации на этапе сборки.
+
+### postLoaders
+
+- Тип: `{ [lang: string]: string }`
+- поддерживается только в версиях >=10.3.0
+
+  Конфигурация подобна как и в `loaders`, но `postLoaders` применяются после загрузчиков по умолчанию. Вы можете использовать это для пост-обработки языков. Обратите внимание, что тем не менее всё несколько сложнее:
+
+  - Для `html`, результат возвращаемый стандартным загрузчиком будет скомпилированный в JavaScript код render-функции.
+
+  - Для `css`, результат возвращаемый из `vue-style-loader`,что не является особенно полезным в большинстве случаев. Использование postcss-плагина будет лучшим вариантом.
+
+### postcss
+
+> Примечание: в версиях >=11.0.0 рекомендуется использовать файл конфигурации PostCSS вместо описания секции. [Использование аналогично как в `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+
+- Тип: `Array` или `Function` или `Object`
+
+  Определяет список плагинов PostCSS, которые будут применяться к CSS внутри `*.vue` файлов. Если используется функция, то она будет вызвана в контексте того же loader'а и должна возвращать массив плагинов.
+
+  ``` js
+  // ...
+  {
+    loader: 'vue-loader',
+    options: {
+      // примечание: не вкладывайте опции `postcss` внутри `loaders`
+      postcss: [require('postcss-cssnext')()],
+      loaders: {
+        // ...
+      }
+    }
+  }
+  ```
+
+  Эта опция также может быть объектом, который содержит настройки для PostCSS. Это пригодится в проектах с PostCSS, где используются собственные парсеры/сериализаторы:
+
+  ``` js
+  postcss: {
+    plugins: [...], // список плагинов
+    options: {
+      parser: sugarss // использование парсера sugarss
+    }
+  }
+  ```
+
+### cssSourceMap
+
+- Тип: `Boolean`
+- По умолчанию: `true`
+
+  Использование source maps для CSS. Отключение этой опции может позволить избежать некоторых багов с относительными путями в `css-loader` и сделать сборку немного быстрее.
+
+  Обратите внимание, эта опция автоматически устанавливается в `false` при отсутствии опции `devtool` в файле конфигурации Webpack.
+
+### esModule
+
+- Тип: `Boolean`
+- По умолчанию: `undefined`
+
+  Генерация esModule совместимого кода. По умолчанию vue-loader генерирует модули в формате commonjs `module.exports = ....`. Когда опция `esModule` установлена в true, экспорт по умолчанию (default export) будет преобразован в `exports.__esModule = true; exports = ...`. Это может быть полезным для настройки взаимодействия с транспиляторами, отличными от  Babel, как например TypeScript.
+
+### preserveWhitespace
+
+- Тип: `Boolean`
+- По умолчанию: `true`
+
+  При установке в `false` пробельные символы между HTML тегами в шаблонах будут проигнорированы.
+
+### transformToRequire
+
+- Тип: `{ [tag: string]: string | Array<string> }`
+- По умолчанию: `{ img: 'src' }`
+
+  Во время компиляции шаблона, компилятор может преобразовывать определённые атрибуты, такие как `src` в ссылках, в вызовы `require`, таким образом чтобы файл обрабатывался с помощью Webpack. Конфигурация по умолчанию преобразует `src` атрибуты внутри тегов `<img>`.
+
+### buble
+
+- Тип: `Object`
+- По умолчанию: `{}`
+
+  Настройка параметров для `buble-loader` (есть он присутствует), И buble-компиляции для шаблонов рендер-функций.
+
+  > Примечание: в версиях 9.x, выражения шаблонов настраивались отдельно через опцию `templateBuble`, что удалена в новых версиях.
+
+  Компиляция шаблонов рендер-функций поддерживает специальное преобразование `stripWith` (включена по умолчанию), которая удаляет использование `with` в генерируемых рендер-функциях для соответствия режиму strict.
+
+  Пример конфигурации:
+
+  ``` js
+  // webpack 1
+  vue: {
+    buble: {
+      // enable object spread operator
+      // ПРИМЕЧАНИЕ: вам нужно самостоятельно подключить полифилл для Object.assign!
+      objectAssign: 'Object.assign',
+
+      // отключение удаления `with`
+      transforms: {
+        stripWith: false
+      }
+    }
+  }
+
+  // webpack 2
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          buble: {
+            // теже настройки
+          }
+        }
+      }
+    ]
+  }
+  ```
diff --git a/docs/ru/start/setup.md b/docs/ru/start/setup.md
new file mode 100644
index 000000000..241c07bd0
--- /dev/null
+++ b/docs/ru/start/setup.md
@@ -0,0 +1,13 @@
+# Создание проекта
+
+### Использование `vue-cli`
+
+Рекомендуем создавать проекты, использующие `vue-loader`, с помощью `vue-cli`:
+
+``` bash
+npm install -g vue-cli
+vue init webpack-simple hello-vue
+cd hello-vue
+npm install
+npm run dev # можно начинать!
+```
diff --git a/docs/ru/start/spec.md b/docs/ru/start/spec.md
new file mode 100644
index 000000000..659fa1e41
--- /dev/null
+++ b/docs/ru/start/spec.md
@@ -0,0 +1,111 @@
+# Из чего состоит компонент Vue
+
+Файл `*.vue` это собственный формат Vue, использующий HTML-подобный синтаксис для описания компонента. Каждый `*.vue` файл состоит из трёх главных секций: `<template>`, `<script>` и `<style>`, а также опциональных пользовательских блоков:
+
+``` html
+<template>
+  <div class="example">{{ msg }}</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello world!'
+    }
+  }
+}
+</script>
+
+<style>
+.example {
+  color: red;
+}
+</style>
+
+<custom1>
+  Это может быть, например, документация для компонента
+</custom1>
+```
+
+`vue-loader` парсит файл, извлекает каждую из секций, обрабатывает их при необходимости другими loader'ами, и в итоге собирает всё обратно в модуль CommonJS где `module.exports` будет объектом настроек компонента Vue.js.
+
+`vue-loader` предоставляет возможность использовать нестандартные языки, например пре-процессоры CSS и языки шаблонов компилируемые в HTML просто указав атрибут `lang` для секции файла. Например, вы можете использовать SASS для стилей вашего компонента:
+
+``` html
+<style lang="sass">
+  /* используем SASS! */
+</style>
+```
+
+Подробнее на странице [использования пре-процессоров](../configurations/pre-processors.md).
+
+### Секции файла
+
+#### `<template>`
+
+- Язык по умолчанию: `html`.
+
+- Каждый `*.vue` файл может содержать максимум один блок `<template>`.
+
+- Содержимое будет извлечено как строка и использовано как опция `template` для скомпилированного компонента Vue.
+
+#### `<script>`
+
+- Язык по умолчанию: `js` (ES2015 поддерживается автоматически при обнаружении `babel-loader` или `buble-loader`).
+
+- Каждый `*.vue` файл может содержать максимум один блок `<script>`.
+
+- Скрипт исполняется в окружении CommonJS (как обычный `.js` модуль, собранный с помощью Webpack), что позволяет вам использовать `require()` для подключения других зависимостей. А вместе с поддержкой ES2015, можно использовать также синтаксис `import` и `export`.
+
+- Скрипт должен экспортировать объект с настройками компонента Vue.js. Экспортирование расширенного конструктора, созданного через `Vue.extend()`, также поддерживается, но просто объект предпочтительнее.
+
+#### `<style>`
+
+- Язык по умолчанию: `css`.
+
+- Может быть несколько тегов `<style>` в одном `*.vue` файле.
+
+- Тег `<style>` может иметь `scoped` или `module` атрибуты (подробнее — [Scoped CSS](../features/scoped-css.md) и [CSS модули](../features/css-modules.md)) для возможности инкапсулировать стили в текущий компонент. Несколько тегов `<style>` с разными режимами инкапсуляции могут быть использованы в одном компоненте.
+
+- По умолчанию, содержимое будет извлечено и динамически вставлено в тег `<head>` документа обычным тегом `<style>` с помощью `style-loader`. Также возможно [настроить Webpack чтобы извлекать стили всех компонентов в один CSS-файл](../configurations/extract-css.md).
+
+### Пользовательские блоки
+
+> Доступно только в версиях vue-loader 10.2.0+
+
+Дополнительные пользовательские блоки могут быть добавлены в `*.vue` файл для любых потребностей проекта, например блок `<docs>`. `vue-loader` будет использовать имя тега для определения какими загрузчиками Webpack требуется обрабатывать содержимое этой секции. Загрузчики Webpack должны быть указаны в секции `loaders` настроек `vue-loader`.
+
+Подробнее в разделе [пользовательских блоков](../configurations/custom-blocks.md).
+
+### Импорт содержимого из других файлов
+
+Если вы предпочитаете разделять `*.vue` компоненты на несколько файлов, вы можете использовать атрибут `src` для импорта содержимого другого файла в секцию, например:
+
+``` html
+<template src="./template.html"></template>
+<style src="./style.css"></style>
+<script src="./script.js"></script>
+```
+
+Имейте ввиду, что импорт через `src` следует тем же правилам определения пути до файлу, как и вызовы `require()` в CommonJS, что означает необходимость начинать относительные пути с `./`, и также возможность подключать ресурсы непосредственно из установленных NPM-пакетов, например:
+
+``` html
+<!-- импорт файла из установленного NPM пакета "todomvc-app-css" -->
+<style src="todomvc-app-css/index.css">
+```
+
+`src` импорт также поддерживает пользовательские блоки, например:
+
+``` html
+<unit-test src="./unit-test.js">
+</unit-test>
+```
+
+### Подсветка синтаксиса
+
+На данный момент есть поддержка подсвестки синтаксиса для [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), и [продуктов JetBrains](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, и т.п.). Будем рады видеть разработки и для других редакторов и IDE! Если вы не используете никаких пре-процессоров в компонентах Vue, вы также можете использовать синтаксис HTML в вашем редакторе для `*.vue` файлов.
+
+### Комментарии
+
+Внутри каждой секции вы можете использовать синтаксис комментарией, который соответствует используемому языку (HTML, CSS, JavaScript, Pug, и т.д.). Для комментариев на уровне секций, используйте синтаксис комментариев HTML: `<!-- ваш комментарий -->`
diff --git a/docs/ru/workflow/linting.md b/docs/ru/workflow/linting.md
new file mode 100644
index 000000000..e55a1171b
--- /dev/null
+++ b/docs/ru/workflow/linting.md
@@ -0,0 +1,93 @@
+# Статические анализаторы
+
+Вы, возможно, гадаете, как же прогонять код в `*.vue` файлах через статические анализаторы, поскольку это не JavaScript. Мы предполагаем, что вы используете [ESLint](http://eslint.org/) (если нет, настоятельно рекомендуем!).
+
+Вам также понадобится [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) с поддержкой извлечения и анализа JavaScript в `*.vue` файлах.
+
+Убедитесь в том, что вы добавили плагин в конфигурацию ESLint:
+
+``` json
+"plugins": [
+  "html"
+]
+```
+
+Затем в командной строке:
+
+``` bash
+eslint --ext js,vue MyComponent.vue
+```
+
+Другой вариант – использовать [eslint-loader](https://github.com/MoOx/eslint-loader), который будет автоматически анализировать `*.vue` файлы после сохранения во время разработки:
+
+``` bash
+npm install eslint eslint-loader --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... прочие опции
+  module: {
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue!eslint'
+      }
+    ]
+  }
+}
+```
+
+Обратите внимание, что загрузчики Webpack применяются **справа-налево**. Убедитесь, что `eslint` прописан перед `vue`, чтобы код сначала проходил через анализатор, а затем компилировался.
+
+Стоит упомянуть об использовании сторонних `*.vue` компонентов, поставляемых в NPM пакетах. В таком случае нам нужно воспользоваться `vue-loader`? чтобы подключить сторонние компоненты, но не анализировать их. Мы можем вынести анализ в [предзагрузчики](https://webpack.github.io/docs/loaders.html#loader-order) Webpack:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... прочие опции
+  module: {
+    // анализировать только локальные *.vue файлы
+    preLoaders: [
+      {
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      }
+    ],
+    // но использовать vue-loader для всех *.vue файлов
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```
+
+Для Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... прочие опции
+  module: {
+    rules: [
+      // анализировать только локальные *.vue файлы
+      {
+        enforce: 'pre',
+        test: /.vue$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/
+      },
+      // но использовать vue-loader для всех *.vue файлов
+      {
+        test: /.vue$/,
+        loader: 'vue-loader'
+      }
+    ]
+  }
+}
+```
diff --git a/docs/ru/workflow/production.md b/docs/ru/workflow/production.md
new file mode 100644
index 000000000..11bd6f453
--- /dev/null
+++ b/docs/ru/workflow/production.md
@@ -0,0 +1,39 @@
+# Сборка продакшна
+
+Когда мы собираем финальную версию приложения, мы делаем две вещи:
+
+1. Минифицируем код нашего приложения;
+2. Используем [описанные в руководстве по Vue.js настройки](https://vuejs.org/guide/deployment.html), чтобы устранить все возможные проблемы в коде
+
+Вот пример конфигурации:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... прочие опции
+  plugins: [
+    // разбираемся со всеми предупреждениями в нашем Vue.js коде
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    // минифицируем, устраняя весь ненужный код
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    // оптимизируем идентификаторы модулей по числу использований
+    new webpack.optimize.OccurenceOrderPlugin()
+  ]
+}
+```
+
+Очевидно, нам ни к чему использовать эту конфигурацию во время разработки, для этого есть несколько вариантов:
+
+1. Динамически собирать объект конфигурации на основе переменных окружения;
+
+2. Или использовать два отдельных конфигурационных файла Webpack, один для разработки, и один для продакшна. И возможно хранить некоторые их общие опции в третьем файле, как показано в [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+
+Не имеет значения, как вы будете это делать, если это решит задачу.
diff --git a/docs/ru/workflow/testing-with-mocks.md b/docs/ru/workflow/testing-with-mocks.md
new file mode 100644
index 000000000..5326d0543
--- /dev/null
+++ b/docs/ru/workflow/testing-with-mocks.md
@@ -0,0 +1,72 @@
+# Тестирование с моками
+
+В настоящих приложениях наши компоненты скорее всего будут иметь внешние зависимости. Было бы прекрасно, если бы мы могли полностью контролировать эти зависимости в наших тестах, чтобы они опирались только на поведение тестируемого компонента.
+
+Для этого в модульных тестах используется понятие "мок" ("mock") – это объект, за вызовами методов которого мы можем следить и даже управлять их результатами. Чтобы не тестировать и компонент, и его зависимость в связке, нам достаточно внедрить вместо зависимости созданный мок-объект.
+
+`vue-loader` предоставляет возможность внедрять произвольные зависимости в `*.vue` компоненты, используя [inject-loader](https://github.com/plasticine/inject-loader). Основная идея состоит в том, что вместо прямой подгрузки модуля компонента мы используем `inject-loader`, чтобы создать "фабричную функцию" для этого модуля. Когда мы вызовем эту функцию с мок-объектом, она вернет нам экземпляр модуля с внедренными мок-объектами.
+
+Допустим, у нас есть следующий компонент:
+
+``` html
+<!-- example.vue -->
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+// эту зависимость нужно подменить мок-объектом
+import SomeService from '../service'
+
+export default {
+  data () {
+    return {
+      msg: SomeService.msg
+    }
+  }
+}
+</script>
+```
+
+Вот как получить его с мок-объектами:
+
+> Заметка: inject-loader@3.x еще не в стабильной версии
+
+``` bash
+npm install inject-loader@^2.0.0 --save-dev
+```
+
+``` js
+// example.spec.js
+const ExampleInjector = require('!!vue?inject!./example.vue')
+```
+
+Обратите внимание на эту безумную строку импорта – мы используем [запросы к webpack загрузчику](https://webpack.github.io/docs/loaders.html). Краткое пояснение:
+
+- `!!` в начале строки означает "отключи все загрузчики из глобальной конфигурации"
+- `vue?inject!` значит "используй `vue` загрузчик и передай запрос `?inject`". Это заставляет `vue-loader` скомпилировать компонент в режиме внедрения зависимостей.
+
+Полученный `ExampleInjector` – это фабричная функция, которую можно вызвать, чтобы создать экземпляр модуля `example.vue`:
+
+``` js
+const ExampleWithMocks = ExampleInjector({
+  // mock it
+  '../service': {
+    msg: 'Привет от мок-сервиса!'
+  }
+})
+```
+
+Наконец, мы можем тестировать компонент как обычно:
+
+``` js
+it('should render', () => {
+  const vm = new Vue({
+    template: '<div><test></test></div>',
+    components: {
+      'test': ExampleWithMocks
+    }
+  }).$mount()
+  expect(vm.$el.querySelector('.msg').textContent).toBe('Привет от мок-сервиса!')
+})
+```
diff --git a/docs/ru/workflow/testing.md b/docs/ru/workflow/testing.md
new file mode 100644
index 000000000..389eac419
--- /dev/null
+++ b/docs/ru/workflow/testing.md
@@ -0,0 +1,102 @@
+# Тестирование
+# Testing
+
+> [Шаблон webpack vue-cli](https://github.com/vuejs-templates/webpack) предлагает вам готовые решения для модульного и e2e-тестирования.
+
+Тестируя `*.vue` файлы, мы не можем использовать обычные тестовые движки для CommonJS, поскольку они не знают, как обрабатывать `*.vue` файлы. Вместо этого мы снова воспользуемся Webpack + vue-loader для сборки наших тестов. Мы рекомендуем использовать сочетание [Karma](http://karma-runner.github.io/0.13/index.html) и [karma-webpack](https://github.com/webpack/karma-webpack).
+
+Karma – это тестовый движок, который запускает браузеры и прогоняет тесты за вас. Вы можете выбрать, в каких браузерах выполнять тесты и какой тестовый фреймворк использовать (например, Mocha или Jasmin). Вот пример конфигурации Karma для тестирования в [PhantomJS](http://phantomjs.org/) с помощью фреймворка [Jasmine](http://jasmine.github.io/edge/introduction.html):
+
+``` bash
+npm install\
+  karma karma-webpack\
+  karma-jasmine jasmine-core\
+  karma-phantomjs-launcher phantomjs\
+  --save-dev
+```
+
+``` js
+// мы можем воспользоваться тем же файлом конфигурации,
+// однако, не забудьте удалить оригинальную точку входа,
+// поскольку во время тестирования нам она не нужна
+var webpackConfig = require('./webpack.config.js')
+delete webpackConfig.entry
+
+// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    browsers: ['PhantomJS'],
+    frameworks: ['jasmine'],
+    // это файл точки входа для всех наших тестов.
+    files: ['test/index.js'],
+    // передаем файл точки входа в webpack для сборки.
+    preprocessors: {
+      'test/index.js': ['webpack']
+    },
+    // используем конфигурацию webpack
+    webpack: webpackConfig,
+    // избегаем стены бесполезного текста
+    webpackMiddleware: {
+      noInfo: true
+    },
+    singleRun: true
+  })
+}
+```
+
+И для файла точки входа `test/index.js`:
+
+``` js
+// test/index.js
+// подтягиваем все файлы тестов, используя специальную возможность Webpack
+// https://webpack.github.io/docs/context.html#require-context
+var testsContext = require.context('.', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+```
+
+Эта точка входа просто подтягивает все другие файлы, названия которых заканчиваются на `.spec.js` в ту же папку. Теперь мы наконец-то можем написать немного тестов:
+
+``` js
+// test/component-a.spec.js
+var Vue = require('vue')
+var ComponentA = require('../../src/components/a.vue')
+
+describe('a.vue', function () {
+
+  // проверяем свойства JavaScript-объекта
+  it('should have correct message', function () {
+    expect(ComponentA.data().msg).toBe('Привет от компонента A!')
+  })
+
+  // проверяем результаты рендеринга, вызывая рендер компонента
+  it('should render correct message', function () {
+    var vm = new Vue({
+      template: '<div><test></test></div>',
+      components: {
+        'test': ComponentA
+      }
+    }).$mount()
+    expect(vm.$el.querySelector('h2.red').textContent).toBe('Привет от компонента A!')
+  })
+})
+```
+
+Чтобы запустить тесты, добавьте следующий NPM скрипт:
+
+``` js
+// package.json
+...
+"scripts": {
+  ...
+  "test": "karma start karma.conf.js"
+}
+...
+```
+
+Наконец, запускаем:
+
+``` bash
+npm test
+```
+
+Опять же, [шаблон webpack vue-cli](https://github.com/vuejs-templates/webpack) содержит готовый рабочий пример с тестами.

From 3872eaa1ba5dd6e6c3369fcb0ced2761dc23578c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Sat, 18 Feb 2017 07:07:37 -0200
Subject: [PATCH 511/877] Updated (#652)

---
 docs/LANGS.md                                 |  2 +-
 docs/{pt => pt_BR}/README.md                  | 10 ++--
 docs/{pt => pt_BR}/SUMMARY.md                 |  6 +--
 docs/{pt => pt_BR}/configurations/advanced.md |  4 +-
 .../{pt => pt_BR}/configurations/asset-url.md |  8 +--
 .../configurations/custom-blocks.md           |  2 +-
 .../configurations/extract-css.md             | 50 +++++++++---------
 .../configurations/pre-processors.md          |  6 +--
 docs/{pt => pt_BR}/features/css-modules.md    |  0
 docs/{pt => pt_BR}/features/es2015.md         | 10 ++--
 docs/{pt => pt_BR}/features/hot-reload.md     |  0
 docs/{pt => pt_BR}/features/postcss.md        | 20 +++++--
 docs/{pt => pt_BR}/features/scoped-css.md     |  0
 docs/{pt => pt_BR}/options.md                 | 52 +++++++++++--------
 docs/{pt => pt_BR}/start/setup.md             |  6 +--
 docs/{pt => pt_BR}/start/spec.md              | 46 +++++++++++-----
 docs/{pt => pt_BR}/workflow/linting.md        |  2 +-
 docs/{pt => pt_BR}/workflow/production.md     |  2 +-
 .../workflow/testing-with-mocks.md            |  4 +-
 docs/{pt => pt_BR}/workflow/testing.md        |  0
 20 files changed, 133 insertions(+), 97 deletions(-)
 rename docs/{pt => pt_BR}/README.md (81%)
 rename docs/{pt => pt_BR}/SUMMARY.md (81%)
 rename docs/{pt => pt_BR}/configurations/advanced.md (96%)
 rename docs/{pt => pt_BR}/configurations/asset-url.md (63%)
 rename docs/{pt => pt_BR}/configurations/custom-blocks.md (71%)
 rename docs/{pt => pt_BR}/configurations/extract-css.md (94%)
 rename docs/{pt => pt_BR}/configurations/pre-processors.md (84%)
 rename docs/{pt => pt_BR}/features/css-modules.md (100%)
 rename docs/{pt => pt_BR}/features/es2015.md (86%)
 rename docs/{pt => pt_BR}/features/hot-reload.md (100%)
 rename docs/{pt => pt_BR}/features/postcss.md (58%)
 rename docs/{pt => pt_BR}/features/scoped-css.md (100%)
 rename docs/{pt => pt_BR}/options.md (75%)
 rename docs/{pt => pt_BR}/start/setup.md (69%)
 rename docs/{pt => pt_BR}/start/spec.md (63%)
 rename docs/{pt => pt_BR}/workflow/linting.md (95%)
 rename docs/{pt => pt_BR}/workflow/production.md (96%)
 rename docs/{pt => pt_BR}/workflow/testing-with-mocks.md (94%)
 rename docs/{pt => pt_BR}/workflow/testing.md (100%)

diff --git a/docs/LANGS.md b/docs/LANGS.md
index ab4640e05..da850e148 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1,4 +1,4 @@
 * [English](en/)
 * [한국어](kr/)
 * [Русский](ru/)
-* [Português](pt/)
\ No newline at end of file
+* [Português](pt_BR/)
\ No newline at end of file
diff --git a/docs/pt/README.md b/docs/pt_BR/README.md
similarity index 81%
rename from docs/pt/README.md
rename to docs/pt_BR/README.md
index c3fe2470d..83829dedb 100644
--- a/docs/pt/README.md
+++ b/docs/pt_BR/README.md
@@ -9,13 +9,13 @@
 Existem muitos recursos interessantes fornecidos por `vue-loader`:
 
 - ES2015 habilitado por padrão;
-- Permite usar outros carregadores Webpack para cada pedaço de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
+- Permite usar outros carregadores Webpack para cada parte de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
 - Permite seções customizadas em um arquivo .vue que pode ter carregadores encadeados personalizados aplicados a eles;
 - Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores Webpack;
 - Pode simular escopo CSS para cada componente;
 - Suporta componente hot-reloading durante desenvolvimento;
 
-Em poucas palavras, a combinação de Webpack e `vue-loader` dá-lhe um moderno, flexível e extremamente poderoso fluxo de trabalho front-end para criação de aplicações Vue.js.
+Em poucas palavras, a combinação de Webpack e `vue-loader` oferece um moderno, flexível e extremamente poderoso fluxo de trabalho front-end para criação de aplicações Vue.js.
 
 ### O que é Webpack?
 
@@ -27,12 +27,12 @@ Se você já está familiarizado com Webpack, sinta-se livre para pular está ex
 
 Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. Eles não podem rodar diretamente dentro do navegador, então precisamos empacotá-los dentro de um único arquivo que pode ser incluído através de uma tag `<script>`. Webpack pode seguir as dependências das chamadas  `require()` e fazer isso para nós.
 
-Mas Webpack pode fazer mais do que isso. Com "carregadores", podemos ensinar Webpack a transformar todos os tipos de arquivos dá maneira que quisermos antes da saída final do pacote. Alguns exemplos incluem:
+Mas Webpack pode fazer mais do que isso. Com "loaders", podemos ensinar Webpack a transformar todos os tipos de arquivos dá maneira que quisermos antes da saída final do pacote. Alguns exemplos incluem:
 
 - Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
 - Opcionalmente você pode canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
 - Transpilar modelos Jade em HTML simples em seguida colocá-lo como uma sequência de string JavaScript;
-- Traspilar arquivos SASS em CSS simples, em seguida os converte em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
+- Traspilar arquivos SASS em CSS simples, em seguida os converter em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
 - Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5; 
 
-Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `Vue-loader`.
\ No newline at end of file
+Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `vue-loader`.
\ No newline at end of file
diff --git a/docs/pt/SUMMARY.md b/docs/pt_BR/SUMMARY.md
similarity index 81%
rename from docs/pt/SUMMARY.md
rename to docs/pt_BR/SUMMARY.md
index 669657654..95e289b54 100644
--- a/docs/pt/SUMMARY.md
+++ b/docs/pt_BR/SUMMARY.md
@@ -10,12 +10,12 @@
   - [Hot Reload](features/hot-reload.md)
 - Configurações
   - [Pré-Processadores](configurations/pre-processors.md)
-  - [Manipulação de URls de ativos](configurations/asset-url.md)
+  - [Manipulação de recurso de URL](configurations/asset-url.md)
   - [Configuração avançado do loader](configurations/advanced.md)
-  - [Extraindo arquivos css](configurations/extract-css.md)
+  - [Extraindo arquivos CSS](configurations/extract-css.md)
   - [Blocos customizados](configurations/custom-blocks.md)
 - Fluxo de trabalho
-  - [Produção](workflow/production.md)
+  - [Construir Produção](workflow/production.md)
   - [Análise estática do código \(Linting\)](workflow/linting.md)
   - [Testando](workflow/testing.md)
   - [Testando com Mocks](workflow/testing-with-mocks.md)
diff --git a/docs/pt/configurations/advanced.md b/docs/pt_BR/configurations/advanced.md
similarity index 96%
rename from docs/pt/configurations/advanced.md
rename to docs/pt_BR/configurations/advanced.md
index f0730940b..631186f45 100644
--- a/docs/pt/configurations/advanced.md
+++ b/docs/pt_BR/configurations/advanced.md
@@ -12,8 +12,6 @@ Para fazer isto, especifique a opção `loaders` para `vue-loader`:
 
 > Observe que `preLoaders` e`postLoaders` são suportados apenas em verões >=10.3.0
 
-
-
 ### Webpack 2.x
 
 ```js
@@ -36,7 +34,7 @@ module.exports = {
           
           // `preLoaders` são anexados antes dos carregadores padrões
           // Você pode usar isso para pré-processar blocos de linguagem 
-          // - um caso de uso comum seria i18n em tempo de construção.
+          // - um caso de uso comum seria intercionalização (i18n)  em tempo de construção.
           preLoaders: {
             js: '/caminho/personalizado/para/carregador'
           },
diff --git a/docs/pt/configurations/asset-url.md b/docs/pt_BR/configurations/asset-url.md
similarity index 63%
rename from docs/pt/configurations/asset-url.md
rename to docs/pt_BR/configurations/asset-url.md
index 2f3c086cc..21ea4a550 100644
--- a/docs/pt/configurations/asset-url.md
+++ b/docs/pt_BR/configurations/asset-url.md
@@ -1,6 +1,6 @@
-# Manipulação de recursos de URL
+# Manipulação de recurso de URL
 
-Por padrão, `vue-loader` automaticamente processa seus arquivos de estilos [css-loader](https://github.com/webpack/css-loader) e seus templates com o compilador de template Vue. Neste processo de compilação, todos os recursos de URLs como `<img src="...">`, `background: url(...)` e CSS `@import` são **resolvidos como dependência de módulo**.
+Por padrão, `vue-loader` automaticamente processa seus arquivos de estilos com[css-loader](https://github.com/webpack/css-loader) e seus templates com o compilador de template Vue. Neste processo de compilação, todos os recursos de URLs como `<img src="...">`, `background: url(...)` e CSS `@import` são **resolvidos como dependência de módulo**.
 
 Por exemplo, `url(./image.png)` irá ser traduzido em `require('./image.png')`, e
 
@@ -14,10 +14,10 @@ será compilado em:
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-Como `.png` não é um arquivo JavaScript, você precisará configurar o Webpack para usar [file-loader](https://github.com/webpack/file-loader) ou [url-loader](https://github.com/webpack/url-loader) para lidar com eles. O projeto estruturado com `vue-cli` também configurou isso pra você.
+Como `.png` não é um arquivo JavaScript, você precisará configurar o Webpack para usar [file-loader](https://github.com/webpack/file-loader) ou [url-loader](https://github.com/webpack/url-loader) para lidar com eles. O projeto estruturado com `vue-cli` também configurou isso para você.
 
 Os benefícios de tudo isso são:
 
-1. `file-loader` permite a você configurar onde copiar e colar os arquivos de ativos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos `.vue` e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, Webpack irá automaticamente escrever o caminho dos arquivos em URLs corretas na saída empacotada.
+1. `file-loader` permite a você designar onde copiar e colar os arquivos de recursos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos `.vue` e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, Webpack irá automaticamente reescrever o caminho dos arquivos em URLs corretas na saída empacotada.
 
 2. `url-loader` permite a você colocar condicionalmente em linha um arquivo de dados URL base64 se eles forem menor que um determinado limite. Se o arquivo for maior do que o limite ele automaticamente será jogado para `file-loader`.
\ No newline at end of file
diff --git a/docs/pt/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
similarity index 71%
rename from docs/pt/configurations/custom-blocks.md
rename to docs/pt_BR/configurations/custom-blocks.md
index ab55766a3..518a41908 100644
--- a/docs/pt/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -2,7 +2,7 @@
 
 > Requer versão 10.2.0+
 
-Você pode definir um bloco de linguagem customizado dentro de arquivos `*.vue`. O conteúdo do bloco customizado será processado por carregadores especificado na opção `loaders` do objeto de configuração `vue-loader` e então requerido pelo módulo componente. A configuração é semelhante a descrita em [Configurações Avançada do Carregador](../configurations/advanced.md). exceto o uso padrão do nome da tag em vez do atributo `lang`;
+Você pode definir blocos de linguagem customizados dentro de arquivos `*.vue`. O conteúdo do bloco customizado será processado ppelos carregadores especificados na opção `loaders` do objeto de configuração `vue-loader` e então requerido pelo módulo componente. A configuração é semelhante a descrita em [Configurações Avançada do Carregador](../configurations/advanced.md), exceto o uso padrão do nome da tag em vez do atributo `lang`;
 
 Se for encontrado um carregador correspondente para um bloco customizado, ele será processado. Caso contrário o bloco customizado será simplesmente ignorado.
 
diff --git a/docs/pt/configurations/extract-css.md b/docs/pt_BR/configurations/extract-css.md
similarity index 94%
rename from docs/pt/configurations/extract-css.md
rename to docs/pt_BR/configurations/extract-css.md
index b64f9ec47..dce8c6481 100644
--- a/docs/pt/configurations/extract-css.md
+++ b/docs/pt_BR/configurations/extract-css.md
@@ -2,10 +2,10 @@
 
 Exemplo de configuração para extrair todo CSS processado de todos componentes Vue em um único arquivo CSS:
 
-### Webpack 1.x
+### Webpack 2.x
 
 ```bash
-npm install extract-text-webpack-plugin --save-dev
+npm install extract-text-webpack-plugin@2.x --save-dev
 ```
 
 ```js
@@ -15,30 +15,31 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin")
 module.exports = {
   // outras opções...
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
-        loader: 'vue'
-      },
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              loader: 'css-loader',
+              fallbackLoader: 'vue-style-loader' // <- isto é uma dependência de vue-loader, então não é necessário instalar explicitamente se estiver usando npm3
+            })
+          }
+        }
+      }
     ]
   },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // você também pode incluir <style lang="less"> ou outras linguagens
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
   plugins: [
     new ExtractTextPlugin("style.css")
   ]
 }
 ```
 
-### Webpack 2.x \(^2.1.0-beta.25\)
+### Webpack 1.x
 
 ```bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin
 ```
 
 ```js
@@ -48,21 +49,20 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin")
 module.exports = {
   // outras opções...
   module: {
-    rules: [
+    loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          loaders: {
-            css: ExtractTextPlugin.extract({
-              loader: 'css-loader',
-              fallbackLoader: 'vue-style-loader' // <- isto é uma dependência de vue-loader, então não é necessário instalar explicitamente se estiver usando npm3
-            })
-          }
-        }
-      }
+        loader: 'vue'
+      },
     ]
   },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // você também pode incluir <style lang="less"> ou outras linguagens
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
   plugins: [
     new ExtractTextPlugin("style.css")
   ]
diff --git a/docs/pt/configurations/pre-processors.md b/docs/pt_BR/configurations/pre-processors.md
similarity index 84%
rename from docs/pt/configurations/pre-processors.md
rename to docs/pt_BR/configurations/pre-processors.md
index 77fe43d63..ab488810f 100644
--- a/docs/pt/configurations/pre-processors.md
+++ b/docs/pt_BR/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # Unsando Pré-Processadores
 
-No Webpack, todos os pré-processadores precisam ser aplicados com um carregador \(loader\) correspondente. `vue-loader` permite que você use outros carregadores para processar parte do seu componente Vue. Ele irá automaticamente indicar os carregadores apropriados para usar a partir do atributo `lang` de um bloco de linguagem.
+No Webpack, todos os pré-processadores precisam ser aplicados com um carregador \(loader\) correspondente. `vue-loader` permite que você use outros carregadores Webpack para processar uma parte de um componente Vue. Ele irá automaticamente indicar os carregadores apropriados para usar a partir do atributo `lang` de um bloco de linguagem.
 
 ### CSS
 
@@ -20,9 +20,9 @@ Por baixo do capô, o conteúdo de texto dentro da tag `<style>` será primeiram
 
 #### Advertências de sass-loader
 
-Ao contrário do que seu nome indica, [sass-loader](https://github.com/jtangelder/sass-loader) analisa a sintaxe SCSS por padrão. Se você atualmente deseja usar a indentação da sintaxe SASS, você tem que configurar as opções de vue-loader para sass-loader adequadamente.
+Ao contrário do que seu nome indica, [sass-loader](https://github.com/jtangelder/sass-loader) analisa a sintaxe *SCSS* por padrão. Se você atualmente deseja usar a indentação da sintaxe *SASS*, você tem que configurar as opções de vue-loader para sass-loader adequadamente.
 
-```javascript
+```js
 {
   test: /\.vue$/,
   loader: 'vue-loader',
diff --git a/docs/pt/features/css-modules.md b/docs/pt_BR/features/css-modules.md
similarity index 100%
rename from docs/pt/features/css-modules.md
rename to docs/pt_BR/features/css-modules.md
diff --git a/docs/pt/features/es2015.md b/docs/pt_BR/features/es2015.md
similarity index 86%
rename from docs/pt/features/es2015.md
rename to docs/pt_BR/features/es2015.md
index 34e7d63ed..5a5a21809 100644
--- a/docs/pt/features/es2015.md
+++ b/docs/pt_BR/features/es2015.md
@@ -2,9 +2,9 @@
 
 Quando `vue-loader` detecta a presença de `babel-loader` ou `buble-loader` no mesmo projeto, ele irá usá-los para processar pedaços `<script>` de todos os arquivos `*.vue`, permitindo-nos usar ES2015 em nossos componentes Vue. Se você ainda não conhece estes novos recursos, você definitivamente deve. Alguns bons recursos para aprendizagem:
 
-* [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
-* [ES6 Features](https://github.com/lukehoban/es6features)
-* [Exploring ES6 \(book\)](https://leanpub.com/exploring-es6)
+- [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+- [ES6 Features](https://github.com/lukehoban/es6features)
+- [Exploring ES6 \(book\)](https://leanpub.com/exploring-es6)
 
 Aqui está um padrão típico que você irá ver quando importar outros componentes Vue:
 
@@ -26,7 +26,7 @@ Estamos usando a abreviação de objeto literal do ES2015 para definir component
 
 ### ES2015 em Templates
 
-`<template>` em arquivos `*.vue` são compilados em funções de renderização do JavaScript e então processados por uma compilação personalizada de [Buble](https://buble.surge.sh/guide/) para suportar características ES2015. Isso permite que você use recursos como p[ropriedade de abreviatura do objeto](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) e [propriedades computadas](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
+`<template>` em arquivos `*.vue` são compilados em funções de renderização do JavaScript e então processados por uma compilação personalizada de [Buble](https://buble.surge.sh/guide/) para suportar características ES2015. Isso permite que você use recursos como [propriedade de abreviatura do objeto](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) e [propriedades computadas](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-):
 
 ```html
 <div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
@@ -58,7 +58,7 @@ Você também pode personalizar os recursos suportados em template usando as [op
 
 ### Transpilação normal de arquivos `.js`
 
-Uma vez que `vue-loader` apenas processa arquivos `*.vue`, você precisa informar ao Webpack para processar arquivos `*.js` normais com `babel-loader` ou `buble-loader` em seu arquivo de configuração Webpack. O projeto modelo criado com `vue-cli` já faz isso pra você.
+Uma vez que `vue-loader` processa apenas arquivos `*.vue`, você precisa informar ao Webpack para processar arquivos `*.js` normais com `babel-loader` ou `buble-loader` em seu arquivo de configuração Webpack. O projeto esqueleto criado com `vue-cli` já faz isso pra você.
 
 ### Configurando Babel com `.babelrc`
 
diff --git a/docs/pt/features/hot-reload.md b/docs/pt_BR/features/hot-reload.md
similarity index 100%
rename from docs/pt/features/hot-reload.md
rename to docs/pt_BR/features/hot-reload.md
diff --git a/docs/pt/features/postcss.md b/docs/pt_BR/features/postcss.md
similarity index 58%
rename from docs/pt/features/postcss.md
rename to docs/pt_BR/features/postcss.md
index 1a85bdb0e..eace1a8c6 100644
--- a/docs/pt/features/postcss.md
+++ b/docs/pt_BR/features/postcss.md
@@ -1,6 +1,20 @@
 # PostCSS
 
-Qualquer saída CSS processada por `vue-loader` é canalizada através de [PostCSS](https://github.com/postcss/postcss) para escrever o escopo CSS. Você também pode adicionar plugins PostCSS personalizado ao processador, por exemplo [autoprefixer](https://github.com/postcss/autoprefixer) or [CSSNext](http://cssnext.io/).
+Qualquer saída CSS processada por `vue-loader` é canalizada através de [PostCSS](https://github.com/postcss/postcss) para escrever o escopo CSS. Você também pode adicionar plugins PostCSS personalizado ao processador, por exemplo [autoprefixer](https://github.com/postcss/autoprefixer) ou [CSSNext](http://cssnext.io/).
+
+## Usando um Arquivo de Configuração
+
+A partir da versão 11.0, `vue-loader` suporta o carregamento automático dos mesmo arquivos de configuração do PostCss suportados por [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
+
+- `postcss.config.js`
+- `.postcssrc`
+- Opção `postcss` em `package.json`
+
+O uso de um arquivo de configuração permite que você compartilhe a mesma configuração entre seus arquivos CSS normais processados por `postcss-loader` e os arquivos CSS dentro de arquivos `*.vue`, isto é o recomendado.
+
+## Opções em Linha
+
+Como alternativa, você pode especificar configurações postcss especificamente para arquivos `*.vue` usando a opção `postcss` para `vue-loader`.
 
 Exemplo de uso no Webpack 1.x:
 
@@ -40,9 +54,9 @@ module.exports = {
 
 Além de fornecer uma coleção de plugins, a opção de `postcss` também aceita:
 
-* Uma função que retorna uma coleção de plugins:
+- Uma função que retorna uma coleção de plugins:
 
-* Um objeto que contém opções para ser passado para o processador PostCSS. Isto é útil quando você está usando projetos com PostCSS que depende de analisadores/stringifiers personalizados:
+- Um objeto que contém opções para ser passado para o processador PostCSS. Isto é útil quando você está usando projetos com PostCSS que depende de analisadores/stringifiers personalizados:
 
   ```js
   postcss: {
diff --git a/docs/pt/features/scoped-css.md b/docs/pt_BR/features/scoped-css.md
similarity index 100%
rename from docs/pt/features/scoped-css.md
rename to docs/pt_BR/features/scoped-css.md
diff --git a/docs/pt/options.md b/docs/pt_BR/options.md
similarity index 75%
rename from docs/pt/options.md
rename to docs/pt_BR/options.md
index 3b78b95ce..a6db98ac7 100644
--- a/docs/pt/options.md
+++ b/docs/pt_BR/options.md
@@ -34,13 +34,13 @@ module.exports = {
 
 ### loaders
 
-* tipo: `{ [lang: string]: string }`
+- tipo: `{ [lang: string]: string }`
 
   Um objeto especificando carregadores de Webpack para substituir carregadores padrão usados para blocos de linguagem dentro de arquivos `*.vue`. A chave corresponde ao atributo `lang` para o bloco de linguagem, se especificado. O padrão `lang` para cada tipo é:
 
-  * `<template>`: `html`
-  * `<script>`:`js`
-  * `<style>`: `css`
+  - `<template>`: `html`
+  - `<script>`:`js`
+  - `<style>`: `css`
 
   Por exemplo, para usar `babel-loader` e `eslint-loader` para processar todos os blocos `<script>`:
 
@@ -61,21 +61,27 @@ module.exports = {
 
 ### preLoaders
 
-* tipo: `{ [lang: string]: string }`
-* suportado apenas em &gt;=10.3.0
+- tipo: `{ [lang: string]: string }`
+- suportado apenas em >=10.3.0
 
-  O formato de configuração é o mesmo que `loaders`, mas `preLoaders` são aplicados depois dos carregadores padrões. Você pode usar isto para pós-processar blocos de linguagem. No entanto observe que isso é um pouco mais complicado:
-  
-  * Para `html`, o resultado retornado pelo carregador padrão será compilado em código de função de renderização JavaScript.
+  O formato de configuração é o mesmo que `loaders`, mas `preLoaders` são aplicados aos blocos de linguagem correspodentes antes dos carregadores padrões. Você pode usar isto para pré-processar blocos de linguagem - um caso de uso comum seria contruir em [internacionalização (i18n)](https://pt.wikipedia.org/wiki/Internacionaliza%C3%A7%C3%A3o_(inform%C3%A1tica)) tempo real.
+
+### postLoaders
 
-  * Para `css`, o resultado será retornado por `vue-style-loader` que não é particularmente útil na maioria dos casos. Usando um plugin postcss será uma opção melhor.
+- tipo: `{ [lang: string]: string }`
+- suportado apenas em >= 10.3.0
+
+  O formato de configuração é o mesmo que `loaders`, mas `postLoaders` são aplicados depois dos carregadores padrões. Você pode usar para pós-processar blocos de linguagem. No entanto note que isso é um pouco mais complicado:
+  
+  - Para `html`, o resultado retornado pelo carregador padrão será compilado em código de função de renderização JavaScript.
 
+  - Para `css`, o resultado será retornado por `vue-style-loader` que não é particularmente útil na maioria dos casos. Usando um plugin postcss será uma opção melhor.
 
 ### postcss
 
-> Nota: em versões &gt;=11.0.0 é recomendável usar um arquivo de configuração PostCSS em vez disso. O uso é o mesmo que [postcss-loader](https://github.com/postcss/postcss-loader#usage).
+> Nota: em versões >= 11.0.0 é recomendável usar um arquivo de configuração PostCSS em vez disso. O uso é o mesmo que [postcss-loader](https://github.com/postcss/postcss-loader#usage).
 
-* tipo: `Array` ou `Function` ou `Object`
+- tipo: `Array`, `Function` ou `Object`
 
   Especifica plugins PostCSS personalizados para serem aplicado a CSS dentro de arquivos `*.vue`. Se estiver usando uma função, a função irá ser chamada usando o mesmo contexto do loader e deve retornar uma coleção de plugins.
 
@@ -106,8 +112,8 @@ module.exports = {
 
 ### cssSourceMap
 
-* tipo: `Boolean`
-* padrão: `true`
+- tipo: `Boolean`
+- padrão: `true`
 
   Se deve habilitar mapas de origem para CSS. Desativar isso pode evitar alguns erros relacionado a caminho relativo em `css-loader` e fazer a construção um pouco mais rápida.
 
@@ -115,29 +121,29 @@ module.exports = {
 
 ### esModule
 
-* tipo: `Boolean`
-* padrão: `undefined`
+- tipo: `Boolean`
+- padrão: `undefined`
 
   Se deve emitir código compatível esModule. Por padrão vue-loader irá emitir a exportação padrão em formato CommonJs como `module.exports = ...`. Quando `esModule` estiver definido como true, a exportação padrão irá ser transpilada em `exports.__esModule = true; exports = ...`. Útil para interoperação com transpiladores diferente de Babel, como TypeScript.
 
 ### preserveWhitespace
 
-* tipo: `Boolean`
-* padrão: `true`
+- tipo: `Boolean`
+- padrão: `true`
 
   Se definido para `false`, os espaços em branco entre as tags HTML em templates serão ignorados.
 
 ### transformToRequire
 
-* tipo: `{ [tag: string]: string | Array<string> }`
-* padrão: `{ img: 'src' }`
+- tipo: `{ [tag: string]: string | Array<string> }`
+- padrão: `{ img: 'src', image: 'xlink:href' }`
 
   Durante a compilação do template, o compilador pode transformar certos atributos, tais como URLs `src`, em chamadas `require`, para que o recurso de destino possa ser manipulado pelo Webpack. A configuração padrão transforma o atributo `src` em tags `<img>` e atributos `xlink:href` em tags `<image>` de SVG.
 
 ### buble
 
-* tipo: `Object`
-* padrão: `{}`
+- tipo: `Object`
+- padrão: `{}`
 
   Opções de configuração para o `buble-loader` \(Se estiver presente\), E a compilação buble passa para o template as funções de renderização.
 
@@ -155,7 +161,7 @@ module.exports = {
       // NOTA: Você precisa fornecer o polyfill Object.assign por si mesmo!
       objectAssign: 'Object.assign',
 
-      // desliga a remoção 'com'
+      // desliga a remoção 'with'
       transforms: {
         stripWith: false
       }
diff --git a/docs/pt/start/setup.md b/docs/pt_BR/start/setup.md
similarity index 69%
rename from docs/pt/start/setup.md
rename to docs/pt_BR/start/setup.md
index 9a6667537..0d972fe1e 100644
--- a/docs/pt/start/setup.md
+++ b/docs/pt_BR/start/setup.md
@@ -6,8 +6,8 @@ Recomenda-se o gerador de esqueleto do projeto usando `vue-loader` com `vue-cli`
 
 ``` bash
 npm install -g vue-cli
-vue init webpack-simple hello-vue
-cd hello-vue
+vue init webpack-simple ola-vue
+cd ola-vue
 npm install
-npm run dev # pronto para ir!
+npm run dev # pronto para começar!
 ```
\ No newline at end of file
diff --git a/docs/pt/start/spec.md b/docs/pt_BR/start/spec.md
similarity index 63%
rename from docs/pt/start/spec.md
rename to docs/pt_BR/start/spec.md
index cf5823e31..e1391b6f7 100644
--- a/docs/pt/start/spec.md
+++ b/docs/pt_BR/start/spec.md
@@ -1,6 +1,6 @@
 # Especificação do componente Vue
 
-Um arquivo `*.vue` é um formato de arquivo personalizado que usa sintaxe semelhante HTML para descrever um componente Vue. Cada arquivo `*.vue` consiste em três tipos de bloco de linguagem de nível superior: `<template>`, `<script>` e `<style>`:
+Um arquivo `*.vue` é um formato de arquivo personalizado que usa sintaxe semelhante HTML para descrever um componente Vue. Cada arquivo `*.vue` consiste em três tipos de bloco de linguagem de nível superior: `<template>`, `<script>`, `<style>` e opcionalmente blocos customizados adicionais:
 
 ```html
 <template>
@@ -22,9 +22,13 @@ Um arquivo `*.vue` é um formato de arquivo personalizado que usa sintaxe semelh
     color: red;
   }
 </style>
+
+<custom1>
+  Iso poderia ser a documentação do componente.
+</custom1>
 ```
 
-`vue-loader` analisará o arquivo, em seguida extrair cada bloco de linguagem e canaliza-lo através de outros carregadores se necessário, e finalmente montá-lo  de volta em um módulo CommonJs cujo `module.exports` seja um objeto de opções de componente Vue.js.
+`vue-loader` analisará o arquivo, extrair cada bloco de linguagem canalizá-lo através de outros carregadores se necessário, e finalmente montá-lo de volta em um módulo CommonJs cujo `module.exports` seja um objeto de opções do componente Vue.js.
 
 `vue-loader` suporta o uso de linguagens não-padrão, tais como pré-processadores CSS e linguagem que compila para HTML a partir de um template, especificando o atributo `lang` para um bloco de linguagem. Por exemplo, você pode usar SASS para o estilo do seu componente como este:
 
@@ -40,31 +44,39 @@ Mais detalhes podem ser encontrados em [Usando Pré-Processadores](../configurat
 
 #### `<template>`
 
-* Linguagem padrão: `html`.
+- Linguagem padrão: `html`.
 
-* Cada arquivo `*.vue` pode conter no máximo um bloco `<template>` por vez.
+- Cada arquivo `*.vue` pode conter no máximo um bloco `<template>` por vez.
 
-* O Conteúdo será extraído como uma string e usado como a opção `template` para o componente Vue compilado.
+- O Conteúdo será extraído como uma string e usado como a opção `template` para o componente Vue compilado.
 
 #### `<script>`
 
-* Linguagem padrão: `js` \(ES2015 é suportado automaticamente se `babel-loader` ou `buble-loader` for detectado\).
+- Linguagem padrão: `js` \(ES2015 é suportado automaticamente se `babel-loader` ou `buble-loader` for detectado\).
 
-* Cada arquivo `*.vue` pode conter no máximo um bloco de `<script>` por vez.
+- Cada arquivo `*.vue` pode conter no máximo um bloco de `<script>` por vez.
 
-* O script é executado em um ambiente CommonJs \(Como um módulo `.js` normal manipulado via webpack\), o que significa que você pode usar `require()` para requisitar outras dependências. E com ES2015 suportado, você também pode usar a sintaxe `import` e `export`.
+- O script é executado em um ambiente CommonJs \(Como um módulo `.js` normal manipulado via webpack\), o que significa que você pode usar `require()` para requisitar outras dependências. E com ES2015 suportado, você também pode usar a sintaxe `import` e `export`.
 
-* O script deve exportar um objeto de opções de componente Vue. Também é suportador exportar um construtor estendido criado por `Vue.extend()`, mas um objeto simples é preferível.
+- O script deve exportar um objeto de opções de componente Vue. Também é suportador exportar um construtor estendido criado por `Vue.extend()`, mas um objeto simples é preferível.
 
 #### `<style>`
 
-* Linguagem padrão: `css`.
+- Linguagem padrão: `css`.
+
+- Várias tags `<style>` são suportadas em um único arquivo `*.vue`.
+
+- Uma tag `<style>` pode ter atributos `scoped` ou `module` \(consulte [CSS com Escopo](../features/scoped-css.md) e [Módulos CSS](../features/css-modules.md)\)\) para ajudar encapsular o estilo para o seu componente atual. Várias tags `<style>` com diferente modos de encapsulamento pode ser misturados em um mesmo componente.
+
+- Por padrão, o conteúdo será extraído e inserido dinamicamente no `<head>` do documento atual como uma tag `<style>` usando `style-loader`. Também é possível [configurar o Webpack para que todos os estilos em todos os componentes sejam extraídos em um único arquivo CSS](../configurations/extract-css.md).
 
-* Várias tags `<style>` são suportadas em um único arquivo `*.vue`.
+### Blocos customizados
 
-* Uma tag `<style>` pode ter atributos `scoped`ou `module` \(consulte [CSS Escopado](../features/scoped-css.md) e [Módulos CSS](../features/css-modules.md)\)\) para ajudar encapsular o estilo para o seu componente atual. Várias tags `<style>` com diferente modos de encapsulamento pode ser misturados em um mesmo componente.
+> Suportado apenas em vue-loader 10.2.0+
 
-* Por padrão, o conteúdo será extraído e inserido dinamicamente no `<head>` do documento atual como uma tag `<style>` usando `style-loader`. Também é possível [configurar o Webpack para que todos os estilos em todos os componentes sejam extraídos em um único arquivo CSS](../configurations/extract-css.md).
+Blocos customizados adicionais pode ser incluídos em um arquivo `*.vue` para qualquer necessidade específica do projeto, por exemplo um bloco `<docs>`. `vue-loader` usará o nome da tag para procurar por carregadores de Webpack. Os carregadores dever ser adicionados na opção `loaders` de `vue-loader`.
+
+Para mais detalhes, veja [Blocos Customizados](../configurations/custom-blocks.md).
 
 ### Importações src
 
@@ -80,7 +92,13 @@ Tenha em mente que as importações `src` seguem as mesmas regras de resolução
 
 ```html
 <!-- importa um arquivo do pacote npm "todomvc-app-css" instalado -->
-<style src="todomvc-app-css/index.css">
+<style src="todomvc-app-css/index.css"></style>
+```
+
+As importações `src` também funcionam com blocos customizados, por exemplo:
+
+``` html
+<unit-test src="./unit-test.js"></unit-test>
 ```
 
 ### Realce de Sintaxe
diff --git a/docs/pt/workflow/linting.md b/docs/pt_BR/workflow/linting.md
similarity index 95%
rename from docs/pt/workflow/linting.md
rename to docs/pt_BR/workflow/linting.md
index 2f1865a14..647c7299e 100644
--- a/docs/pt/workflow/linting.md
+++ b/docs/pt_BR/workflow/linting.md
@@ -2,7 +2,7 @@
 
 Você pode ter se perguntado como você analisa seu código dentro dos seus arquivos `*.vue`, uma vez que eles não são JavaScript. Vamos supor que você está usando [ESLint](http://eslint.org/) \(se você não está, deveria\).
 
-Você também precisará do [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) com suporte de extração e análise estática \(linting\) do JavasScript dentro dos arquivos `*.vue`.
+Você também precisará do [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) que suporte de extração e análise estática \(linting\) do JavasScript dentro dos arquivos `*.vue`.
 
 Certifique-se de incluir o plugin dentro de suas configurações ESLint:
 
diff --git a/docs/pt/workflow/production.md b/docs/pt_BR/workflow/production.md
similarity index 96%
rename from docs/pt/workflow/production.md
rename to docs/pt_BR/workflow/production.md
index c9a7e5e97..15a6901fa 100644
--- a/docs/pt/workflow/production.md
+++ b/docs/pt_BR/workflow/production.md
@@ -36,4 +36,4 @@ Obviamente não queremos usar estás configurações durante o desenvolvimento,
 
 2. Ou use dois arquivos de configuração do Webpack separados,  um para o desenvolvimento e outro para produção. E talvez compartilhe algumas opções comuns entre eles em um terceiro arquivo, como mostrado em [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
 
-Isto é com você, desde que o objetivo seja atingido
\ No newline at end of file
+Isto é com você, desde que o objetivo seja atingido.
\ No newline at end of file
diff --git a/docs/pt/workflow/testing-with-mocks.md b/docs/pt_BR/workflow/testing-with-mocks.md
similarity index 94%
rename from docs/pt/workflow/testing-with-mocks.md
rename to docs/pt_BR/workflow/testing-with-mocks.md
index d38bd33f3..0b9193b45 100644
--- a/docs/pt/workflow/testing-with-mocks.md
+++ b/docs/pt_BR/workflow/testing-with-mocks.md
@@ -41,8 +41,8 @@ const ExemploInjecao = require('!!vue?inject!./exemplo.vue')
 
 Observe que ele requer uma sequência de caracteres - nós estamos usando algumas [requisições de carregador webpack](https://webpack.github.io/docs/loaders.html) em linha aqui. Uma explicação rápida:
 
-* `!!` no início significa "desative todos os carregadores da configuração global";
-* `vue?inject!` significa "use o carregador de `vue`, e passe o `?inject` na consulta". Isso informa ao `vue-loader` para compilar o componente no modo injeção de dependência.
+- `!!` no início significa "desative todos os carregadores da configuração global";
+- `vue?inject!` significa "use o carregador de `vue`, e passe o `?inject` na consulta". Isso informa ao `vue-loader` para compilar o componente no modo injeção de dependência.
 
 O retorno de `ExemploInjecao` é uma função de fábrica que pode ser chamada para criar instâncias do módulo `exemplo.vue`.
 
diff --git a/docs/pt/workflow/testing.md b/docs/pt_BR/workflow/testing.md
similarity index 100%
rename from docs/pt/workflow/testing.md
rename to docs/pt_BR/workflow/testing.md

From 9bf764915f55ff50bb3ff3533f821a79176e2a9b Mon Sep 17 00:00:00 2001
From: EGOIST <0x142857@gmail.com>
Date: Sat, 18 Feb 2017 07:17:14 -0600
Subject: [PATCH 512/877] Do not load config file from `--config` (#653)

---
 lib/style-rewriter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index b64566402..ece7e0bec 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -59,7 +59,7 @@ module.exports = function (css, map) {
   }
 
   // use the same config loading interface as postcss-loader
-  loadPostcssConfig({ webpack: this }).catch(() => {
+  loadPostcssConfig({ webpack: this }, null, { argv: false }).catch(() => {
     // postcss-load-config throws error when no config file is found,
     // but for us it's optional.
   }).then(config => {

From 1469aff642ef62cee4ae8affa645c6da6cd4b5d3 Mon Sep 17 00:00:00 2001
From: Obura Tongoi <oburatongoi@users.noreply.github.com>
Date: Sat, 18 Feb 2017 09:13:44 -0800
Subject: [PATCH 513/877] Change occurence to occurrence (#655)

This was causing the following error:

webpack.optimize.OccurenceOrderPlugin is not a constructor
---
 docs/en/workflow/production.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index a54081095..ef0bc66f1 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -24,8 +24,8 @@ module.exports = {
         warnings: false
       }
     }),
-    // optimize module ids by occurence count
-    new webpack.optimize.OccurenceOrderPlugin()
+    // optimize module ids by occurrence count
+    new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
 ```

From 8fabadb06083505d93bcfb95036ddcf57327f41f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 18 Feb 2017 22:00:21 -0500
Subject: [PATCH 514/877] mark deprecated feature

---
 lib/template-loader.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/template-loader.js b/lib/template-loader.js
index 57a596870..02207f68b 100644
--- a/lib/template-loader.js
+++ b/lib/template-loader.js
@@ -6,6 +6,9 @@ module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
   var opt = loaderUtils.parseQuery(this.query)
+
+  // this is never documented and should be deprecated
+  // but we'll keep it so we don't break stuff
   var vue = this.options.__vueOptions__
   if (vue && vue.template) {
     for (var key in vue.template) {

From 681f4dc0d211d428fbbe3c28968e33ff5c83e856 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 18 Feb 2017 22:02:33 -0500
Subject: [PATCH 515/877] support hashKey option (close #645)

---
 lib/gen-id.js | 4 ++--
 lib/loader.js | 2 +-
 test/test.js  | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/gen-id.js b/lib/gen-id.js
index 191929324..e09733d47 100644
--- a/lib/gen-id.js
+++ b/lib/gen-id.js
@@ -5,9 +5,9 @@ var hash = require('hash-sum')
 var cache = Object.create(null)
 var sepRE = new RegExp(path.sep.replace('\\', '\\\\'), 'g')
 
-module.exports = function genId (file, context) {
+module.exports = function genId (file, context, key) {
   var contextPath = context.split(path.sep)
   var rootId = contextPath[contextPath.length - 1]
-  file = rootId + '/' + path.relative(context, file).replace(sepRE, '/')
+  file = rootId + '/' + path.relative(context, file).replace(sepRE, '/') + (key || '')
   return cache[file] || (cache[file] = hash(file))
 }
diff --git a/lib/loader.js b/lib/loader.js
index 46aea1061..dc91df600 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -62,7 +62,7 @@ module.exports = function (content) {
   var fileName = path.basename(filePath)
 
   var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
-  var moduleId = 'data-v-' + genId(filePath, context)
+  var moduleId = 'data-v-' + genId(filePath, context, options.hashKey)
 
   var cssLoaderOptions = ''
   if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
diff --git a/test/test.js b/test/test.js
index 579789a83..6153927c0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -162,9 +162,12 @@ describe('vue-loader', function () {
 
   it('scoped style', done => {
     test({
-      entry: './test/fixtures/scoped-css.vue'
+      entry: './test/fixtures/scoped-css.vue',
+      vue: {
+        hashKey: 'foo'
+      }
     }, (window, module) => {
-      var id = 'data-v-' + hash('vue-loader/test/fixtures/scoped-css.vue')
+      var id = 'data-v-' + hash('vue-loader/test/fixtures/scoped-css.vue' + 'foo')
       expect(module._scopeId).to.equal(id)
 
       var vnode = mockRender(module, {

From a74d715be293ae65b4530fd7349ad7eff577eab4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 18 Feb 2017 22:37:08 -0500
Subject: [PATCH 516/877] 11.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8486354c3..156154641 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From cd9cce9d04b61f1244dcb86fd5bf55be3520aa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Sun, 19 Feb 2017 23:29:48 -0300
Subject: [PATCH 517/877] [docs] pt_BR Updated (#656)

* Updated

* Change occurence to occurrence
---
 docs/pt_BR/workflow/production.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pt_BR/workflow/production.md b/docs/pt_BR/workflow/production.md
index 15a6901fa..2f454b8d2 100644
--- a/docs/pt_BR/workflow/production.md
+++ b/docs/pt_BR/workflow/production.md
@@ -24,8 +24,8 @@ module.exports = {
         warnings: false
       }
     }),
-    // otimiza ids de módulos por contagem de ocorrência
-    new webpack.optimize.OccurenceOrderPlugin()
+    // Otimizar ids de módulo por contagem de ocorrências
+    new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
 ```

From 8397d72a1e8fc0453c4695bd8c8b800cfba7530a Mon Sep 17 00:00:00 2001
From: Juan Eugenio Abadie <juaneabadie@gmail.com>
Date: Sun, 19 Feb 2017 23:30:16 -0300
Subject: [PATCH 518/877] Missing word (#650)

I think a word is missing.
---
 docs/en/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/README.md b/docs/en/README.md
index 21e30088a..ed4480e79 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -35,4 +35,4 @@ But Webpack can do more than that. With "loaders", we can teach Webpack to trans
 - Transpile SASS files into plain CSS, then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
 - Process an image file referenced in HTML or CSS, moved it to the desired destination based on the path configurations, and naming it using its md5 hash.
 
-Webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using Webpack with Vue.js and `vue-loader`.
+Webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is its verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using Webpack with Vue.js and `vue-loader`.

From d9e511f38891cbd7f457951c2e8b44be12cb585a Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Tue, 21 Feb 2017 12:25:04 +0300
Subject: [PATCH 519/877] Fix typo in start/spec section (#658)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace "пути до файлу" with "пути к файлу"
---
 docs/ru/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/start/spec.md b/docs/ru/start/spec.md
index 659fa1e41..129c006c8 100644
--- a/docs/ru/start/spec.md
+++ b/docs/ru/start/spec.md
@@ -88,7 +88,7 @@ export default {
 <script src="./script.js"></script>
 ```
 
-Имейте ввиду, что импорт через `src` следует тем же правилам определения пути до файлу, как и вызовы `require()` в CommonJS, что означает необходимость начинать относительные пути с `./`, и также возможность подключать ресурсы непосредственно из установленных NPM-пакетов, например:
+Имейте ввиду, что импорт через `src` следует тем же правилам определения пути к файлу, как и вызовы `require()` в CommonJS, что означает необходимость начинать относительные пути с `./`, и также возможность подключать ресурсы непосредственно из установленных NPM-пакетов, например:
 
 ``` html
 <!-- импорт файла из установленного NPM пакета "todomvc-app-css" -->

From 1d63e9ec610490767b447cee5cf53e00faf905fa Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Fri, 24 Feb 2017 03:07:20 +0900
Subject: [PATCH 520/877] fix deprecation warning (close #666) (#671)

---
 lib/loader.js            | 4 ++--
 lib/selector.js          | 2 +-
 lib/style-rewriter.js    | 2 +-
 lib/template-compiler.js | 2 +-
 lib/template-loader.js   | 2 +-
 package.json             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index dc91df600..7778a3858 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -54,7 +54,7 @@ module.exports = function (content) {
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
 
   var loaderContext = this
-  var query = loaderUtils.parseQuery(this.query)
+  var query = loaderUtils.getOptions(this) || {}
   var rawRequest = getRawRequest(this)
   var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
 
@@ -141,7 +141,7 @@ module.exports = function (content) {
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
       // $1: !css-loader
       // $2: ?a=b
-      var query = loaderUtils.parseQuery($2)
+      var query = loaderUtils.getOptions($2 || {}) || {}
       Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
       if (index !== -1) {
         // Note:
diff --git a/lib/selector.js b/lib/selector.js
index 552260783..7779b8d2f 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -4,7 +4,7 @@ var loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   this.cacheable()
-  var query = loaderUtils.parseQuery(this.query)
+  var query = loaderUtils.getOptions(this) || {}
   var filename = path.basename(this.resourcePath)
   var parts = parse(content, filename, this.sourceMap)
   var part = parts[query.type]
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index ece7e0bec..964ff85c7 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -42,7 +42,7 @@ module.exports = function (css, map) {
   this.cacheable()
   var cb = this.async()
 
-  var query = loaderUtils.parseQuery(this.query)
+  var query = loaderUtils.getOptions(this) || {}
   var vueOptions = this.options.__vueOptions__
 
   if (!vueOptions) {
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 19dd928ed..b694b71fc 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -50,7 +50,7 @@ module.exports = function (html) {
   this.cacheable()
   var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  var options = loaderUtils.parseQuery(this.query)
+  var options = loaderUtils.getOptions(this) || {}
   if (options.transformToRequire) {
     transformToRequire = Object.assign(
       {},
diff --git a/lib/template-loader.js b/lib/template-loader.js
index 02207f68b..e0690c84f 100644
--- a/lib/template-loader.js
+++ b/lib/template-loader.js
@@ -5,7 +5,7 @@ var extname = require('path').extname
 module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
-  var opt = loaderUtils.parseQuery(this.query)
+  var opt = loaderUtils.getOptions(this) || {}
 
   // this is never documented and should be deprecated
   // but we'll keep it so we don't break stuff
diff --git a/package.json b/package.json
index 156154641..b5b018428 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
     "js-beautify": "^1.6.3",
-    "loader-utils": "^0.2.10",
+    "loader-utils": "^1.0.2",
     "lru-cache": "^4.0.1",
     "postcss": "^5.0.10",
     "postcss-load-config": "^1.1.0",

From 9366d8110fbd405d85052df2ab63131a01a59bb2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 20 Feb 2017 08:50:12 -0500
Subject: [PATCH 521/877] small tweak

---
 lib/template-compiler.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index b694b71fc..8e859be6d 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -84,9 +84,7 @@ module.exports = function (html) {
     }
   }
   // hot-reload
-  if (!isServer &&
-      !this.minimize &&
-      process.env.NODE_ENV !== 'production') {
+  if (!isServer && !isProduction) {
     code +=
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +

From 8413468c172d2be734a30332de58b8f7d848e1d9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Feb 2017 13:14:18 -0500
Subject: [PATCH 522/877] 11.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b5b018428..b882c4cd8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 1a551953a17b278cda3ab7866d4a5c0b8182af6a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Feb 2017 17:41:23 -0500
Subject: [PATCH 523/877] ensure injected css modules computed is a fresh
 object

---
 lib/component-normalizer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 99eea7894..d1b8a190e 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -32,11 +32,12 @@ module.exports = function normalizeComponent (
 
   // inject cssModules
   if (cssModules) {
-    var computed = options.computed || (options.computed = {})
+    var computed = Object.create(options.computed || null)
     Object.keys(cssModules).forEach(function (key) {
       var module = cssModules[key]
       computed[key] = function () { return module }
     })
+    options.computed = computed
   }
 
   return {

From 15f8cac3f67f278ce776809cc084b51298bef00c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Feb 2017 17:42:03 -0500
Subject: [PATCH 524/877] 11.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b882c4cd8..3d9c78192 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.1.1",
+  "version": "11.1.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From bfc1f0b93d919cdd4e8b958d8b353a9656943a58 Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Fri, 24 Feb 2017 03:10:34 +0300
Subject: [PATCH 525/877] Fix typo in configurations/custom-blocks (#659)

---
 docs/ru/configurations/custom-blocks.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index 4fd39ef07..aea3c641e 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -2,7 +2,7 @@
 
 > Доступно в версиях 10.2.0+
 
-Вы можете определять пользовательски блоки внутри `*.vue` файлов. Содержимое пользовательских блоков будет обрабатываться загрузчиками, указанными с объекте `loaders` настроек `vue-loader` и затем подключено модулем к компоненту. Конфигурация аналогична тому, что описано в разделе [продвинутой конфигурации загрузчиков](../configurations/advanced.md), за исключением совпадений по имени тега, вместо атрибута `lang`.
+Вы можете определять пользовательски блоки внутри `*.vue` файлов. Содержимое пользовательских блоков будет обрабатываться загрузчиками, указанными в объекте `loaders` настроек `vue-loader` и затем подключено модулем к компоненту. Конфигурация аналогична тому, что описано в разделе [продвинутой конфигурации загрузчиков](../configurations/advanced.md), за исключением совпадений по имени тега, вместо атрибута `lang`.
 
 Если подходящий загрузчик будет найден для пользовательского блока, он будет обработан; в противном случае пользовательский блок будет просто проигнорирован.
 
@@ -64,4 +64,4 @@ module.exports = {
     ]
   }
 }
-```
\ No newline at end of file
+```

From 062021742fa5bc95e8a333eef7b32cbf1e100fef Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Fri, 24 Feb 2017 03:12:03 +0300
Subject: [PATCH 526/877] Fix typos and change a word in options section (#660)

---
 docs/ru/options.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/options.md b/docs/ru/options.md
index 4855dbcf9..bade17b84 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -147,9 +147,9 @@ module.exports = {
 - Тип: `Object`
 - По умолчанию: `{}`
 
-  Настройка параметров для `buble-loader` (есть он присутствует), И buble-компиляции для шаблонов рендер-функций.
+  Настройка параметров для `buble-loader` (если он присутствует), и buble-компиляции для шаблонов рендер-функций.
 
-  > Примечание: в версиях 9.x, выражения шаблонов настраивались отдельно через опцию `templateBuble`, что удалена в новых версиях.
+  > Примечание: в версиях 9.x, выражения шаблонов настраивались отдельно через опцию `templateBuble`, которая удалена в новых версиях.
 
   Компиляция шаблонов рендер-функций поддерживает специальное преобразование `stripWith` (включена по умолчанию), которая удаляет использование `with` в генерируемых рендер-функциях для соответствия режиму strict.
 

From 7810af8a654d3583daaa1f47079df8d1523d1b4d Mon Sep 17 00:00:00 2001
From: Blake Newman <blakenoodles@gmail.com>
Date: Fri, 24 Feb 2017 12:09:22 +0000
Subject: [PATCH 527/877] [Patch] Fix issue with no compiler errors

---
 lib/template-compiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 8e859be6d..47a26c288 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -62,7 +62,7 @@ module.exports = function (html) {
     preserveWhitespace: options.preserveWhitespace
   }, defaultCompileOptions))
   var code
-  if (compiled.errors.length) {
+  if (compiled.errors && compiled.errors.length) {
     this.emitError(
       `\n  Error compiling template:\n${pad(html)}\n` +
       compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'

From 776af31a989cb6c8de089ecf1180a3205def3a96 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 24 Feb 2017 19:07:22 -0500
Subject: [PATCH 528/877] handle compile warnings

---
 lib/template-compiler.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index 47a26c288..b9d0d92e3 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -58,9 +58,18 @@ module.exports = function (html) {
       options.transformToRequire
     )
   }
+
   var compiled = compiler.compile(html, Object.assign({
     preserveWhitespace: options.preserveWhitespace
   }, defaultCompileOptions))
+
+  // tips
+  if (compiled.tips && compiled.tips.length) {
+    compiled.tips.forEach(tip => {
+      this.emitWarning(tip)
+    })
+  }
+
   var code
   if (compiled.errors && compiled.errors.length) {
     this.emitError(

From 19b9d07a0cfb4016f0985dd8900f5f2b2f78cff4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 24 Feb 2017 19:07:27 -0500
Subject: [PATCH 529/877] 11.1.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3d9c78192..5ce58e3ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.1.2",
+  "version": "11.1.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 6ec605da07cdf66a1fdc0b6b9e8e84ddd348ae7d Mon Sep 17 00:00:00 2001
From: Sebastian Blade <blade254353074@hotmail.com>
Date: Fri, 3 Mar 2017 12:21:40 +0800
Subject: [PATCH 530/877] update vue-hot-reload-api to 2.0.11 (#677)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ce58e3ec..4bb696e19 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",
-    "vue-hot-reload-api": "^2.0.1",
+    "vue-hot-reload-api": "^2.0.11",
     "vue-style-loader": "^2.0.0",
     "vue-template-es2015-compiler": "^1.2.2"
   },

From 7caa9dd20faf5242a8abd683944ec0963c3440a3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Mar 2017 12:22:59 +0800
Subject: [PATCH 531/877] 11.1.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4bb696e19..b09702a40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From f195b2120d019263acb97e9486d7f8787f73a846 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Sun, 5 Mar 2017 12:38:10 -0800
Subject: [PATCH 532/877] Update parser's call to parseComponent (#684)

The pad option now accepts 'line' or 'space' as padding options.
Depends on vuejs/vue#5059
---
 lib/parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index d65b14fe4..66439909f 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -12,7 +12,7 @@ module.exports = function (content, filename, needMap) {
   var filenameWithHash = filename + '?' + cacheKey
   var output = cache.get(cacheKey)
   if (output) return output
-  output = compiler.parseComponent(content, { pad: true })
+  output = compiler.parseComponent(content, { pad: 'line' })
   if (needMap) {
     if (output.script && !output.script.src) {
       output.script.map = generateSourceMap(

From ae5b356942456424d3b52119a32f843077c0cf44 Mon Sep 17 00:00:00 2001
From: Marlysson Silva <marlysson5@gmail.com>
Date: Sun, 5 Mar 2017 21:10:42 -0300
Subject: [PATCH 533/877] Corrigindo escrita de palavra (#688)

Corrigindo escrita de "Unsando" por "Usando".
---
 docs/pt_BR/configurations/pre-processors.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pt_BR/configurations/pre-processors.md b/docs/pt_BR/configurations/pre-processors.md
index ab488810f..6cc20f8c9 100644
--- a/docs/pt_BR/configurations/pre-processors.md
+++ b/docs/pt_BR/configurations/pre-processors.md
@@ -1,4 +1,4 @@
-# Unsando Pré-Processadores
+# Usando Pré-Processadores
 
 No Webpack, todos os pré-processadores precisam ser aplicados com um carregador \(loader\) correspondente. `vue-loader` permite que você use outros carregadores Webpack para processar uma parte de um componente Vue. Ele irá automaticamente indicar os carregadores apropriados para usar a partir do atributo `lang` de um bloco de linguagem.
 
@@ -78,4 +78,4 @@ Você pode usar \[solicitação de carregador Webpack\] no atributo `lang`:
 </style>
 ```
 
-Contudo, observe que isso faz com que seu componente Vue se torne especifico para Webpack e não compatível com Browserify e [vueify](https://github.com/vuejs/vueify). **Se você pretende enviar seu componente Vue como um componente reutilizável para terceiros, evite usar está sintaxe**.
\ No newline at end of file
+Contudo, observe que isso faz com que seu componente Vue se torne especifico para Webpack e não compatível com Browserify e [vueify](https://github.com/vuejs/vueify). **Se você pretende enviar seu componente Vue como um componente reutilizável para terceiros, evite usar está sintaxe**.

From d8878d107c164be86bfdda8426174ae2721a4d52 Mon Sep 17 00:00:00 2001
From: Guy Lyons <guylyons@users.noreply.github.com>
Date: Mon, 6 Mar 2017 12:14:53 -0500
Subject: [PATCH 534/877] add missing comma (#690)

---
 docs/en/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index 491af9655..49b80b140 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -28,7 +28,7 @@ Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangeld
   loader: 'vue-loader',
   options: {
     loaders: {
-      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      scss: 'vue-style-loader!css-loader!sass-loader', // <style lang="scss">
       sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
     }
   }

From 586cb916403899f38d9646aab5e7b228552cc094 Mon Sep 17 00:00:00 2001
From: Guy Lyons <guylyons@users.noreply.github.com>
Date: Mon, 6 Mar 2017 12:15:06 -0500
Subject: [PATCH 535/877] add missing comma (#692)

---
 docs/ru/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
index 67346a1ec..1d3c80f85 100644
--- a/docs/ru/configurations/pre-processors.md
+++ b/docs/ru/configurations/pre-processors.md
@@ -28,7 +28,7 @@ npm install sass-loader node-sass --save-dev
   loader: 'vue-loader',
   options: {
     loaders: {
-      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      scss: 'vue-style-loader!css-loader!sass-loader', // <style lang="scss">
       sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
     }
   }

From 2d50123cbf21af764b6ee23d891d4fe49f3872ee Mon Sep 17 00:00:00 2001
From: Guy Lyons <guylyons@users.noreply.github.com>
Date: Mon, 6 Mar 2017 12:15:29 -0500
Subject: [PATCH 536/877] add missing comma (#691)

---
 docs/pt_BR/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pt_BR/configurations/pre-processors.md b/docs/pt_BR/configurations/pre-processors.md
index 6cc20f8c9..bde9590d1 100644
--- a/docs/pt_BR/configurations/pre-processors.md
+++ b/docs/pt_BR/configurations/pre-processors.md
@@ -28,7 +28,7 @@ Ao contrário do que seu nome indica, [sass-loader](https://github.com/jtangelde
   loader: 'vue-loader',
   options: {
     loaders: {
-      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      scss: 'vue-style-loader!css-loader!sass-loader', // <style lang="scss">
       sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
     }
   }

From ef98ec04dac41d3faf8e83bd530efadeb5877542 Mon Sep 17 00:00:00 2001
From: Lipan <ablipan@163.com>
Date: Thu, 9 Mar 2017 13:01:38 +0800
Subject: [PATCH 537/877] webpack.config.js is wrong (#699)

It's not correct that `plugins` is wrap in the `module`
---
 docs/en/configurations/custom-blocks.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index 2066b59a5..ce833e0cd 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -57,11 +57,11 @@ module.exports = {
           }
         }
       }
-    ],
-    plugins: [
-      // output all docs into a single file
-      new ExtractTextPlugin('docs.md')
     ]
-  }
+  },
+  plugins: [
+    // output all docs into a single file
+    new ExtractTextPlugin('docs.md')
+  ]
 }
 ```

From 6fddcc3ae35ebf97c14d9552c679c8e481b46941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Fri, 10 Mar 2017 01:31:39 -0300
Subject: [PATCH 538/877] [Docs] Updated (#706)

---
 docs/pt_BR/configurations/custom-blocks.md | 10 +++++-----
 docs/ru/configurations/custom-blocks.md    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/pt_BR/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
index 518a41908..f3a01dbd5 100644
--- a/docs/pt_BR/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -57,11 +57,11 @@ module.exports = {
           }
         }
       }
-    ],
-    plugins: [
-      // saída de todos os docs em um único arquivo
-      new ExtractTextPlugin('docs.md')
     ]
-  }
+  },
+  plugins: [
+    // saída de todos os docs em um único arquivo
+    new ExtractTextPlugin('docs.md')
+  ]
 }
 ```
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index aea3c641e..31e3a55e2 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -57,11 +57,11 @@ module.exports = {
           }
         }
       }
-    ],
-    plugins: [
-      // вывести всю документацию в отдельный файл
-      new ExtractTextPlugin('docs.md')
     ]
-  }
+  },
+  plugins: [
+    // вывести всю документацию в отдельный файл
+    new ExtractTextPlugin('docs.md')
+  ]
 }
 ```

From d353739b5f0a9ec04da87d575b4b3e7e8b4df22b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 16:22:29 +0800
Subject: [PATCH 539/877] refactor transform to require compiler module

---
 lib/template-compiler.js          | 65 ++++++-------------------------
 lib/template-transform-require.js | 43 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 53 deletions(-)
 create mode 100644 lib/template-transform-require.js

diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index b9d0d92e3..fa628f5c5 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -1,67 +1,26 @@
-var compiler = require('vue-template-compiler')
-var transpile = require('vue-template-es2015-compiler')
+var normalize = require('./normalize')
 var loaderUtils = require('loader-utils')
+var compiler = require('vue-template-compiler')
 var beautify = require('js-beautify').js_beautify
-var normalize = require('./normalize')
+var transpile = require('vue-template-es2015-compiler')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
+var transformRequire = require('./template-transform-require')
 
-// vue compiler module for using transforming `<tag>:<attribute>` to `require`
-var defaultTransformToRequire = {
-  img: 'src',
-  image: 'xlink:href'
-}
-var transformToRequire = defaultTransformToRequire
-var defaultCompileOptions = {
-  modules: [{
-    postTransformNode (el) {
-      for (var tag in transformToRequire) {
-        if (el.tag === tag && el.attrs) {
-          var attributes = transformToRequire[tag]
-          if (typeof attributes === 'string') {
-            el.attrs.some(attr => rewrite(attr, attributes))
-          } else if (Array.isArray(attributes)) {
-            attributes.forEach(item => el.attrs.some(attr => rewrite(attr, item)))
-          }
-        }
-      }
-    }
-  }]
-}
-
-function rewrite (attr, name) {
-  if (attr.name === name) {
-    var value = attr.value
-    var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
-    if (!isStatic) {
-      return
-    }
-    var firstChar = value.charAt(1)
-    if (firstChar === '.' || firstChar === '~') {
-      if (firstChar === '~') {
-        value = '"' + value.slice(2)
-      }
-      attr.value = `require(${value})`
-    }
-    return true
-  }
-}
+var defaultCompileModules = [transformRequire]
 
 module.exports = function (html) {
   this.cacheable()
   var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
   var options = loaderUtils.getOptions(this) || {}
-  if (options.transformToRequire) {
-    transformToRequire = Object.assign(
-      {},
-      defaultTransformToRequire,
-      options.transformToRequire
-    )
-  }
 
-  var compiled = compiler.compile(html, Object.assign({
-    preserveWhitespace: options.preserveWhitespace
-  }, defaultCompileOptions))
+  // set user transformToRequire options on module
+  transformRequire._userOptions = options.transformToRequire
+
+  var compiled = compiler.compile(html, {
+    preserveWhitespace: options.preserveWhitespace,
+    modules: defaultCompileModules.concat(options.modules || [])
+  })
 
   // tips
   if (compiled.tips && compiled.tips.length) {
diff --git a/lib/template-transform-require.js b/lib/template-transform-require.js
new file mode 100644
index 000000000..20f57147a
--- /dev/null
+++ b/lib/template-transform-require.js
@@ -0,0 +1,43 @@
+// vue compiler module for using transforming `<tag>:<attribute>` to `require`
+var defaultOptions = {
+  img: 'src',
+  image: 'xlink:href'
+}
+
+module.exports = {
+  _userOptions: null,
+  postTransformNode: el => {
+    var userOptions = module.exports._userOptions
+    var options = userOptions
+      ? Object.assign({}, defaultOptions, userOptions)
+      : defaultOptions
+    for (var tag in options) {
+      if (el.tag === tag && el.attrs) {
+        var attributes = options[tag]
+        if (typeof attributes === 'string') {
+          el.attrs.some(attr => rewrite(attr, attributes))
+        } else if (Array.isArray(attributes)) {
+          attributes.forEach(item => el.attrs.some(attr => rewrite(attr, item)))
+        }
+      }
+    }
+  }
+}
+
+function rewrite (attr, name) {
+  if (attr.name === name) {
+    var value = attr.value
+    var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
+    if (!isStatic) {
+      return
+    }
+    var firstChar = value.charAt(1)
+    if (firstChar === '.' || firstChar === '~') {
+      if (firstChar === '~') {
+        value = '"' + value.slice(2)
+      }
+      attr.value = `require(${value})`
+    }
+    return true
+  }
+}

From 1d2e2b69cf1f9c3e926637dc3939074d7a90e248 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 16:50:25 +0800
Subject: [PATCH 540/877] test for custom compiler modules

---
 lib/loader.js                                 |  6 ++-
 .../transform-require.js}                     |  0
 lib/template-compiler.js                      | 14 +++++--
 test/fixtures/custom-compiler-module.js       |  9 +++++
 test/test.js                                  | 38 +++++++++++++++++++
 5 files changed, 63 insertions(+), 4 deletions(-)
 rename lib/{template-transform-require.js => template-compiler-modules/transform-require.js} (100%)
 create mode 100644 test/fixtures/custom-compiler-module.js

diff --git a/lib/loader.js b/lib/loader.js
index 7778a3858..1e73339e2 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -80,7 +80,11 @@ module.exports = function (content) {
     id: moduleId,
     transformToRequire: options.transformToRequire,
     preserveWhitespace: options.preserveWhitespace,
-    buble: options.buble
+    buble: options.buble,
+    // only pass compilerModules if it's a path string
+    compilerModules: typeof options.compilerModules === 'string'
+      ? options.compilerModules
+      : undefined
   })
 
   var defaultLoaders = {
diff --git a/lib/template-transform-require.js b/lib/template-compiler-modules/transform-require.js
similarity index 100%
rename from lib/template-transform-require.js
rename to lib/template-compiler-modules/transform-require.js
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
index fa628f5c5..06b6f885f 100644
--- a/lib/template-compiler.js
+++ b/lib/template-compiler.js
@@ -4,22 +4,30 @@ var compiler = require('vue-template-compiler')
 var beautify = require('js-beautify').js_beautify
 var transpile = require('vue-template-es2015-compiler')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
-var transformRequire = require('./template-transform-require')
+var transformRequire = require('./template-compiler-modules/transform-require')
 
-var defaultCompileModules = [transformRequire]
+var defaultCompilerModules = [transformRequire]
 
 module.exports = function (html) {
   this.cacheable()
   var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
+  var vueOptions = this.options.__vueOptions__ || {}
   var options = loaderUtils.getOptions(this) || {}
 
   // set user transformToRequire options on module
   transformRequire._userOptions = options.transformToRequire
 
+  // user compiler modules
+  var userCompilerModules = options.compilerModules || vueOptions.compilerModules
+  // for HappyPack cross-process use cases
+  if (typeof userCompilerModules === 'string') {
+    userCompilerModules = require(userCompilerModules)
+  }
+
   var compiled = compiler.compile(html, {
     preserveWhitespace: options.preserveWhitespace,
-    modules: defaultCompileModules.concat(options.modules || [])
+    modules: defaultCompilerModules.concat(userCompilerModules || [])
   })
 
   // tips
diff --git a/test/fixtures/custom-compiler-module.js b/test/fixtures/custom-compiler-module.js
new file mode 100644
index 000000000..ff1183412
--- /dev/null
+++ b/test/fixtures/custom-compiler-module.js
@@ -0,0 +1,9 @@
+module.exports = [
+  {
+    postTransformNode: el => {
+      if (el.staticClass) {
+        el.staticClass = '"red blue"'
+      }
+    }
+  }
+]
diff --git a/test/test.js b/test/test.js
index 6153927c0..a8a34fe9e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -700,4 +700,42 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('custom compiler modules', done => {
+    test({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        compilerModules: [
+          {
+            postTransformNode: el => {
+              if (el.staticClass) {
+                el.staticClass = '"red blue"'
+              }
+            }
+          }
+        ]
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      expect(vnode.data.staticClass).to.equal('red blue')
+      done()
+    })
+  })
+
+  it('custom compiler modules (string)', done => {
+    test({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        compilerModules: require.resolve('./fixtures/custom-compiler-module')
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      expect(vnode.data.staticClass).to.equal('red blue')
+      done()
+    })
+  })
 })

From 979561423de6a361c82945a45ec9c07807466e58 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 17:27:03 +0800
Subject: [PATCH 541/877] optimize postcss config loading

---
 lib/load-postcss-config.js | 14 ++++++++++++++
 lib/style-rewriter.js      |  7 ++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 lib/load-postcss-config.js

diff --git a/lib/load-postcss-config.js b/lib/load-postcss-config.js
new file mode 100644
index 000000000..d7a960904
--- /dev/null
+++ b/lib/load-postcss-config.js
@@ -0,0 +1,14 @@
+var load = require('postcss-load-config')
+
+let postcssrc
+
+module.exports = function loadPostcssConfig () {
+  if (process.env.VUE_LOADER_TEST || !postcssrc) {
+    return (postcssrc = load({}, null, { argv: false }).catch(() => {
+      // postcss-load-config throws error when no config file is found,
+      // but for us it's optional.
+    }))
+  } else {
+    return postcssrc
+  }
+}
diff --git a/lib/style-rewriter.js b/lib/style-rewriter.js
index 964ff85c7..438af18dc 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-rewriter.js
@@ -1,7 +1,7 @@
 var postcss = require('postcss')
 var loaderUtils = require('loader-utils')
-var loadPostcssConfig = require('postcss-load-config')
 var selectorParser = require('postcss-selector-parser')
+var loadPostcssConfig = require('./load-postcss-config')
 
 var addId = postcss.plugin('add-id', function (opts) {
   return function (root) {
@@ -59,10 +59,7 @@ module.exports = function (css, map) {
   }
 
   // use the same config loading interface as postcss-loader
-  loadPostcssConfig({ webpack: this }, null, { argv: false }).catch(() => {
-    // postcss-load-config throws error when no config file is found,
-    // but for us it's optional.
-  }).then(config => {
+  loadPostcssConfig().then(config => {
     var plugins
     var options
 

From 894686ac34da1eaeefe7dd30c73c720bdbfe4bf6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 17:59:52 +0800
Subject: [PATCH 542/877] refactor

---
 lib/load-postcss-config.js                    | 14 ---
 lib/loader.js                                 | 18 ++--
 .../index.js}                                 | 40 ++-------
 lib/style-compiler/load-postcss-config.js     | 45 ++++++++++
 lib/template-compiler.js                      | 83 ------------------
 lib/template-compiler/index.js                | 86 +++++++++++++++++++
 lib/template-compiler/modules/inline-style.js |  9 ++
 .../modules}/transform-require.js             | 35 ++++----
 .../preprocessor.js}                          |  0
 9 files changed, 175 insertions(+), 155 deletions(-)
 delete mode 100644 lib/load-postcss-config.js
 rename lib/{style-rewriter.js => style-compiler/index.js} (74%)
 create mode 100644 lib/style-compiler/load-postcss-config.js
 delete mode 100644 lib/template-compiler.js
 create mode 100644 lib/template-compiler/index.js
 create mode 100644 lib/template-compiler/modules/inline-style.js
 rename lib/{template-compiler-modules => template-compiler/modules}/transform-require.js (51%)
 rename lib/{template-loader.js => template-compiler/preprocessor.js} (100%)

diff --git a/lib/load-postcss-config.js b/lib/load-postcss-config.js
deleted file mode 100644
index d7a960904..000000000
--- a/lib/load-postcss-config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var load = require('postcss-load-config')
-
-let postcssrc
-
-module.exports = function loadPostcssConfig () {
-  if (process.env.VUE_LOADER_TEST || !postcssrc) {
-    return (postcssrc = load({}, null, { argv: false }).catch(() => {
-      // postcss-load-config throws error when no config file is found,
-      // but for us it's optional.
-    }))
-  } else {
-    return postcssrc
-  }
-}
diff --git a/lib/loader.js b/lib/loader.js
index 1e73339e2..3da9d6596 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -7,9 +7,9 @@ var querystring = require('querystring')
 
 // internal lib loaders
 var selectorPath = normalize.lib('selector')
-var styleRewriterPath = normalize.lib('style-rewriter')
-var templateLoaderPath = normalize.lib('template-loader')
-var templateCompilerPath = normalize.lib('template-compiler')
+var styleCompilerPath = normalize.lib('style-compiler/index')
+var templateCompilerPath = normalize.lib('template-compiler/index')
+var templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
 var componentNormalizerPath = normalize.lib('component-normalizer')
 
 // dep loaders
@@ -190,9 +190,9 @@ module.exports = function (content) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
 
-    var styleRewriter = ''
+    var styleCompiler = ''
     if (type === 'styles') {
-      styleRewriter = styleRewriterPath + '?' + JSON.stringify({
+      styleCompiler = styleCompilerPath + '?' + JSON.stringify({
         id: moduleId,
         scoped: !!scoped,
         hasInlineConfig: !!query.postcss
@@ -215,10 +215,10 @@ module.exports = function (content) {
         // inject rewriter before css loader for extractTextPlugin use cases
         if (rewriterInjectRE.test(loader)) {
           loader = loader.replace(rewriterInjectRE, function (m, $1) {
-            return ensureBang($1) + styleRewriter
+            return ensureBang($1) + styleCompiler
           })
         } else {
-          loader = ensureBang(loader) + styleRewriter
+          loader = ensureBang(loader) + styleCompiler
         }
       }
       // if user defines custom loaders for html, add template compiler to it
@@ -230,10 +230,10 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templatePreprocessorPath + '?raw&engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + styleRewriter + ensureBang(ensureLoader(lang))
+          return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
         case 'script':
           return injectString + ensureBang(ensureLoader(lang))
         default:
diff --git a/lib/style-rewriter.js b/lib/style-compiler/index.js
similarity index 74%
rename from lib/style-rewriter.js
rename to lib/style-compiler/index.js
index 438af18dc..0b0982fa6 100644
--- a/lib/style-rewriter.js
+++ b/lib/style-compiler/index.js
@@ -59,37 +59,14 @@ module.exports = function (css, map) {
   }
 
   // use the same config loading interface as postcss-loader
-  loadPostcssConfig().then(config => {
-    var plugins
-    var options
-
-    // inline postcss options for vue-loader
-    var rawInlineOptions = vueOptions.postcss
-    if (typeof rawInlineOptions === 'function') {
-      rawInlineOptions = rawInlineOptions.call(this, this)
-    }
-    if (Array.isArray(rawInlineOptions)) {
-      plugins = rawInlineOptions
-    } else if (isObject(rawInlineOptions)) {
-      plugins = rawInlineOptions.plugins
-      options = rawInlineOptions.options
-    }
-
-    plugins = [trim].concat(plugins || [])
+  loadPostcssConfig(vueOptions.postcss).then(({ plugins, options }) => {
+    plugins = [trim].concat(plugins)
     options = Object.assign({
       to: this.resourcePath,
       from: this.resourcePath,
       map: false
     }, options)
 
-    // merge postcss config file
-    if (config && config.plugins) {
-      plugins = plugins.concat(config.plugins)
-    }
-    if (config && config.options) {
-      options = Object.assign({}, config.options, options)
-    }
-
     // add plugin for vue-loader scoped css rewrite
     if (query.scoped) {
       plugins.push(addId({ id: query.id }))
@@ -110,20 +87,15 @@ module.exports = function (css, map) {
       }
     }
 
-    postcss(plugins)
+    return postcss(plugins)
       .process(css, options)
       .then(function (result) {
         var map = result.map && result.map.toJSON()
         cb(null, result.css, map)
         return null // silence bluebird warning
       })
-      .catch(function (e) {
-        console.log(e)
-        cb(e)
-      })
+  }).catch(e => {
+    console.log(e)
+    cb(e)
   })
 }
-
-function isObject (val) {
-  return val && typeof val === 'object'
-}
diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
new file mode 100644
index 000000000..95bac6a1c
--- /dev/null
+++ b/lib/style-compiler/load-postcss-config.js
@@ -0,0 +1,45 @@
+var load = require('postcss-load-config')
+
+let loaded
+
+function isObject (val) {
+  return val && typeof val === 'object'
+}
+
+module.exports = function loadPostcssConfig (inlineConfig) {
+  if (process.env.VUE_LOADER_TEST || !loaded) {
+    loaded = load({}, null, { argv: false }).catch(() => {
+      // postcss-load-config throws error when no config file is found,
+      // but for us it's optional.
+    })
+  }
+
+  return loaded.then(config => {
+    var plugins = []
+    var options = {}
+
+    // inline postcss options for vue-loader
+    if (typeof inlineConfig === 'function') {
+      inlineConfig = inlineConfig.call(this, this)
+    }
+    if (Array.isArray(inlineConfig)) {
+      plugins = inlineConfig
+    } else if (isObject(inlineConfig)) {
+      plugins = inlineConfig.plugins || []
+      options = inlineConfig.options || {}
+    }
+
+    // merge postcss config file
+    if (config && config.plugins) {
+      plugins = plugins.concat(config.plugins)
+    }
+    if (config && config.options) {
+      options = Object.assign({}, config.options, options)
+    }
+
+    return {
+      plugins,
+      options
+    }
+  })
+}
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
deleted file mode 100644
index 06b6f885f..000000000
--- a/lib/template-compiler.js
+++ /dev/null
@@ -1,83 +0,0 @@
-var normalize = require('./normalize')
-var loaderUtils = require('loader-utils')
-var compiler = require('vue-template-compiler')
-var beautify = require('js-beautify').js_beautify
-var transpile = require('vue-template-es2015-compiler')
-var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
-var transformRequire = require('./template-compiler-modules/transform-require')
-
-var defaultCompilerModules = [transformRequire]
-
-module.exports = function (html) {
-  this.cacheable()
-  var isServer = this.target === 'node'
-  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  var vueOptions = this.options.__vueOptions__ || {}
-  var options = loaderUtils.getOptions(this) || {}
-
-  // set user transformToRequire options on module
-  transformRequire._userOptions = options.transformToRequire
-
-  // user compiler modules
-  var userCompilerModules = options.compilerModules || vueOptions.compilerModules
-  // for HappyPack cross-process use cases
-  if (typeof userCompilerModules === 'string') {
-    userCompilerModules = require(userCompilerModules)
-  }
-
-  var compiled = compiler.compile(html, {
-    preserveWhitespace: options.preserveWhitespace,
-    modules: defaultCompilerModules.concat(userCompilerModules || [])
-  })
-
-  // tips
-  if (compiled.tips && compiled.tips.length) {
-    compiled.tips.forEach(tip => {
-      this.emitWarning(tip)
-    })
-  }
-
-  var code
-  if (compiled.errors && compiled.errors.length) {
-    this.emitError(
-      `\n  Error compiling template:\n${pad(html)}\n` +
-      compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
-    )
-    code = 'module.exports={render:function(){},staticRenderFns:[]}'
-  } else {
-    var bubleOptions = options.buble
-    code = transpile('module.exports={' +
-      'render:' + toFunction(compiled.render) + ',' +
-      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-    '}', bubleOptions)
-    // mark with stripped (this enables Vue to use correct runtime proxy detection)
-    if (!isProduction && (
-      !bubleOptions ||
-      !bubleOptions.transforms ||
-      bubleOptions.transforms.stripWith !== false
-    )) {
-      code += `\nmodule.exports.render._withStripped = true`
-    }
-  }
-  // hot-reload
-  if (!isServer && !isProduction) {
-    code +=
-      '\nif (module.hot) {\n' +
-      '  module.hot.accept()\n' +
-      '  if (module.hot.data) {\n' +
-      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
-      '  }\n' +
-      '}'
-  }
-  return code
-}
-
-function toFunction (code) {
-  return 'function (){' + beautify(code, {
-    indent_size: 2 // eslint-disable-line camelcase
-  }) + '}'
-}
-
-function pad (html) {
-  return html.split(/\r?\n/).map(line => `  ${line}`).join('\n')
-}
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
new file mode 100644
index 000000000..c40ea8c56
--- /dev/null
+++ b/lib/template-compiler/index.js
@@ -0,0 +1,86 @@
+var normalize = require('../normalize')
+var loaderUtils = require('loader-utils')
+var compiler = require('vue-template-compiler')
+var beautify = require('js-beautify').js_beautify
+var transpile = require('vue-template-es2015-compiler')
+var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
+var transformRequire = require('./modules/transform-require')
+var rewriteInlineStyles = require('./modules/inline-style')
+
+module.exports = function (html) {
+  this.cacheable()
+  var cb = this.async()
+  var isServer = this.target === 'node'
+  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
+  var vueOptions = this.options.__vueOptions__ || {}
+  var options = loaderUtils.getOptions(this) || {}
+
+  Promise.all([
+    transformRequire(options.transformToRequire),
+    rewriteInlineStyles()
+  ]).then(defaultCompilerModules => {
+    // user compiler modules
+    var userCompilerModules = options.compilerModules || vueOptions.compilerModules
+    // for HappyPack cross-process use cases
+    if (typeof userCompilerModules === 'string') {
+      userCompilerModules = require(userCompilerModules)
+    }
+
+    var compiled = compiler.compile(html, {
+      preserveWhitespace: options.preserveWhitespace,
+      modules: defaultCompilerModules.concat(userCompilerModules || [])
+    })
+
+    // tips
+    if (compiled.tips && compiled.tips.length) {
+      compiled.tips.forEach(tip => {
+        this.emitWarning(tip)
+      })
+    }
+
+    var code
+    if (compiled.errors && compiled.errors.length) {
+      this.emitError(
+        `\n  Error compiling template:\n${pad(html)}\n` +
+        compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
+      )
+      code = 'module.exports={render:function(){},staticRenderFns:[]}'
+    } else {
+      var bubleOptions = options.buble
+      code = transpile('module.exports={' +
+        'render:' + toFunction(compiled.render) + ',' +
+        'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+      '}', bubleOptions)
+      // mark with stripped (this enables Vue to use correct runtime proxy detection)
+      if (!isProduction && (
+        !bubleOptions ||
+        !bubleOptions.transforms ||
+        bubleOptions.transforms.stripWith !== false
+      )) {
+        code += `\nmodule.exports.render._withStripped = true`
+      }
+    }
+    // hot-reload
+    if (!isServer && !isProduction) {
+      code +=
+        '\nif (module.hot) {\n' +
+        '  module.hot.accept()\n' +
+        '  if (module.hot.data) {\n' +
+        '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
+        '  }\n' +
+        '}'
+    }
+
+    cb(null, code)
+  }).catch(cb)
+}
+
+function toFunction (code) {
+  return 'function (){' + beautify(code, {
+    indent_size: 2 // eslint-disable-line camelcase
+  }) + '}'
+}
+
+function pad (html) {
+  return html.split(/\r?\n/).map(line => `  ${line}`).join('\n')
+}
diff --git a/lib/template-compiler/modules/inline-style.js b/lib/template-compiler/modules/inline-style.js
new file mode 100644
index 000000000..69637fd63
--- /dev/null
+++ b/lib/template-compiler/modules/inline-style.js
@@ -0,0 +1,9 @@
+// 1. load postcss config
+// 2. transform staticStyle?
+var loadPostcssConfig = require('../../style-compiler/load-postcss-config')
+
+module.exports = () => {
+  return loadPostcssConfig().then(config => {
+    return {}
+  })
+}
diff --git a/lib/template-compiler-modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
similarity index 51%
rename from lib/template-compiler-modules/transform-require.js
rename to lib/template-compiler/modules/transform-require.js
index 20f57147a..bf8676f2a 100644
--- a/lib/template-compiler-modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -4,21 +4,26 @@ var defaultOptions = {
   image: 'xlink:href'
 }
 
-module.exports = {
-  _userOptions: null,
-  postTransformNode: el => {
-    var userOptions = module.exports._userOptions
-    var options = userOptions
-      ? Object.assign({}, defaultOptions, userOptions)
-      : defaultOptions
-    for (var tag in options) {
-      if (el.tag === tag && el.attrs) {
-        var attributes = options[tag]
-        if (typeof attributes === 'string') {
-          el.attrs.some(attr => rewrite(attr, attributes))
-        } else if (Array.isArray(attributes)) {
-          attributes.forEach(item => el.attrs.some(attr => rewrite(attr, item)))
-        }
+module.exports = userOptions => {
+  var options = userOptions
+    ? Object.assign({}, defaultOptions, userOptions)
+    : defaultOptions
+
+  return {
+    postTransformNode: node => {
+      transform(node, options)
+    }
+  }
+}
+
+function transform (node, options) {
+  for (var tag in options) {
+    if (node.tag === tag && node.attrs) {
+      var attributes = options[tag]
+      if (typeof attributes === 'string') {
+        node.attrs.some(attr => rewrite(attr, attributes))
+      } else if (Array.isArray(attributes)) {
+        attributes.forEach(item => node.attrs.some(attr => rewrite(attr, item)))
       }
     }
   }
diff --git a/lib/template-loader.js b/lib/template-compiler/preprocessor.js
similarity index 100%
rename from lib/template-loader.js
rename to lib/template-compiler/preprocessor.js

From feeda78020cea98504bf3a246e5a9dc4016db3ea Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 18:03:29 +0800
Subject: [PATCH 543/877] more refactor

---
 lib/loader.js                  | 4 ++--
 lib/template-compiler/index.js | 2 +-
 lib/{ => utils}/gen-id.js      | 0
 lib/{ => utils}/normalize.js   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename lib/{ => utils}/gen-id.js (100%)
 rename lib/{ => utils}/normalize.js (70%)

diff --git a/lib/loader.js b/lib/loader.js
index 3da9d6596..9489bdeb3 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,7 +1,7 @@
 var path = require('path')
 var parse = require('./parser')
-var genId = require('./gen-id')
-var normalize = require('./normalize')
+var genId = require('./utils/gen-id')
+var normalize = require('./utils/normalize')
 var loaderUtils = require('loader-utils')
 var querystring = require('querystring')
 
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index c40ea8c56..1ba93e2cf 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -1,5 +1,5 @@
-var normalize = require('../normalize')
 var loaderUtils = require('loader-utils')
+var normalize = require('../utils/normalize')
 var compiler = require('vue-template-compiler')
 var beautify = require('js-beautify').js_beautify
 var transpile = require('vue-template-es2015-compiler')
diff --git a/lib/gen-id.js b/lib/utils/gen-id.js
similarity index 100%
rename from lib/gen-id.js
rename to lib/utils/gen-id.js
diff --git a/lib/normalize.js b/lib/utils/normalize.js
similarity index 70%
rename from lib/normalize.js
rename to lib/utils/normalize.js
index 4664486e7..dda06ce5d 100644
--- a/lib/normalize.js
+++ b/lib/utils/normalize.js
@@ -3,13 +3,13 @@ var fs = require('fs')
 var path = require('path')
 
 exports.lib = function (file) {
-  return path.resolve(__dirname, file)
+  return path.resolve(__dirname, '../', file)
 }
 
 exports.dep = function (dep) {
   if (IS_TEST) {
     return dep
-  } else if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
+  } else if (fs.existsSync(path.resolve(__dirname, '../../node_modules', dep))) {
     // npm 2 or npm linked
     return 'vue-loader/node_modules/' + dep
   } else {

From adf3cee797918180bcf27cd30103e3ee1432ec4b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 18:07:29 +0800
Subject: [PATCH 544/877] comments

---
 lib/component-normalizer.js                        | 3 +++
 lib/selector.js                                    | 4 ++++
 lib/template-compiler/modules/inline-style.js      | 3 +++
 lib/template-compiler/modules/transform-require.js | 1 +
 lib/template-compiler/preprocessor.js              | 2 ++
 5 files changed, 13 insertions(+)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index d1b8a190e..2a72a28ba 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -1,3 +1,6 @@
+// this module is a runtime utility for cleaner component module output and will
+// be included in the final webpack user bundle
+
 module.exports = function normalizeComponent (
   rawScriptExports,
   compiledTemplate,
diff --git a/lib/selector.js b/lib/selector.js
index 7779b8d2f..e2f87517f 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -1,3 +1,7 @@
+// this is a utility loader that takes a *.vue file, parses it and returns
+// the requested language block, e.g. the content inside <template>, for
+// further processing.
+
 var path = require('path')
 var parse = require('./parser')
 var loaderUtils = require('loader-utils')
diff --git a/lib/template-compiler/modules/inline-style.js b/lib/template-compiler/modules/inline-style.js
index 69637fd63..73e8c5057 100644
--- a/lib/template-compiler/modules/inline-style.js
+++ b/lib/template-compiler/modules/inline-style.js
@@ -1,5 +1,8 @@
+// TODO: apply same postcss processing to inline styles inside templates
+
 // 1. load postcss config
 // 2. transform staticStyle?
+
 var loadPostcssConfig = require('../../style-compiler/load-postcss-config')
 
 module.exports = () => {
diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index bf8676f2a..fa8a8498b 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -1,4 +1,5 @@
 // vue compiler module for using transforming `<tag>:<attribute>` to `require`
+
 var defaultOptions = {
   img: 'src',
   image: 'xlink:href'
diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index e0690c84f..860b099e2 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -1,3 +1,5 @@
+// loader for pre-processing templates with e.g. pug
+
 var cons = require('consolidate')
 var loaderUtils = require('loader-utils')
 var extname = require('path').extname

From c09259a1f4440f5467f254eed03bcaa049741fad Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 22:32:30 +0800
Subject: [PATCH 545/877] remove colliding deps

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b09702a40..af7ec84db 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "js-beautify": "^1.6.3",
     "loader-utils": "^1.0.2",
     "lru-cache": "^4.0.1",
-    "postcss": "^5.0.10",
+    "postcss": "^5.0.21",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",
@@ -69,7 +69,6 @@
     "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",
     "null-loader": "^0.1.1",
-    "postcss": "^5.0.21",
     "pug": "^2.0.0-beta6",
     "raw-loader": "^0.5.1",
     "skeleton-loader": "0.0.5",

From 7605f7ac70dd03db324afb999f504c3410e94989 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 22:33:36 +0800
Subject: [PATCH 546/877] revert inline style module

---
 lib/template-compiler/index.js                | 105 +++++++++---------
 lib/template-compiler/modules/inline-style.js |  12 --
 .../modules/transform-require.js              |   2 +-
 3 files changed, 51 insertions(+), 68 deletions(-)
 delete mode 100644 lib/template-compiler/modules/inline-style.js

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 1ba93e2cf..e3b3092cc 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -5,74 +5,69 @@ var beautify = require('js-beautify').js_beautify
 var transpile = require('vue-template-es2015-compiler')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 var transformRequire = require('./modules/transform-require')
-var rewriteInlineStyles = require('./modules/inline-style')
 
 module.exports = function (html) {
   this.cacheable()
-  var cb = this.async()
   var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
   var vueOptions = this.options.__vueOptions__ || {}
   var options = loaderUtils.getOptions(this) || {}
 
-  Promise.all([
-    transformRequire(options.transformToRequire),
-    rewriteInlineStyles()
-  ]).then(defaultCompilerModules => {
-    // user compiler modules
-    var userCompilerModules = options.compilerModules || vueOptions.compilerModules
-    // for HappyPack cross-process use cases
-    if (typeof userCompilerModules === 'string') {
-      userCompilerModules = require(userCompilerModules)
-    }
+  var defaultModules = [transformRequire(options.transformToRequire)]
+  var userModules = vueOptions.compilerModules || options.compilerModules
+  // for HappyPack cross-process use cases
+  if (typeof userModules === 'string') {
+    userModules = require(userModules)
+  }
 
-    var compiled = compiler.compile(html, {
-      preserveWhitespace: options.preserveWhitespace,
-      modules: defaultCompilerModules.concat(userCompilerModules || [])
-    })
+  var compilerOptions = {
+    preserveWhitespace: options.preserveWhitespace,
+    modules: defaultModules.concat(userModules || [])
+  }
 
-    // tips
-    if (compiled.tips && compiled.tips.length) {
-      compiled.tips.forEach(tip => {
-        this.emitWarning(tip)
-      })
-    }
+  var compiled = compiler.compile(html, compilerOptions)
 
-    var code
-    if (compiled.errors && compiled.errors.length) {
-      this.emitError(
-        `\n  Error compiling template:\n${pad(html)}\n` +
-        compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
-      )
-      code = 'module.exports={render:function(){},staticRenderFns:[]}'
-    } else {
-      var bubleOptions = options.buble
-      code = transpile('module.exports={' +
-        'render:' + toFunction(compiled.render) + ',' +
-        'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-      '}', bubleOptions)
-      // mark with stripped (this enables Vue to use correct runtime proxy detection)
-      if (!isProduction && (
-        !bubleOptions ||
-        !bubleOptions.transforms ||
-        bubleOptions.transforms.stripWith !== false
-      )) {
-        code += `\nmodule.exports.render._withStripped = true`
-      }
-    }
-    // hot-reload
-    if (!isServer && !isProduction) {
-      code +=
-        '\nif (module.hot) {\n' +
-        '  module.hot.accept()\n' +
-        '  if (module.hot.data) {\n' +
-        '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
-        '  }\n' +
-        '}'
+  // tips
+  if (compiled.tips && compiled.tips.length) {
+    compiled.tips.forEach(tip => {
+      this.emitWarning(tip)
+    })
+  }
+
+  var code
+  if (compiled.errors && compiled.errors.length) {
+    this.emitError(
+      `\n  Error compiling template:\n${pad(html)}\n` +
+      compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
+    )
+    code = 'module.exports={render:function(){},staticRenderFns:[]}'
+  } else {
+    var bubleOptions = options.buble
+    code = transpile('module.exports={' +
+      'render:' + toFunction(compiled.render) + ',' +
+      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+    '}', bubleOptions)
+    // mark with stripped (this enables Vue to use correct runtime proxy detection)
+    if (!isProduction && (
+      !bubleOptions ||
+      !bubleOptions.transforms ||
+      bubleOptions.transforms.stripWith !== false
+    )) {
+      code += `\nmodule.exports.render._withStripped = true`
     }
+  }
+  // hot-reload
+  if (!isServer && !isProduction) {
+    code +=
+      '\nif (module.hot) {\n' +
+      '  module.hot.accept()\n' +
+      '  if (module.hot.data) {\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
+      '  }\n' +
+      '}'
+  }
 
-    cb(null, code)
-  }).catch(cb)
+  return code
 }
 
 function toFunction (code) {
diff --git a/lib/template-compiler/modules/inline-style.js b/lib/template-compiler/modules/inline-style.js
deleted file mode 100644
index 73e8c5057..000000000
--- a/lib/template-compiler/modules/inline-style.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// TODO: apply same postcss processing to inline styles inside templates
-
-// 1. load postcss config
-// 2. transform staticStyle?
-
-var loadPostcssConfig = require('../../style-compiler/load-postcss-config')
-
-module.exports = () => {
-  return loadPostcssConfig().then(config => {
-    return {}
-  })
-}
diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index fa8a8498b..d347670e7 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -1,4 +1,4 @@
-// vue compiler module for using transforming `<tag>:<attribute>` to `require`
+// vue compiler module for transforming `<tag>:<attribute>` to `require`
 
 var defaultOptions = {
   img: 'src',

From a1b936fe66a3dd0ab7791e34ac6db8a51b0a1114 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 22:33:49 +0800
Subject: [PATCH 547/877] adjust custom module test case

---
 ...om-compiler-module.js => custom-module.js} |  0
 test/fixtures/custom-module.vue               |  5 +++++
 test/test.js                                  | 20 +++++++++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)
 rename test/fixtures/{custom-compiler-module.js => custom-module.js} (100%)
 create mode 100644 test/fixtures/custom-module.vue

diff --git a/test/fixtures/custom-compiler-module.js b/test/fixtures/custom-module.js
similarity index 100%
rename from test/fixtures/custom-compiler-module.js
rename to test/fixtures/custom-module.js
diff --git a/test/fixtures/custom-module.vue b/test/fixtures/custom-module.vue
new file mode 100644
index 000000000..fd9dbe526
--- /dev/null
+++ b/test/fixtures/custom-module.vue
@@ -0,0 +1,5 @@
+<template>
+  <div style="flex-direction: row">
+    <span :style="{ transform }"></span>
+  </div>
+</template>
diff --git a/test/test.js b/test/test.js
index a8a34fe9e..00b39384d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -703,23 +703,31 @@ describe('vue-loader', function () {
 
   it('custom compiler modules', done => {
     test({
-      entry: './test/fixtures/basic.vue',
+      entry: './test/fixtures/custom-module.vue',
       vue: {
         compilerModules: [
           {
             postTransformNode: el => {
-              if (el.staticClass) {
-                el.staticClass = '"red blue"'
+              if (el.staticStyle) {
+                el.staticStyle = `$processStyle(${el.staticStyle})`
+              }
+              if (el.styleBinding) {
+                el.styleBinding = `$processStyle(${el.styleBinding})`
               }
             }
           }
         ]
       }
     }, (window, module) => {
+      var results = []
       var vnode = mockRender(module, {
-        msg: 'hi'
+        $processStyle: style => results.push(style),
+        transform: 'translateX(10px)'
       })
-      expect(vnode.data.staticClass).to.equal('red blue')
+      expect(results).to.deep.equal([
+        { 'flex-direction': 'row' },
+        { 'transform': 'translateX(10px)' }
+      ])
       done()
     })
   })
@@ -728,7 +736,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue',
       vue: {
-        compilerModules: require.resolve('./fixtures/custom-compiler-module')
+        compilerModules: require.resolve('./fixtures/custom-module')
       }
     }, (window, module) => {
       var vnode = mockRender(module, {

From 3597f6d2b5dd6b4b47fbc30b8ff0902278444d1f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 22:34:05 +0800
Subject: [PATCH 548/877] 11.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af7ec84db..71da958ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.1.4",
+  "version": "11.2.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From bfacd6168a0160d9039d52cb8bf6458cdc53b2f2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 21 Mar 2017 22:40:46 +0800
Subject: [PATCH 549/877] split built-in postcss plugins

---
 lib/style-compiler/index.js            | 39 ++------------------------
 lib/style-compiler/plugins/scope-id.js | 27 ++++++++++++++++++
 lib/style-compiler/plugins/trim.js     | 11 ++++++++
 3 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 lib/style-compiler/plugins/scope-id.js
 create mode 100644 lib/style-compiler/plugins/trim.js

diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index 0b0982fa6..a3d14b972 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -1,42 +1,9 @@
 var postcss = require('postcss')
 var loaderUtils = require('loader-utils')
-var selectorParser = require('postcss-selector-parser')
 var loadPostcssConfig = require('./load-postcss-config')
 
-var addId = postcss.plugin('add-id', function (opts) {
-  return function (root) {
-    root.each(function rewriteSelector (node) {
-      if (!node.selector) {
-        // handle media queries
-        if (node.type === 'atrule' && node.name === 'media') {
-          node.each(rewriteSelector)
-        }
-        return
-      }
-      node.selector = selectorParser(function (selectors) {
-        selectors.each(function (selector) {
-          var node = null
-          selector.each(function (n) {
-            if (n.type !== 'pseudo') node = n
-          })
-          selector.insertAfter(node, selectorParser.attribute({
-            attribute: opts.id
-          }))
-        })
-      }).process(node.selector).result
-    })
-  }
-})
-
-var trim = postcss.plugin('trim', function (opts) {
-  return function (css) {
-    css.walk(function (node) {
-      if (node.type === 'rule' || node.type === 'atrule') {
-        node.raws.before = node.raws.after = '\n'
-      }
-    })
-  }
-})
+var trim = require('./plugins/trim')
+var scopeId = require('./plugins/scope-id')
 
 module.exports = function (css, map) {
   this.cacheable()
@@ -69,7 +36,7 @@ module.exports = function (css, map) {
 
     // add plugin for vue-loader scoped css rewrite
     if (query.scoped) {
-      plugins.push(addId({ id: query.id }))
+      plugins.push(scopeId({ id: query.id }))
     }
 
     // source map
diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
new file mode 100644
index 000000000..dbcad9fd6
--- /dev/null
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -0,0 +1,27 @@
+var postcss = require('postcss')
+var selectorParser = require('postcss-selector-parser')
+
+module.exports = postcss.plugin('add-id', function (opts) {
+  return function (root) {
+    root.each(function rewriteSelector (node) {
+      if (!node.selector) {
+        // handle media queries
+        if (node.type === 'atrule' && node.name === 'media') {
+          node.each(rewriteSelector)
+        }
+        return
+      }
+      node.selector = selectorParser(function (selectors) {
+        selectors.each(function (selector) {
+          var node = null
+          selector.each(function (n) {
+            if (n.type !== 'pseudo') node = n
+          })
+          selector.insertAfter(node, selectorParser.attribute({
+            attribute: opts.id
+          }))
+        })
+      }).process(node.selector).result
+    })
+  }
+})
diff --git a/lib/style-compiler/plugins/trim.js b/lib/style-compiler/plugins/trim.js
new file mode 100644
index 000000000..57163d8da
--- /dev/null
+++ b/lib/style-compiler/plugins/trim.js
@@ -0,0 +1,11 @@
+var postcss = require('postcss')
+
+module.exports = postcss.plugin('trim', function (opts) {
+  return function (css) {
+    css.walk(function (node) {
+      if (node.type === 'rule' || node.type === 'atrule') {
+        node.raws.before = node.raws.after = '\n'
+      }
+    })
+  }
+})

From bded4516e95ab43b16f073f4ff3e49ec0941b059 Mon Sep 17 00:00:00 2001
From: Nicholas Lee <nicholaslee119@gmail.com>
Date: Thu, 23 Mar 2017 15:52:28 +0900
Subject: [PATCH 550/877] [feature]About the hard-coded list of excluded
 loaders chained before vue-loader (#697)

* make excluded preloader configurable

* fix the comment

* update the document
---
 docs/en/configurations/advanced.md |  5 ++++-
 lib/loader.js                      | 12 +++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 5c48d64cf..17aa63da7 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -48,7 +48,10 @@ module.exports = {
           //   plugin will be a better option.
           postLoaders: {
             html: 'babel-loader'
-          }
+          },
+          
+          // `excludedPreLoaders` should be regex
+          excludedPreLoaders: /(eslint-loader)/
         }
       }
     ]
diff --git a/lib/loader.js b/lib/loader.js
index 9489bdeb3..006e65828 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -36,15 +36,13 @@ var defaultLang = {
 
 // When extracting parts from the source vue file, we want to apply the
 // loaders chained before vue-loader, but exclude some loaders that simply
-// produces side effects such as linting. This is a hard-coded list and
-// hopefully eslint-loader is the only one.
-var excludedPreLoadersRE = /eslint-loader/
-
-function getRawRequest (context) {
+// produces side effects such as linting.
+function getRawRequest (context, excludedPreLoaders) {
+  excludedPreLoaders = excludedPreLoaders || /eslint-loader/
   return loaderUtils.getRemainingRequest({
     resource: context.resource,
     loaderIndex: context.loaderIndex,
-    loaders: context.loaders.filter(loader => !excludedPreLoadersRE.test(loader.path))
+    loaders: context.loaders.filter(loader => !excludedPreLoaders.test(loader.path))
   })
 }
 
@@ -55,8 +53,8 @@ module.exports = function (content) {
 
   var loaderContext = this
   var query = loaderUtils.getOptions(this) || {}
-  var rawRequest = getRawRequest(this)
   var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
+  var rawRequest = getRawRequest(this, options.excludedPreLoaders)
 
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)

From 08fdb922949980e71183de50a6dfc8f401ff821a Mon Sep 17 00:00:00 2001
From: Masaya Nasu <masaya.nasu@crowdworks.co.jp>
Date: Thu, 23 Mar 2017 16:07:56 +0900
Subject: [PATCH 551/877] Translate Japanese (#541)

* Translate Japanese

* add japanese doc link

* translate for README.md with japanese

* translate for spec.md with japanese

* translate for setup.md with japanese

* translate for es2015.md with japanese

* translate for scoped-css.md with japanese

* translate for css-modules.md with japanese

* translate for postcss.md with japanese

* translate for hot-reload.md with japanese

* translate for pre-processors.md with japanese

* translate for asset-url.md with japanese

* translate for advanced.md with japanese

* translate for extract-css.md with japanese

* translate for production.md with japanese

* translate for linting.md with japanese

* translate for testing.md with japanese

* translate for testing-with-mocks.md with japanese

* translate for options.md with japanese

* fix typo and check style README.md

* fix typo and check style spec.md

* add custom-blocks.md

* fix typo and check style es2015.md

* fix typo and check style scoped-css.md

* rewrite advanced.md

* fix README.md

* translate for SUMMARY.md

* fix asset-url.md

* fix typo pre-processors.md

* fix typo hot-reload.md

* fix tone production.md

* fix css-modules.md

* fix es2015.md

* fix es2015.md

* fix postcss.md

* fix scoped-css.md

* fix options.md

* fix options.md

* fix setup.md

* fix spec.md

* fix lint.md

* fix testing-with-mocks.md

* fix testing.md

* translate for custom-blocks.md with japanese

* check and fix
---
 docs/LANGS.md                            |   3 +-
 docs/ja/README.md                        |  38 +++++
 docs/ja/SUMMARY.md                       |  21 +++
 docs/ja/configurations/advanced.md       |  80 ++++++++++
 docs/ja/configurations/asset-url.md      |  22 +++
 docs/ja/configurations/custom-blocks.md  |  67 ++++++++
 docs/ja/configurations/extract-css.md    |  70 +++++++++
 docs/ja/configurations/pre-processors.md |  81 ++++++++++
 docs/ja/features/css-modules.md          | 117 ++++++++++++++
 docs/ja/features/es2015.md               |  64 ++++++++
 docs/ja/features/hot-reload.md           |   7 +
 docs/ja/features/postcss.md              |  68 +++++++++
 docs/ja/features/scoped-css.md           |  51 +++++++
 docs/ja/options.md                       | 187 +++++++++++++++++++++++
 docs/ja/start/setup.md                   |  13 ++
 docs/ja/start/spec.md                    | 103 +++++++++++++
 docs/ja/workflow/linting.md              |  92 +++++++++++
 docs/ja/workflow/production.md           |  39 +++++
 docs/ja/workflow/testing-with-mocks.md   |  70 +++++++++
 docs/ja/workflow/testing.md              | 101 ++++++++++++
 20 files changed, 1293 insertions(+), 1 deletion(-)
 create mode 100644 docs/ja/README.md
 create mode 100644 docs/ja/SUMMARY.md
 create mode 100644 docs/ja/configurations/advanced.md
 create mode 100644 docs/ja/configurations/asset-url.md
 create mode 100644 docs/ja/configurations/custom-blocks.md
 create mode 100644 docs/ja/configurations/extract-css.md
 create mode 100644 docs/ja/configurations/pre-processors.md
 create mode 100644 docs/ja/features/css-modules.md
 create mode 100644 docs/ja/features/es2015.md
 create mode 100644 docs/ja/features/hot-reload.md
 create mode 100644 docs/ja/features/postcss.md
 create mode 100644 docs/ja/features/scoped-css.md
 create mode 100644 docs/ja/options.md
 create mode 100644 docs/ja/start/setup.md
 create mode 100644 docs/ja/start/spec.md
 create mode 100644 docs/ja/workflow/linting.md
 create mode 100644 docs/ja/workflow/production.md
 create mode 100644 docs/ja/workflow/testing-with-mocks.md
 create mode 100644 docs/ja/workflow/testing.md

diff --git a/docs/LANGS.md b/docs/LANGS.md
index da850e148..4e23e5549 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1,4 +1,5 @@
 * [English](en/)
 * [한국어](kr/)
 * [Русский](ru/)
-* [Português](pt_BR/)
\ No newline at end of file
+* [Português](pt_BR/)
+* [日本語](ja/)
diff --git a/docs/ja/README.md b/docs/ja/README.md
new file mode 100644
index 000000000..c80aa4030
--- /dev/null
+++ b/docs/ja/README.md
@@ -0,0 +1,38 @@
+# はじめに
+
+### `vue-loader` とは ?
+
+`vue-loader` とは以下の形式で記述された Vue コンポーネントをプレーンな JavaScript モジュールに変換する Webpack の loader です。
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+`vue-loader` によって多くのクールな機能が提供されます：
+
+- デフォルトで ES2015 が有効；
+- `<style>` には SASS、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の Webpack の loader が使用可能；
+ カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能；
+- `<style>` と `<template>` で参照される静的なアセットをモジュールの依存として扱い、Webpack の loader で処理可能；
+- 各コンポーネントで scoped CSS をシミュレートすることが可能；
+- 開発時のコンポーネントのホットリロードをサポート
+
+つまり、Webpack と `vue-loader` の組み合わせは Vue.js アプリケーションを作成するための、現代的で柔軟かつとても強力なフロントエンドワークフローを実現することが可能になります。
+
+### Webpack とは?
+
+すでに Webpack に精通している場合は、次の説明を省略してもかまいません。しかし、Webpack を初めて使う人のために、ここで簡単な紹介を行います。
+
+[Webpack](http://webpack.github.io/) とはモジュールのバンドラーです。それぞれのファイルをモジュールとして扱い、それらの間の依存関係を解決し、デプロイの準備が整った静的アセットにバンドルします。
+
+![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+
+基本的な例として、CommonJS モジュールが多数あるとします。これらはブラウザで直接実行できません。なのでそれらを `<script>` タグを介して読み込むことのできる単一のファイルに "バンドル" する必要があります。Webpack は `require()` での依存性解決と実行を行うことが出来ます。
+
+しかし Webpack はそれ以上のことが出来ます。 "loader" を用いることで、最終的なバンドルしたファイルを出力する前に Webpack に様々な方法で全てのタイプのファイルを変換できるように設定することが出来ます。いくつかの例をあげると：
+
+- ES2015、CoffeeScript、TypeScript のモジュールをプレーンな ES5 の CommonJS モジュールにトランスパイル；
+- オプションでコンパイルを行う前にソースコードを linter に通すことが可能；
+- Jade テンプレートをプレーンな HTML にトランスパイルし、JavaScript の文字列として展開；
+- SASS ファイルをプレーンな CSS にトランスパイルし、`<style>` タグとして挿入する JavaScript スニペットに変換；
+- HTML または CSS で参照されるイメージファイルを処理し、パスの設定に基づいた目的の場所に移動し、md5 ハッシュを使用して名前付け；
+
+Webpack は非常に強力です。どのように動作するか理解すれば、フロントエンド開発のワークフローを劇的に向上させることが出来ます。欠点としては冗長で複雑な構成です。しかし、このガイドでは Vue.js と `vue-loader` での Webpack を使用する際に一般的な問題の解決策を見つけることができるはずです。
diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
new file mode 100644
index 000000000..f489b56ec
--- /dev/null
+++ b/docs/ja/SUMMARY.md
@@ -0,0 +1,21 @@
+- 入門
+  - [Vue Component の仕様](start/spec.md)
+  - [プロジェクトのセットアップ](start/setup.md)
+- 機能
+  - [ES2015](features/es2015.md)
+  - [スコープ付き CSS](features/scoped-css.md)
+  - [CSS モジュール](features/css-modules.md)
+  - [PostCSS](features/postcss.md)
+  - [ホットリロード](features/hot-reload.md)
+- 構成
+  - [プリプロセッサの使用](configurations/pre-processors.md)
+  - [アセット URL ハンドリング](configurations/asset-url.md)
+  - [高度な loader の設定](configurations/advanced.md)
+  - [CSS を単一のファイルに抽出する](configurations/extract-css.md)
+  - [カスタムブロック](configurations/custom-blocks.md)
+- ワークフロー
+  - [プロダクションビルド](workflow/production.md)
+  - [Linting](workflow/linting.md)
+  - [テスト](workflow/testing.md)
+  - [モックを使用したテスト](workflow/testing-with-mocks.md)
+- [オプションリファレンス](options.md)
diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
new file mode 100644
index 000000000..6778fcdbb
--- /dev/null
+++ b/docs/ja/configurations/advanced.md
@@ -0,0 +1,80 @@
+# 高度な loader の設定
+
+時折こうしたくなるかもしれません：
+
+1. `vue-loader` が推測するのではなく、カスタム loader の文字列を言語に適用する。
+2. デフォルトの言語の組み込み loader の設定の上書き。
+3. 特定の言語ブロックをカスタム loader で前処理か後処理をする。
+
+そうするためには、`vue-loader` に `loaders` オプションを指定してください：
+
+> メモ： `preLoaders` と `postLoaders` は 10.3.0 以上でのみサポートされます
+
+### Webpack 2.x
+
+``` js
+module.exports = {
+  // 他のオプション
+  module: {
+    // module.rules は 1.x での module.loaders と同じです
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // `loaders` はデフォルトの loaderを上書きします。
+          // 次の設定では、"lang" 属性のない全ての <script> タグに
+          // coffee-loader が適用されます。
+          loaders: {
+            js: 'coffee-loader'
+          },
+
+          // `preLoaders` はデフォルトの loader の前に付加されます。
+          // これを使用して言語ブロックを前処理することができます。
+          // 一般的な使用例はビルドタイム i18n です。
+          preLoaders: {
+            js: '/path/to/custom/loader'
+          },
+
+          // `postLoaders` はデフォルトの loader の後につけられます。
+          //
+          // - `html` の場合、デフォルトの loader によって返される結果は、
+          //   コンパイルされた JavaScript レンダリング関数コードになります。
+          //
+          // - `css` の場合、結果は vue-style-loader によって返されます。
+          //   しかしこれはほとんどの場合特に有用ではありません。
+          //   postcss プラグインを使用する方が良い選択になります。
+          postLoaders: {
+            html: 'babel-loader'
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+### Webpack 1.x
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ほかのオプション
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // vue-loader の設定
+  vue: {
+    loaders: {
+      // 上記の設定と同じ
+    }
+  }
+}
+```
+
+高度な loader の設定のより実用的な使用方法は、[CSS を単一のファイルに抽出する](./expression-css.md)にあります。
diff --git a/docs/ja/configurations/asset-url.md b/docs/ja/configurations/asset-url.md
new file mode 100644
index 000000000..7a06878eb
--- /dev/null
+++ b/docs/ja/configurations/asset-url.md
@@ -0,0 +1,22 @@
+# アセット URL ハンドリング
+
+デフォルトで `vue-loader` は [css-loader](https://github.com/webpack/css-loader) と Vue テンプレートコンパイラーでスタイルとテンプレートファイルは自動で処理されます。このコンパイル処理中で全ての `<img src="...">` 、`background: url(...)` や CSS の `@import` のようなアセットの URL は **モジュールの依存関係として処理されます**。
+
+例えば、`url(./image.png)` は `require('./image.png')` に変換され、そして
+
+``` html
+<img src="../image.png">
+```
+
+このようにコンパイルされます：
+
+``` js
+createElement('img', { attrs: { src: require('../image.png') }})
+```
+もちろん `.png` ファイルは JavaScript のファイルではありません。[file-loader](https://github.com/webpack/file-loader) または [url-loader](https://github.com/webpack/url-loader) を使用して Webpack を設定する必要があります。`vue-cli` でスキャフォールドされたプロジェクトでは同じような設定がなされています。
+
+利点の全ては次の通りです：
+
+1. `file-loader` はアセットファイルのコピー先や配置先を制定したり、バージョンハッシュを利用してキャッシングを改善する方法を指定する事が出来ます。さらに、これは、単に**あなたの `* .vue` ファイルの隣にイメージを置くことができ、配備するURLを心配するのではなくフォルダ構造に基づいて相対パスを使用する**ことを意味します。
+
+2. `url-loader` は、指定されたしきい値よりも小さい場合、条件付きでファイルを base-64 データ URL としてインライン化することができます。これにより、単純なファイルに対する HTTP リクエストの量を減らすことができます。 ファイルがしきい値より大きい場合、自動的に `file-loader` にフォールバックします。
diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
new file mode 100644
index 000000000..a9d41d00c
--- /dev/null
+++ b/docs/ja/configurations/custom-blocks.md
@@ -0,0 +1,67 @@
+# カスタムブロック
+
+> 10.2.0 以上で動作します
+
+`*.vue` ファイル内にカスタム言語ブロックを定義することが出来ます。カスタムブロックの内容は `vue-loader` のオブジェクトで指定された loader によって処理され、次にコンポーネントモジュールによって要求されます。この設定は `lang` 属性の代わりにタグ名を使用する点をのぞいて[高度な loader の設定](../configurations/advanced.md)に記載されたものと似ています。
+
+もしカスタムブロックにマッチする loader を見つけたら、それは処理されます。でなければそのカスタムブロックは単に無視されます。
+
+## 例
+
+全ての `<docs>` カスタムブロックを一つのドキュメントファイルに展開する例を示します：
+
+#### component.vue
+
+``` html
+<docs>
+## これは example component です
+</docs>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            // 全ての <docs> の内容は raw text として展開されます
+            'docs': ExtractTextPlugin.extract('raw-loader'),
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    // 全ての docs は一つのファイルに出力されます
+    new ExtractTextPlugin('docs.md')
+  ]
+}
+```
diff --git a/docs/ja/configurations/extract-css.md b/docs/ja/configurations/extract-css.md
new file mode 100644
index 000000000..3d3115550
--- /dev/null
+++ b/docs/ja/configurations/extract-css.md
@@ -0,0 +1,70 @@
+# CSS を単一のファイルに抽出する
+
+すべての Vue コンポーネントで処理されたすべての CSS を1つの CSS ファイルに抽出する例：
+
+### Webpack 2.x
+
+``` bash
+npm install extract-text-webpack-plugin@2.x --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // 他の設定
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              use: 'css-loader',
+              fallback: 'vue-style-loader' // <- これは vue-loader の依存ですので、npm3 を使用している場合は明示的にインストールする必要はありません
+            })
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+### Webpack 1.x
+
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // 他の設定
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // <style lang="less">　または他の言語も含めることができます
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
new file mode 100644
index 000000000..04576ad65
--- /dev/null
+++ b/docs/ja/configurations/pre-processors.md
@@ -0,0 +1,81 @@
+# プリプロセッサの使用
+
+Webpack において、全てのプリプロセッサは対応する loader を適用する必要があります。 `vue-loader` は他の Webpack の loader を使って Vue コンポーネントを処理することが出来ます。言語ブロックの `lang` 属性から適切な loader を自動的に推論します。
+
+### CSS
+
+例えば、SASS で `<style>` タグをコンパイルしましょう：
+
+``` bash
+npm install sass-loader node-sass --save-dev
+```
+
+``` html
+<style lang="sass">
+  /* ここにSASSを書きます */
+</style>
+```
+
+ `<style>` タグ内のテキストコンテンツは、`sass-loader` によって最初にコンパイルされ、その後の処理のために渡されます。
+
+#### sass-loader 使用時の注意
+
+その名前が示すものとは対照的に、[* sass * -loader](https://github.com/jtangelder/sass-loader) はデフォルトで *SCSS* の構文を解析します。インデントされた *SASS* 構文を実際に使用する場合は、それに応じて sass-loader へ vue-loader のオプションを設定する必要があります。
+
+```javascript
+{
+  test: /\.vue$/,
+  loader: 'vue-loader',
+  options: {
+    loaders: {
+      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
+    }
+  }
+}
+```
+
+vue-loader を構成する方法の詳細については、[高度な loader の設定](./advanced.md)セクションを参照してください。
+
+### JavaScript
+
+全てのVueコンポーネントのJavaScriptはデフォルトで `babel-loader` によって処理されます。しかしもちろんそれは変更することが可能です：
+
+``` bash
+npm install coffee-loader --save-dev
+```
+
+``` html
+<script lang="coffee">
+  # coffeescript を書いてください!
+</script>
+```
+
+### テンプレート
+
+`pug-loader` のようなほとんどのWebpackテンプレート loader は、コンパイルされたHTML文字列の代わりにテンプレート関数を返すので、template の処理は少し異なります。`pug-loader` を使う代わりに、オリジナルの `pug` をインストールをするだけです：
+
+``` bash
+npm install pug --save-dev
+```
+
+``` html
+<template lang="pug">
+div
+  h1 Hello world!
+</template>
+```
+
+> **重要:** もし `vue-loader@<8.2.0` を使うのであれば、`template-html-loader` が必要になります。
+
+### インラインローダーリクエスト
+
+`lang` 属性で [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) を使用することが可能です：
+
+``` html
+<style lang="sass?outputStyle=expanded">
+  /* ここでは拡張出力で sass を使用します */
+</style>
+```
+
+ただこれにより Vue コンポーネントが Webpack 固有となり Browserify および [vueify](https://github.com/vuejs/vueify) と互換性がなくなります。 **Vue コンポーネントを再利用可能なサードパーティコンポーネントとして提供する場合は、この構文を使用しないでください。**
diff --git a/docs/ja/features/css-modules.md b/docs/ja/features/css-modules.md
new file mode 100644
index 000000000..8dd753f7b
--- /dev/null
+++ b/docs/ja/features/css-modules.md
@@ -0,0 +1,117 @@
+# CSS モジュール
+
+> バージョン ^9.8.0 が必要
+
+[CSS モジュール](https://github.com/css-modules/css-modules) は CSS をモジュール化して構成するための一般的なシステムです。`vue-loader` はシミュレートされたスコープ付き CSS の代わりに CSS モジュールの一流の統合を提供します。
+
+### 使い方
+
+`module` 属性を `<style>` タグに追加します：
+
+``` html
+<style module>
+.red {
+  color: red;
+}
+.bold {
+  font-weight: bold;
+}
+</style>
+```
+
+`css-loader` の CSS モジュールモードを有効にし、その結果クラス識別子オブジェクトは `$style` という名前の算出プロパティとしてコンポーネントに注入されます。ダイナミッククラスバインディングを利用してテンプレートで使用可能になります。
+
+``` html
+<template>
+  <p :class="$style.red">
+    This should be red
+  </p>
+</template>
+```
+
+これは算出プロパティなので、`:class` の オブジェクト/配列 構文でも動作します：
+
+``` html
+<template>
+  <div>
+    <p :class="{ [$style.red]: isRed }">
+      Am I red?
+    </p>
+    <p :class="[$style.red, $style.bold]">
+      Red and bold
+    </p>
+  </div>
+</template>
+```
+
+そして JavaScript からもアクセス可能です：
+
+``` html
+<script>
+export default {
+  created () {
+    console.log(this.$style.red)
+    // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
+    // filename と className に基づいて出力された識別子。
+  }
+}
+</script>
+```
+
+[CSS Modules spec](https://github.com/css-modules/css-modules) を参照してください。モードの詳細については [global exceptions](https://github.com/css-modules/css-modules#exceptions) と [composition](https://github.com/css-modules/css-modules#composition)を参照してください。
+
+### カスタム代入
+
+単一の `*.vue` コンポーネントは複数の `<style>` タグを持つことが出来ます。注入されたスタイルが互いに上書きするのを避けるために、 `module`属性に値を与えることによって、注入された計算されたプロパティの名前をカスタマイズすることができます：
+
+``` html
+<style module="a">
+  /* a として注入された識別子 */
+</style>
+
+<style module="b">
+  /* b として注入された識別子 */
+</style>
+```
+
+### `css-loader` クエリの設定
+
+CSS モジュールは [css-loader](https://github.com/webpack/css-loader) によって処理されます。`<style module>` では `css-loader` に使われるデフォルトのクエリは次のようになります。
+
+``` js
+{
+  modules: true,
+  importLoaders: true,
+  localIdentName: '[hash:base64]'
+}
+```
+
+vue-loader の `cssModules`オプションを使って` css-loader`に追加のクエリオプションを提供することができます：
+
+``` js
+// webpack 1
+vue: {
+  cssModules: {
+    // ローカルID名を上書きする
+    localIdentName: '[path][name]---[local]---[hash:base64:5]',
+    // キャメルケースを有効にする
+    camelCase: true
+  }
+}
+
+// webpack 2
+module: {
+  rules: [
+    {
+      test: '\.vue$',
+      loader: 'vue-loader',
+      options: {
+        cssModules: {
+          localIdentName: '[path][name]---[local]---[hash:base64:5]',
+          camelCase: true
+        }
+      }
+    }
+  ]
+}
+```
diff --git a/docs/ja/features/es2015.md b/docs/ja/features/es2015.md
new file mode 100644
index 000000000..521c24feb
--- /dev/null
+++ b/docs/ja/features/es2015.md
@@ -0,0 +1,64 @@
+# ES2015
+
+同一プロジェクト内で `babel-loader` か `buble-loader` を検出したとき、全ての `*.vue` ファイルの `<script>` タグを処理するためにそれらを使用し Vue コンポーネント内で ES2015 を使用できるようにします。もしあなたがまだ新しい言語機能を手に入れていないのであれば、手に入れるべきです。いくつかのよい学習リソースはこちら：
+- [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+- [ES6 Features](https://github.com/lukehoban/es6features)
+- [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
+
+他の Vue コンポーネントを読み込む際の典型的なパターンはこちらです。
+
+``` html
+<script>
+import ComponentA from './ComponentA.vue'
+import ComponentB from './ComponentB.vue'
+
+export default {
+  components: {
+    ComponentA,
+    ComponentB
+  }
+}
+</script>
+```
+
+ここでは ES2015 のオブジェクトリテラルを使用して子コンポーネントを定義しています。`{ ComponentA }` は `{ ComponentA: ComponentA }` の簡略形です。 Vue はオートでキーを `component-a` に変換し、インポートされたコンポーネントをテンプレート内で `<component-a>` として使用することが出来ます。
+
+### テンプレート内のES2015
+
+`*.vue` ファイル内の `<template>` は JavaScript の render 関数にコンパイルされ[Buble](https://buble.surge.sh/guide/) のカスタムビルドで処理され ES2015 の機能をサポートします。これにより [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) と[算出プロパティ](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)などの機能が使用できるようになります。
+
+``` html
+<div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
+```
+
+次のように単純化することができます:
+
+``` html
+<div :class="{ active, [`${prefix}-button`]: isButton }">
+```
+
+**vue@^2.1.0 のみ利用可能:** `v-for` かスコープ付きスロットを使用することで、構造化されたパラメータを使用することが出来ます：
+
+``` html
+<li v-for="{ id, text } in items">
+  {{ id }} {{ text }}
+</li>
+```
+
+``` html
+<my-component>
+  <template scope="{ id, text }">
+    <span>{{ id }} {{ text }}</span>
+  </template>
+</my-component>
+```
+
+[buble オプション](../options.md#buble)を使用してテンプレートでサポートされた機能をカスタマイズすることが出来ます。
+
+### `.js` ファイルのトランスパイル
+
+`vue-loader` は `*.vue` ファイルのみ処理するので、Webpack の設定ファイルに `babel-loader` または `buble-loader` を使って `*.js` ファイルを処理するように Webapck に指示する必要があります。 `vue-cli` でプロジェクトを作成しているとすでにそれは用意されています。
+
+### `.babelrc` による Babel の設定
+
+`babel-loader` は [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)を遵守しているので、Babel のプリセットとプラグインで設定することが推奨されています。
diff --git a/docs/ja/features/hot-reload.md b/docs/ja/features/hot-reload.md
new file mode 100644
index 000000000..5959c7c4d
--- /dev/null
+++ b/docs/ja/features/hot-reload.md
@@ -0,0 +1,7 @@
+# ホットリロード
+
+"ホットリロード"はファイルを編集するときに単にページをリロードするだけではありません。ホットリロードを有効にすると、`*.vue` ファイルを編集するとき、すべてのコンポーネントのインスタンスは **ページのリロードをせずに** 取り替えられます。アプリの現在の状態を保持し、コンポーネントを取り替えることが出来ます！これはコンポーネントのテンプレートやスタイリングを微調整するときの開発体験を劇的に改善します。
+
+![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
+
+`vue-cli` を使ってプロジェクトをスキャホールドすると、ホットリロードはすぐに使えるようになります。
diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
new file mode 100644
index 000000000..d8a54ee68
--- /dev/null
+++ b/docs/ja/features/postcss.md
@@ -0,0 +1,68 @@
+# PostCSS
+
+`vue-loader`により処理されたCSSのアウトプットはスコープされたCSSにに書き換えるために[PostCSS](https://github.com/postcss/postcss) を通します。カスタムされた PostCSSプラグインをプロセスに追加することが出来ます。例えば、[autoprefixer](https://github.com/postcss/autoprefixer) や [CSSNext](http://cssnext.io/)があります。
+
+## 設定ファイルの使用
+
+バージョン 11.0 以降、 `vue-loader` は [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) でサポートされているものと同じ PostCss の設定ファイルのオートロードをサポートします：
+
+- `postcss.config.js`
+- `.postcssrc`
+- `package.json` 内の `postcss`
+
+設定ファイルを使用すると `postcss-loader` で処理された通常の CSS ファイルと `*.vue` ファイル内の CSS で同じ設定を共有することができます。
+
+## インラインオプション
+
+あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の postcss の設定を指定することが出来ます。
+
+Webpack 1.x の例：
+
+``` js
+// webpack.config.js
+module.exports = {
+  // 他の設定
+  vue: {
+    // カスタムされた postcss プラグインを使用します
+    postcss: [require('postcss-cssnext')()]
+  }
+}
+```
+
+Webpack 2.x の例:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // 他の設定
+  module: {
+    // module.rules は 1.x の module.loaders と同じです
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        // vue-loader のオプションはここです
+        options: {
+          // ...
+          postcss: [require('postcss-cssnext')()]
+        }
+      }
+    ]
+  }
+}
+```
+
+加えてpluginの配列を提供し、`postcss` オプションは以下も受け入れます：
+
+- プラグインの配列を返す関数；
+
+- PostCSSプロセッサに渡すオプションを含むオブジェクト。これは、カスタム parser/stringifiers に依存するPostCSSプロジェクトを使用している場合に便利です。
+
+  ``` js
+  postcss: {
+    plugins: [...], // プラグインのリスト
+    options: {
+      parser: sugarss // sugarss パーサーを使用します
+    }
+  }
+  ```
diff --git a/docs/ja/features/scoped-css.md b/docs/ja/features/scoped-css.md
new file mode 100644
index 000000000..75997cc10
--- /dev/null
+++ b/docs/ja/features/scoped-css.md
@@ -0,0 +1,51 @@
+# スコープ付き CSS
+
+`scoped` 属性をもつ `<style>` タグを利用するとき、その CSS は現在のコンポーネントの要素にのみ適用されます。これは Shadow DOM のスタイルのカプセル化に似ています。いくつか注意点がありますが、polyfill は必要ありません。PostCSS を使用して以下を変換することによって実現しています。
+
+``` html
+<style scoped>
+.example {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+以下の通りになります:
+
+``` html
+<style>
+.example[_v-f3f3eg9] {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example" _v-f3f3eg9>hi</div>
+</template>
+```
+
+#### 注意
+
+1. 同じコンポーネント内にスコープで区切られてものとそうでないスタイルを含むことが出来ます：
+
+  ``` html
+  <style>
+  /* グローバルスタイル */
+  </style>
+
+  <style scoped>
+  /* ローカルスタイル */
+  </style>
+  ```
+
+2. 子コンポーネントのルートノードは親のスコープの CSS と子のスコープの CSS の両方の影響をうけます。
+
+3. パーシャルはスコープ付きスタイルの影響をうけません。
+
+4. **スコープされたスタイルは class の必要性を排除しません**。ブラウザが様々な CSS セレクタをレンダリングするため、`p { color: red }` はスコープされているとき何倍も遅くなります（すなわち属性セレクタと組み合わせた場合）。もし `.example { color: red }` のように class か id を使用するなら、パフォーマンスヒットは事実上なくなります。[この例](http://stevesouders.com/efws/css-selectors/csscreate.php)で違いをテストすることが出来ます。
+
+5. **再帰されたコンポーネントの子孫セレクタには気をつけてください！** セレクタ `.a .b` を持つ CSS ルールの場合、`.a` にマッチする要素に再帰的な子コンポーネントが含まれている場合、その子コンポーネントのすべての `.b` はルールにマッチします。
diff --git a/docs/ja/options.md b/docs/ja/options.md
new file mode 100644
index 000000000..413551db4
--- /dev/null
+++ b/docs/ja/options.md
@@ -0,0 +1,187 @@
+# オプションリファレンス
+
+## Webpack 1と2の使い方の違い
+
+Webpack 2 の場合：オプションを loader ルールに直接渡します。
+
+``` js
+module.exports = {
+  // ...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // vue-loader オプション
+        }
+      }
+    ]
+  }
+}
+```
+
+Webpack 1.x の場合： Webpack の設定のルートに `vue` ブロックを追加します。
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader オプション
+  }
+}
+```
+
+### loaders
+
+- 型： `{ [lang: string]: string }`
+
+  `* .vue` ファイル内の言語ブロックに使用されるデフォルトの loader を上書きする Webpack loader を指定するオブジェクト。キーは指定されている場合、言語ブロックの `lang` 属性に対応します。各タイプのデフォルトの `lang` は次のとおりです：
+
+  - `<template>`: `html`
+  - `<script>`: `js`
+  - `<style>`: `css`
+
+  たとえば、`babel-loader` と `eslint-loader` を使ってすべての `<script>` ブロックを処理するには：
+
+  ``` js
+  // Webpack 2.x config
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: 'babel-loader!eslint-loader'
+          }
+        }
+      }
+    ]
+  }
+  ```
+
+### preLoaders
+
+- 型： `{ [lang: string]: string }`
+- 10.3.0 以上でサポートされます。
+
+  config 形式は `loaders` と同じですが、`preLoaders` はデフォルト loader の前に対応する言語ブロックに適用されます。これを使用して言語ブロックを前処理することができます。一般的な使用例としては、i18n のビルド時です。
+
+### postLoaders
+
+- 型：`{ [lang: string]: string }`
+- 10.3.0 以上でサポートされます。
+
+  config 形式は `loaders` と同じですが、` postLoaders` はデフォルト loader の後に適用されます。これを使用して言語ブロックを後処理することができます。ただしこれは少し複雑になります：
+
+  - `html` の場合、デフォルトの loader によって返される結果は、コンパイルされた JavaScript レンダリング関数コードになります。
+
+  - `css` の場合、結果は` vue-style-loader` によって返されます。これはほとんどの場合特に有用ではありません。postcss プラグインを使用する方が良いでしょう。
+
+### postcss
+
+  > メモ: 11.0.0 以上では代わりにPostCSSの設定ファイル推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
+
+- 型： `Array` もしくは `Function` か `Object`
+
+  カスタムした PostCSS プラグインを `*.vue` ファイル内の CSS に適用するよう指定します。もし関数を使用しているなら、この関数は同じ loader のコンテキストを使用して呼び出され、プラグインの配列を返す必要があります。
+
+  ``` js
+  // ...
+  {
+    loader: 'vue-loader',
+    options: {
+      // 注意： `loaders` 以下に `postcss` のオプションをネストさせてはいけません
+      postcss: [require('postcss-cssnext')()],
+      loaders: {
+        // ...
+      }
+    }
+  }
+  ```
+
+  そのオプションは PostCSS プロセッサーに渡すオプションを含むオブジェクトにすることもできます。これは カスタムされたパーサー/文字列化に依存した PostCSS プロジェクトを使用しているとき便利です:
+
+  ``` js
+  postcss: {
+    plugins: [...], // pluginsのリスト
+    options: {
+      parser: sugarss // sugarss パーサを使用
+    }
+  }
+  ```
+
+### cssSourceMap
+
+- 型： `Boolean`
+- デフォルト: `true`
+
+  CSS のソースマップを有効にするかどうか。これを無効にすると、`css-loader` の相対パス関連のバグを避けることができ、ビルドを少し早くすることができます。
+
+  注意： もしメインの Webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
+
+### esModule
+
+- 型： `Boolean`
+- デフォルト： `undefined`
+
+  esModule 互換コードを発行するかどうか。デフォルトの vue-loader のデフォルトの出力は `module.exports = ....` のような commonjs 形式で発行します。 `esModule` が true にセットされているとき、デフォルトの出力は `exports.__esModule = true; exports = ...` にトランスパイルされます。TypeScript のような Babel 以外の transpiler との相互運用に役立ちます。
+
+### preserveWhitespace
+
+- 型： `Boolean`
+- デフォルト： `true`
+
+  もし `false` に設定されていたら、テンプレート内の HTML タグ間の空白は無視されます。
+
+### transformToRequire
+
+- 型： `{ [tag: string]: string | Array<string> }`
+- デフォルト： `{ img: 'src', image: 'xlink:href' }`
+
+  テンプレートのコンパイル中、コンパイラは `src` の URL のような特定の属性を `require` 呼び出しに変換することができます。これによりターゲットの asset を Webpack が処理できるようになります。デフォルトの設定は `<img>` タグの `src` 属性と SVG の `<image>` タグの `xlink：href` 属性を変換します。
+
+### buble
+
+  型： `Object`
+  デフォルト： `{}`
+
+  `bubble-loader`（存在する場合）のオプションとテンプレートレンダリング関数のための buble のコンパイルパスを設定します。
+
+  > バージョンメモ： 9.x では、テンプレート式は削除された `templateBuble` オプションによって別々に設定されます。
+
+  このテンプレートレンダリング関数のコンパイルでは、特別な変換 `stripWidth` （デフォルトで有効）がサポートされ、生成されたレンダリング関数で `with` の使用法が削除され、strict-mode に準拠します。
+
+  設定の例：
+
+  ``` js
+  // webpack 1
+  vue: {
+    buble: {
+      // オブジェクトスプレッド演算子を有効にする
+      // メモ: Object.assign polyfillを自分で提供する必要があります！
+      objectAssign: 'Object.assign',
+
+      // `with` の除去をオフにする
+      transforms: {
+        stripWith: false
+      }
+    }
+  }
+
+  // webpack 2
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          buble: {
+            // 同じオプション
+          }
+        }
+      }
+    ]
+  }
+  ```
diff --git a/docs/ja/start/setup.md b/docs/ja/start/setup.md
new file mode 100644
index 000000000..786b22878
--- /dev/null
+++ b/docs/ja/start/setup.md
@@ -0,0 +1,13 @@
+# プロジェクトのセットアップ
+
+### `vue-cli` の使用
+
+`vue-loader` を使用するプロジェクトの足場作りは `vue-cli` を使用することをお薦めします：
+
+``` bash
+npm install -g vue-cli
+vue init webpack-simple hello-vue
+cd hello-vue
+npm install
+npm run dev # ready to go!
+```
diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
new file mode 100644
index 000000000..cc27296a8
--- /dev/null
+++ b/docs/ja/start/spec.md
@@ -0,0 +1,103 @@
+# Vue Component の仕様
+
+`*.vue` ファイルは HTML ライクな構文を使用して Vue コンポーネントを記述するカスタムファイルフォーマットです。各 `*.vue` ファイルは `<template>`、`<script>`、`<style>` の三つのトップレベル言語のブロックで構成されています。
+
+``` html
+<template>
+  <div class="example">{{ msg }}</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello world!'
+    }
+  }
+}
+</script>
+
+<style>
+.example {
+  color: red;
+}
+</style>
+
+<custom1>
+  例えばコンポーネントのドキュメントを書くことが出来ます
+</custom1>
+```
+
+`vue-loader` はファイルを解析し、それぞれの言語ブロックを必要に応じて他の loader を通し、最終的に `module.exports` が Vue.js のコンポーネントオプションオブジェクトの CommonJS モジュールに変換します。
+
+`vue-loader` は CSS プリプロセッサや HTML にコンパイルするテンプレート言語といった、デフォルトでない言語を言語ブロックの `lang` 属性を使用することでサポートします。例えばコンポーネントのスタイルに SASS を使用することが出来ます。
+
+``` html
+<style lang="sass">
+  /* write SASS! */
+</style>
+```
+詳細は [プリプロセッサの仕様](../configurations/pre-processors.md) で確認することが出来ます。
+
+### 言語ブロック
+
+#### `<template>`
+
+- デフォルトの言語は `html`
+
+- それぞれの `*.vue` ファイルは最大で一つの `<template>` ブロックを含みます。
+
+- 内容は文字列に展開され、コンパイルされた Vue コンポーネントの `template` オプションで使用されます。
+
+#### `<script>`
+
+- デフォルトの言語は `js`（`babel-loader` や `buble-loader` が検出される場合、自動的にES2015がサポートされる）
+
+- それぞれの `*.vue` ファイルは最大で一つの `<script>` ブロックを含みます。
+
+- スクリプトは CommonJS のように処理されます（ Webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `recuire()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます。
+
+- スクリプトは Vue.js コンポーネントのオプションオブジェクトをエクスポートする必要があります。 'Vue.extend()' によって拡張されたコンストラクタもエクスポートすることが可能ですが、プレーンなオブジェクトが好ましいです。
+
+#### `<style>`
+
+- デフォルトの言語は `css`。
+
+- 複数の `<style>` タグは単一の `*.vue` ファイルでサポートされます。
+
+- `<style>` タグは `scoped` か `module` （詳しくは [Scoped CSS](../features/scoped-css.md) と [CSS Modules](../features/css-modules.md) をみてください）を使用してコンポーネントにスタイルをカプセル化する事が出来ます。異なるカプセルモードをもつ複数の `<style>` タグは同じコンポーネント内で混在させることが出来ます。
+
+- デフォルトではコンテンツは `style-loader` を使用して実際の `<style>` タグとして抽出され、ドキュメントの `<head>` に動的に挿入されます。また、[すべてのコンポーネントのすべてのスタイルが単一のCSSファイルに抽出されるようにWebpackを設定する](../configurations/extract-css.md)こともできます。
+
+### カスタムブロック
+
+> vue-loader 10.2.0+ でのみサポートされます
+
+例えば `<docs>` ブロックのように、プロジェクトの特別な必用に応じて `*.vue` ファイルに カスタムブロックを追加することが出来ます。 `vue-loader`はタグ名を使用してセクションの内容に適用されるべき webpack loader を検索します。webpack loader は、`vue-loader` オプションの `loaders` セクションで指定する必要があります。
+
+このモードの詳細については、[カスタムブロック](../configurations/custom-blocks.md)を参照してください。
+
+### ソースのインポート
+
+もし `*.vue` コンポーネントを複数のファイルに分割したい場合は、`src` 属性を使って言語ブロック用の外部ファイルをインポートすることが出来ます。
+
+``` html
+<template src="./template.html"></template>
+<style src="./style.css"></style>
+<script src="./script.js"></script>
+```
+
+`src` のインポートは CommonJS の `require()` 呼び出しと同じパス解決規則に従うことに注意してください。相対パスは `./` で始める必要があり、インストールされた NPM パッケージから直接リソースをインポートすることができます。
+
+``` html
+<!-- インストールされた "todomvc-app-css" npm パッケージ からファイルをインポートします-->
+<style src="todomvc-app-css/index.css">
+```
+
+### シンタックスハイライト
+
+現在それらはシンタクスハイライトをサポートしているのは、[Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). 他のエディタ/IDEへのコントリビュートは高く評価されます！もし Vue コンポーネント内でプリプロセッサを使用していない場合は、エディタで `*.vue` ファイルを HTML として扱うことが出来ます。
+
+### コメント
+
+それぞれのブロック内でそれぞれの言語のコメントシンタックスを使用することが出来る（HTML、CSS、JavaScript、Jade、etc）。最上部のコメントは HTML コメントシンタックスを使用してください： `<!-- コメントはこちら -->`
diff --git a/docs/ja/workflow/linting.md b/docs/ja/workflow/linting.md
new file mode 100644
index 000000000..b2aee5979
--- /dev/null
+++ b/docs/ja/workflow/linting.md
@@ -0,0 +1,92 @@
+# Linting
+
+あなたはJavaScriptでない `*.vue` の中のコードをどうやって lint するのか疑問に思っているかも知れません。[ESLint](http://eslint.org/)を使用していると仮定します（もし使っていないのならばすべきです！）
+
+`* .vue`ファイル内のJavaScriptの抽出と埋め込みをサポートする[eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html)も同様に必要です。
+
+あなたの ESLint の設定にプラグインを含めてください：
+
+``` json
+"plugins": [
+  "html"
+]
+```
+
+コマンドラインで次を実行してください：
+
+``` bash
+eslint --ext js,vue MyComponent.vue
+```
+
+別のオプションは `*.vue` ファイルが開発中に保存時されたとき、自動的に lint されるように[eslint-loader](https://github.com/MoOx/eslint-loader)を使用しています：
+
+``` bash
+npm install eslint eslint-loader --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // 他のオプション
+  module: {
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue!eslint'
+      }
+    ]
+  }
+}
+```
+Webpack ローダーチェーンは**まずはじめに**に適用されることをご了承ください。`vue` の前に `eslint` を適用して、コンパイル前のソースコードを lint してください。
+
+一つ私たちが考慮する必要があるのは、NPM パッケージでリリースされているサードパーティの* .vueコンポーネントを使用することです。そのような場合には、サードパーティー製のコンポーネントを処理するために  `vue-loader` を使用したいと思いますが、それを lint したくはありません。そういうときは lint を Webpack の [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) に分けることが可能です：
+
+``` js
+// webpack.config.js
+module.exports = {
+  // 他のオプション
+  module: {
+    // lint対象はローカルの *.vue ファイルのみ
+    preLoaders: [
+      {
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      }
+    ],
+    // しかし全ての *.vue ファイルで vue-loader を使用します
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```
+
+Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // 他のオプション
+  module: {
+    rules: [
+      // *.vue のみを検査します
+      {
+        enforce: 'pre',
+        test: /.vue$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/
+      },
+      // しかし全ての *.vue ファイルで vue-loader は使用します
+      {
+        test: /.vue$/,
+        loader: 'vue-loader'
+      }
+    ]
+  }
+}
+```
diff --git a/docs/ja/workflow/production.md b/docs/ja/workflow/production.md
new file mode 100644
index 000000000..e92a5b968
--- /dev/null
+++ b/docs/ja/workflow/production.md
@@ -0,0 +1,39 @@
+# プロダクションビルド
+
+プロダクション用にバンドルを構築するときは二つのことを行います：
+
+1. アプリケーションコードを縮小します：
+2. [Vue.jsガイドに記載されているセットアップの説明](https://vuejs.org/guide/deployment.html) を使用して Vue.js のソースコードから全ての警告を削除します
+
+設定例を以下に示します：
+
+``` js
+// webpack.config.js
+module.exports = {
+  // 他のオプション
+  plugins: [
+    // すべての Vue.js 警告コードを短絡します
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    // デッドコード除去で縮小します
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    // 発生回数別にモジュールIDを最適化します
+    new webpack.optimize.OccurenceOrderPlugin()
+  ]
+}
+```
+
+明らかに開発中にこの設定を使いたくないので、これにはいくつかの方法をとります：
+
+1. 環境変数に基づいて構成オブジェクトを動的に構築します；
+
+2. または、開発用と運用用の2つの Webpack 設定ファイルを使用します。[vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)に示すように、3つ目のファイルに共通のオプションをいくつか共有することもできます。
+
+目標を達成している限り、それはあなた次第です。
diff --git a/docs/ja/workflow/testing-with-mocks.md b/docs/ja/workflow/testing-with-mocks.md
new file mode 100644
index 000000000..7776fbef8
--- /dev/null
+++ b/docs/ja/workflow/testing-with-mocks.md
@@ -0,0 +1,70 @@
+# モックを使用したテスト
+
+現実のアプリケーションでは、私たちのコンポーネントは外部依存関係を持つ可能性が高いです。コンポーネントの単体テストを記述するときは、外部依存関係をモックにし、テストはテスト対象のコンポーネントの動作に依存するだけになるのが理想です。
+
+`vue-loader` は、[inject-loader](https://github.com/plasticine/inject-loader)を使って任意の依存関係を `*.vue` コンポーネントに注入する機能を提供します。一般的な考え方としては、コンポーネントモジュールを直接インポートするのではなく、`inject-loader` を使用して、そのモジュール用の「モジュールファクトリ」関数を作成するというものです。この関数がモックのオブジェクトで呼び出されると、モックが注入されたモジュールのインスタンスが返されます。
+
+次のようなコンポーネントがあるとします：
+
+``` html
+<!-- example.vue -->
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+// この依存はモックを必要としています
+import SomeService from '../service'
+
+export default {
+  data () {
+    return {
+      msg: SomeService.msg
+    }
+  }
+}
+</script>
+```
+
+モックをインポートする方法は次のとおりです：
+
+> 注意: inject-loader@3.x は現在不安定です。
+
+``` bash
+npm install inject-loader@^2.0.0 --save-dev
+```
+
+``` js
+// example.spec.js
+const ExampleInjector = require('!!vue?inject!./example.vue')
+```
+
+注意。狂気じみた文字列を必要とします - ここではいくつかのインライン [webpack loader](https://webpack.github.io/docs/loaders.html）を使用しています。簡単な説明としては：
+
+- `!!`は "グローバル設定からすべてのローダを無効にする"ことを意味します；
+- `vue？inject！` は  "`vue` loader を使い、`？inject` クエリを渡す"ことを意味します。 これは `vue-loader` に、依存性注入モードでコンポーネントをコンパイルするように指示します。
+
+返される `ExampleInjector` は、`example.vue` モジュールのインスタンスを生成するために呼び出すことができるファクトリ関数です：
+
+``` js
+const ExampleWithMocks = ExampleInjector({
+  // モック
+  '../service': {
+    msg: 'Hello from a mocked service!'
+  }
+})
+```
+
+最後に、コンポーネントを通常どおりテストすることができます：
+
+``` js
+it('should render', () => {
+  const vm = new Vue({
+    template: '<div><test></test></div>',
+    components: {
+      'test': ExampleWithMocks
+    }
+  }).$mount()
+  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
+})
+```
diff --git a/docs/ja/workflow/testing.md b/docs/ja/workflow/testing.md
new file mode 100644
index 000000000..f06007732
--- /dev/null
+++ b/docs/ja/workflow/testing.md
@@ -0,0 +1,101 @@
+# テスト
+
+> [webpack vue-cliテンプレート](https://github.com/vuejs-templates/webpack)には、事前に設定されたユニットテストとe2eテストの設定が用意されています。
+
+`* .vue`ファイルをテストするときには、普通の CommonJS ベースのテストランナーを使うことができません。なぜならそのテストランナーは `*.vue` ファイルの扱い方を知らないからです。代わりに、Webpack + vue-loader を使用してテストファイルをバンドルします。推奨設定は [Karma](http://karma-runner.github.io/0.13/index.html) と [karma-webpack](https://github.com/webpack/karma-webpack) です。
+
+Karma はブラウザを起動してテストを実行するテストランナーです。テストするブラウザと、使用するテストフレームワーク（たとえば、MochaやJasmineなど）を選択できます。[PhantomJS](http://phantomjs.org/) のテストを[Jasmine](http://jasmine.github.io/edge/introduction.html) テストフレームワークで実行する Karma の設定例を次に示します:
+
+``` bash
+npm install\
+  karma karma-webpack\
+  karma-jasmine jasmine-core\
+  karma-phantomjs-launcher phantomjs\
+  --save-dev
+```
+
+``` js
+// 要求があれば同じWebpackの設定を使用することが可能です
+// ただし、テスト中に元のエントリが不要なので、
+// 元のエントリを削除することを忘れないでください
+var webpackConfig = require('./webpack.config.js')
+delete webpackConfig.entry
+
+// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    browsers: ['PhantomJS'],
+    frameworks: ['jasmine'],
+    // これはすべてのテストのエントリーファイルです。
+    files: ['test/index.js'],
+    // バンドルのためにエントリーファイルをwebpackに渡します。
+    preprocessors: {
+      'test/index.js': ['webpack']
+    },
+    // webpackの設定を使用します
+    webpack: webpackConfig,
+    // 不要なテキスト出力を回避します
+    webpackMiddleware: {
+      noInfo: true
+    },
+    singleRun: true
+  })
+}
+```
+
+そして`test/index.js`ファイルのエントリの場合：
+
+``` js
+// test/index.js
+// 特別なWebpackの機能を使用してすべてのテストファイルを必要とさせます
+// https://webpack.github.io/docs/context.html#require-context
+var testsContext = require.context('.', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+```
+
+このエントリファイルは、単に同じフォルダ内の `.spec.js` で終わる他のすべてのファイルを必要とします。これで実際にいくつかのテストを書くことができます：
+
+``` js
+// test/component-a.spec.js
+var Vue = require('vue')
+var ComponentA = require('../../src/components/a.vue')
+
+describe('a.vue', function () {
+
+  // JavaScriptのオプションのアサーション
+  it('should have correct message', function () {
+    expect(ComponentA.data().msg).toBe('Hello from Component A!')
+  })
+
+  // 実際にコンポーネントをレンダリングしてレンダリングされた結果をアサートします
+  it('should render correct message', function () {
+    var vm = new Vue({
+      template: '<div><test></test></div>',
+      components: {
+        'test': ComponentA
+      }
+    }).$mount()
+    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
+  })
+})
+```
+
+テストを実行するには、次の NPM スクリプトを追加します：
+
+``` js
+// package.json
+...
+"scripts": {
+  ...
+  "test": "karma start karma.conf.js"
+}
+...
+```
+
+最後に実行します：
+
+``` bash
+npm test
+```
+
+最後にもう一度、[こちらを参照してください](https://github.com/vuejs-templates/webpack)。テストに関する完全な実例が含まれています。

From 11cec30eb3925a144e1d484357b13c501d5fb3f9 Mon Sep 17 00:00:00 2001
From: Moritz Flucht <m.flucht@gmail.com>
Date: Thu, 23 Mar 2017 08:08:26 +0100
Subject: [PATCH 552/877] feat: Call custom block loaders with `Component` as
 argument (#664)

* feat: call custom block loaders with `Component` as argument

* style: add missing eof newline
---
 docs/en/configurations/custom-blocks.md | 70 ++++++++++++++++++++++++-
 lib/loader.js                           |  6 ++-
 test/mock-loaders/docs.js               |  5 ++
 test/test.js                            | 15 ++++++
 4 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 test/mock-loaders/docs.js

diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index ce833e0cd..434f2685f 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -4,9 +4,9 @@
 
 You can define custom language blocks inside `*.vue` files. The content of a custom block will be processed by the loaders specified in the `loaders` object of `vue-loader` options and then required by the component module. The configuration is similar to what is described in [Advanced Loader Configuration](../configurations/advanced.md), except the matching uses the tag name instead of the `lang` attribute.
 
-If a matching loader is found for a custom block, it will be processed; otherwise the custom block will simply be ignored.
+If a matching loader is found for a custom block, it will be processed; otherwise the custom block will simply be ignored. Additionally, if the found loader returns a function, that function will be called with the component of the `*.vue` file as a parameter. 
 
-## Example
+## Single docs file example
 
 Here's an example of extracting all `<docs>` custom blocks into a single docs file:
 
@@ -65,3 +65,69 @@ module.exports = {
   ]
 }
 ```
+
+## Runtime available docs
+
+Here's an example of injecting the `<docs>` custom blocks into the component so that it's available during runtime.
+
+#### docs-loader.js 
+
+In order for the custom block content to be injected, we'll need a custom loader: 
+
+``` js
+module.exports = function (source, map) {
+  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+    JSON.stringify(source) +
+    '}', map)
+}
+```
+
+#### webpack.config.js
+
+Now we'll configure webpack to use our custom loader for `<docs>` custom blocks.
+
+``` js
+const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            'docs': docsLoader
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+#### component.vue
+
+We are now able to access the `<docs>` block's content of imported components during runtime. 
+
+``` html
+<template>
+  <div>
+    <component-b \>
+    <p>{{ docs }}</p>
+  </div>
+</template>
+
+<script>
+import componentB from 'componentB';
+
+export default = {
+  data () {
+    return {
+      docs: componentB.__docs
+    }
+  },
+  components: {componentB}
+}
+</script>
+```
diff --git a/lib/loader.js b/lib/loader.js
index 006e65828..45a0bef10 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -413,7 +413,11 @@ module.exports = function (content) {
           addedPrefix = true
         }
 
-        output += requireString + '\n'
+        output +=
+          'var customBlock = ' + requireString + '\n' +
+          'if (typeof customBlock === "function") {' +
+            'customBlock(Component)' +
+          '}\n'
       }
     })
 
diff --git a/test/mock-loaders/docs.js b/test/mock-loaders/docs.js
new file mode 100644
index 000000000..5dc582a77
--- /dev/null
+++ b/test/mock-loaders/docs.js
@@ -0,0 +1,5 @@
+module.exports = function (source, map) {
+  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+    JSON.stringify(source) +
+    '}', map)
+}
diff --git a/test/test.js b/test/test.js
index 00b39384d..8e49f2812 100644
--- a/test/test.js
+++ b/test/test.js
@@ -634,6 +634,21 @@ describe('vue-loader', function () {
     })
   })
 
+  it('passes Component to custom block loaders', done => {
+    const mockLoaderPath = require.resolve('./mock-loaders/docs')
+    test({
+      entry: './test/fixtures/custom-language.vue',
+      vue: {
+        loaders: {
+          'documentation': mockLoaderPath
+        }
+      }
+    }, (window, module) => {
+      expect(module.__docs).to.contain('This is example documentation for a component.')
+      done()
+    })
+  })
+
   it('custom blocks can be ignored', done => {
     bundle({
       entry: './test/fixtures/custom-language.vue'

From 49145e9d0c9572395d054e1b2c29860c7915d598 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Mar 2017 15:10:56 +0800
Subject: [PATCH 553/877] small tweak

---
 test/mock-loaders/docs.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/mock-loaders/docs.js b/test/mock-loaders/docs.js
index 5dc582a77..f0e749e4a 100644
--- a/test/mock-loaders/docs.js
+++ b/test/mock-loaders/docs.js
@@ -1,5 +1,7 @@
 module.exports = function (source, map) {
-  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
-    JSON.stringify(source) +
-    '}', map)
+  this.callback(null,
+    'module.exports = function(Component) {Component.options.__docs = ' +
+      JSON.stringify(source) +
+    '}',
+  map)
 }

From 579062d93ab10bd827230a218f5e75810f10f80f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Mar 2017 15:11:06 +0800
Subject: [PATCH 554/877] 11.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 71da958ba..822f30684 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From c55aafef0c4ebf35425ced9f9ac1f551604ca27c Mon Sep 17 00:00:00 2001
From: "Mr.Betty" <guoxiang191@outlook.com>
Date: Thu, 23 Mar 2017 16:06:39 +0800
Subject: [PATCH 555/877] fix parse cssModules loader query (#729)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 45a0bef10..42864eb7a 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -143,7 +143,7 @@ module.exports = function (content) {
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
       // $1: !css-loader
       // $2: ?a=b
-      var query = loaderUtils.getOptions($2 || {}) || {}
+      var query = loaderUtils.parseQuery($2 || '?')
       Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
       if (index !== -1) {
         // Note:

From 4d9b1689cb1875340d8bf4f31793dcd4fdbf1338 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Mar 2017 16:07:57 +0800
Subject: [PATCH 556/877] bump loader-util dep

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 822f30684..0ed8e4c35 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
     "js-beautify": "^1.6.3",
-    "loader-utils": "^1.0.2",
+    "loader-utils": "^1.1.0",
     "lru-cache": "^4.0.1",
     "postcss": "^5.0.21",
     "postcss-load-config": "^1.1.0",

From 1cf3a245fdd101590a81416a8f35dbe2c0a2976a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 23 Mar 2017 16:08:05 +0800
Subject: [PATCH 557/877] 11.3.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0ed8e4c35..ec8d7321e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.3.0",
+  "version": "11.3.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From acaf74cb68d17f25c17a3c09bc9cd09cbb9fb158 Mon Sep 17 00:00:00 2001
From: alex <xalexec@gmail.com>
Date: Thu, 23 Mar 2017 16:18:33 +0800
Subject: [PATCH 558/877] The docs Chinese translation (#730)

* init

* readme and setup

* spec

* done es2015

* done scoped-css

* hot-reload

* done postcss

* done css-modules

* per-processors and asset-url

* advanced done

* extract-css done

* custom-block done

* production done

* linting done

* options done

* repath

* check

* check

* check README SUMMARY setup spec

* check es2015 scoped-css

* check css-modules hot-reload postcss

* check

* remove todo
---
 docs/zh-cn/README.md                        |  38 ++++
 docs/zh-cn/SUMMARY.md                       |  21 +++
 docs/zh-cn/configurations/advanced.md       |  78 ++++++++
 docs/zh-cn/configurations/asset-url.md      |  23 +++
 docs/zh-cn/configurations/custom-blocks.md  |  67 +++++++
 docs/zh-cn/configurations/extract-css.md    |  70 ++++++++
 docs/zh-cn/configurations/pre-processors.md |  81 +++++++++
 docs/zh-cn/features/css-modules.md          | 117 ++++++++++++
 docs/zh-cn/features/es2015.md               |  65 +++++++
 docs/zh-cn/features/hot-reload.md           |   7 +
 docs/zh-cn/features/postcss.md              |  68 +++++++
 docs/zh-cn/features/scoped-css.md           |  52 ++++++
 docs/zh-cn/options.md                       | 190 ++++++++++++++++++++
 docs/zh-cn/start/setup.md                   |  13 ++
 docs/zh-cn/start/spec.md                    | 112 ++++++++++++
 docs/zh-cn/workflow/linting.md              |  92 ++++++++++
 docs/zh-cn/workflow/production.md           |  39 ++++
 docs/zh-cn/workflow/testing-with-mocks.md   |  70 ++++++++
 docs/zh-cn/workflow/testing.md              | 101 +++++++++++
 19 files changed, 1304 insertions(+)
 create mode 100644 docs/zh-cn/README.md
 create mode 100644 docs/zh-cn/SUMMARY.md
 create mode 100644 docs/zh-cn/configurations/advanced.md
 create mode 100644 docs/zh-cn/configurations/asset-url.md
 create mode 100644 docs/zh-cn/configurations/custom-blocks.md
 create mode 100644 docs/zh-cn/configurations/extract-css.md
 create mode 100644 docs/zh-cn/configurations/pre-processors.md
 create mode 100644 docs/zh-cn/features/css-modules.md
 create mode 100644 docs/zh-cn/features/es2015.md
 create mode 100644 docs/zh-cn/features/hot-reload.md
 create mode 100644 docs/zh-cn/features/postcss.md
 create mode 100644 docs/zh-cn/features/scoped-css.md
 create mode 100644 docs/zh-cn/options.md
 create mode 100644 docs/zh-cn/start/setup.md
 create mode 100644 docs/zh-cn/start/spec.md
 create mode 100644 docs/zh-cn/workflow/linting.md
 create mode 100644 docs/zh-cn/workflow/production.md
 create mode 100644 docs/zh-cn/workflow/testing-with-mocks.md
 create mode 100644 docs/zh-cn/workflow/testing.md

diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
new file mode 100644
index 000000000..6af9d30bb
--- /dev/null
+++ b/docs/zh-cn/README.md
@@ -0,0 +1,38 @@
+# 介绍
+
+### `vue-loader` 是什么？
+
+`vue-loader` 是一个 Webpack 的 loader，可以将用下面这个格式编写的 Vue 组件转换为 JavaScript 模块：
+
+![screenshot](http://blog.evanyou.me/images/vue-component.png)
+
+这里有一些 `vue-loader` 提供的很酷的特性：
+
+- ES2015 默认支持;
+- 允许对 Vue 组件的组成部分使用其它 Webpack loaders，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
+- `.vue` 文件中允许自定义节点，然后使用自定义的 loader 处理他们；
+- 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 Webpack loaders 进行处理；
+- 对每个组件模拟出 CSS 作用域；
+- 支持开发期组件的热重载。
+
+简而言之，编写 Vue.js 应用程序时，组合使用 Webpack 和 `vue-loader` 能带来一个现代，灵活并且非常强大的前端工作流程。
+
+### Webpack 是什么?
+
+如果你已经熟悉了 Webpack，随时可以跳过下面的说明。如果你没有使用过 Webpack,下面是一个快速介绍：
+
+[Webpack](http://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出他们的依赖关系，将它们打包为可部署的静态资源。
+
+![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+
+一个基本的例子，想像我们有一些 CommonJS 模块，它不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过`<script>` 标签加载。Webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
+
+但是 Webpack 可以做的不止这些。使用 "loaders"，我们可以配置 Webpack 以任何方式去转换所有类型的文件。一些例子包括：
+
+- 转换 ES2015,CoffeeScript 或者 TypeScript 模块为普通的 ES5 CommonJS 模块；
+- 可以选择在编译之前检验你的源代码；
+- 将 Jade 模版转换为纯 HTML 并且嵌入 Javascript 字符串中；
+- 将 SASS 文件转换为纯 CSS，then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
+- 处理 HTML 或者 CSS 中引用的图片，移动到配置的路径中，并且使用 md5 hash 重命名。
+
+当你理解 Webpack 原理后会感觉它是如此强大，它可以大大优化你的前端工作流程。它主要的缺点是配置复杂麻烦，但是使用本指南， Vue.js 和 `vue-loader`使用时的常见问题，应该可以帮助你找到解决方案。
diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
new file mode 100644
index 000000000..5689d977a
--- /dev/null
+++ b/docs/zh-cn/SUMMARY.md
@@ -0,0 +1,21 @@
+- 开始
+  - [Vue 组件细则](start/spec.md)
+  - [创建项目](start/setup.md)
+- 特性
+  - [ES2015](features/es2015.md)
+  - [CSS 作用域](features/scoped-css.md)
+  - [CSS 模块](features/css-modules.md)
+  - [PostCSS](features/postcss.md)
+  - [热重载](features/hot-reload.md)
+- 配置
+  - [预处理器](configurations/pre-processors.md)
+  - [处理资源路径](configurations/asset-url.md)
+  - [进阶配置](configurations/advanced.md)
+  - [提取 CSS 文件](configurations/extract-css.md)
+  - [自定义块](configurations/custom-blocks.md)
+- 工作流程
+  - [生产环境构建](workflow/production.md)
+  - [代码检验](workflow/linting.md)
+  - [测试](workflow/testing.md)
+  - [使用 Mocks 测试](workflow/testing-with-mocks.md)
+- [选项参考](options.md)
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
new file mode 100644
index 000000000..3484c20e7
--- /dev/null
+++ b/docs/zh-cn/configurations/advanced.md
@@ -0,0 +1,78 @@
+# Loader 进阶配置
+
+有些时候你想要这样：
+
+1. 对语言应用自定义 loader string，而不是让 `vue-loader` 去推断；
+
+2. 覆盖默认语言的内置配置。
+
+3. 默认语言预处理或者后处理配置。
+
+为了实现这些，详细说明 `vue-loader` 的 `loaders` 选项：
+
+> 注意 `preLoaders` 和 `postLoaders` 只在版本 >=10.3.0 支持
+
+### Webpack 2.x
+
+``` js
+module.exports = {
+  // other options...
+  module: {
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // `loaders` 覆盖默认 loaders.
+          // 以下配置会导致所有的 <script> 标签 "lang" 属性失效。
+          // attribute to be loaded with coffee-loader
+          loaders: {
+            js: 'coffee-loader'
+          },
+
+          // `preLoaders` 会在默认 loaders 之前加载.
+          // 你可以用来预处理语言块 - 一个例子是用来处理构建时的 i18n
+          preLoaders: {
+            js: '/path/to/custom/loader'
+          },
+
+          // `postLoaders` 会在默认 loaders 之后加载.
+          //
+          // - 对于 `html`, 默认 loader 返回会编译为 JavaScript 渲染函数
+          //
+          // - 对于 `css`, 由`vue-style-loader` 返回的结果通常不太有用。使用 postcss 插件将会是更好的选择。
+          postLoaders: {
+            html: 'babel-loader'
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+### Webpack 1.x
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      }
+    ]
+  },
+  // vue-loader configurations
+  vue: {
+    loaders: {
+      // same configuration rules as above
+    }
+  }
+}
+```
+
+进阶配置更实际的用法是 [提取组件中的 CSS 到单个文件](./extract-css.md)。
diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
new file mode 100644
index 000000000..3cc760abd
--- /dev/null
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -0,0 +1,23 @@
+# 处理资源路径
+
+默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理你的样式和模版文件。在处理过程中，所有的资源路径例如 `<img src="...">`, `background: url(...)` 和 `@import` **会作为模块依赖**。
+
+例如，`url(./image.png)` 会被转换为 `require('./image.png')`,
+
+``` html
+<img src="../image.png">
+```
+
+将会编译为：
+
+``` js
+createElement('img', { attrs: { src: require('../image.png') }})
+```
+
+因为 `.png` 不是一个 JavaScript 文件，你需要配置 Webpack 使用 [file-loader](https://github.com/webpack/file-loader) 或者 [url-loader](https://github.com/webpack/url-loader) 去处理它们。脚手器工具 `vue-cli` 已经为你配置好了。
+
+使用它们的好处：
+
+1. `file-loader` 允许你指定资源文件的位置，允许使用 hashes 命名以获得长时间的缓存。此外，这意味着 **你可以就近管理你的图片文件，可以使用相对路径而不用担心布署**。使用正确的配置，Webpack 将会在输出中自动重写为正常的文件路径。
+
+2. `url-loader` 允许你设置转换为内联 base64 的文件最小值，这会减少小文件的 HTTP 请求。如果文件大于设置值，会自动的交给 `file-loader` 处理。
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
new file mode 100644
index 000000000..ae5edf39d
--- /dev/null
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -0,0 +1,67 @@
+# 自定义块
+
+> 在大于 10.2.0 中支持
+
+在 `.vue` 文件中，你可以自定义语言块。自定义块将会被 `vue-loader` 选项 `loaders` 中指定的 loaders 处理，然后被组件模块依赖。配置类似 [Loader 进阶配置](../configurations/advanced.md)，除了匹配使用的是标签名称，而不是 `lang` 属性。
+
+如果 loader 匹配到自定义块，它会被处理；其它情况会被忽略。
+
+## 例子
+
+这个例子是提取自定义块 `<docs>` 的内容到单个 docs 文件中：
+
+#### component.vue
+
+``` html
+<docs>
+## This is an Example component.
+</docs>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            // 提取 <docs> 中的内容为原始文本
+            'docs': ExtractTextPlugin.extract('raw-loader'),
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    // 输出 docs 到当个文件中
+    new ExtractTextPlugin('docs.md')
+  ]
+}
+```
diff --git a/docs/zh-cn/configurations/extract-css.md b/docs/zh-cn/configurations/extract-css.md
new file mode 100644
index 000000000..796dfcfba
--- /dev/null
+++ b/docs/zh-cn/configurations/extract-css.md
@@ -0,0 +1,70 @@
+# 提取 CSS 到单个文件
+
+提取所有 Vue 组件中的 CSS 到单个文件的例子：
+
+### Webpack 2.x
+
+``` bash
+npm install extract-text-webpack-plugin@2.x --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            css: ExtractTextPlugin.extract({
+              use: 'css-loader',
+              fallback: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+            })
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+### Webpack 1.x
+
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // you can also include <style lang="less"> or other langauges
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
diff --git a/docs/zh-cn/configurations/pre-processors.md b/docs/zh-cn/configurations/pre-processors.md
new file mode 100644
index 000000000..d3779403c
--- /dev/null
+++ b/docs/zh-cn/configurations/pre-processors.md
@@ -0,0 +1,81 @@
+# 使用预处理器
+
+在 Webpack 中，所有的预处理器需要匹配对应的 loader。 `vue-loader` 允许你使用其它 Webpack loaders 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loaders。
+
+### CSS
+
+例如，使用 SASS 编译我们的 `<style>` 语言块：
+
+``` bash
+npm install sass-loader node-sass --save-dev
+```
+
+``` html
+<style lang="sass">
+  /* write sass here */
+</style>
+```
+
+在内部，`<style>` 标签中的内容将会先由 `sass-loader` 进行处理，然后再传递进行下一步处理。
+
+#### sass-loader 警告
+
+与名称相反，[*sass*-loader](https://github.com/jtangelder/sass-loader) 默认解析 *SCSS* 语法。如果你想要使用 *SASS* 语法，你需要配置 `vue-loader` 的选项：
+
+```javascript
+{
+  test: /\.vue$/,
+  loader: 'vue-loader',
+  options: {
+    loaders: {
+      scss: 'vue-style-loader!css-loader!sass-loader', // <style lang="scss">
+      sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
+    }
+  }
+}
+```
+
+如要获得更多关于 `vue-loader` 的配置信息，请查看 [Loader 进阶配置](./advanced.md) 章节。
+
+### JavaScript
+
+Vue 组件中的所有 JavaScript 默认使用 `babel-loader` 处理。你也可以改变处理方式：
+
+``` bash
+npm install coffee-loader --save-dev
+```
+
+``` html
+<script lang="coffee">
+  # Write coffeescript!
+</script>
+```
+
+### 模版
+
+模版的处理方式略有不同，因为大多数 Webpack 模版处理器（比如 `pug-loader`）会返回模版处理函数，而不是编译的 HTML 字符串，我们使用原始的 `pug` 替代 `pug-loader`:
+
+``` bash
+npm install pug --save-dev
+```
+
+``` html
+<template lang="pug">
+div
+  h1 Hello world!
+</template>
+```
+
+> **重要:** 如果你使用 `vue-loader@<8.2.0`， 你还需要安装 `template-html-loader`。
+
+### 行内 Loader Requests
+
+你可以在 `lang` 属性中使用 [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) ：
+
+``` html
+<style lang="sass?outputStyle=expanded">
+  /* use sass here with expanded output */
+</style>
+```
+
+但是，这使你的 Vue 组件只适用于 Webpack，不能与 Browserify and [vueify](https://github.com/vuejs/vueify) 一同使用。**如果你打算将你的 Vue 组件作为可重复使用的第三方组件，请避免使用这个语法。**
diff --git a/docs/zh-cn/features/css-modules.md b/docs/zh-cn/features/css-modules.md
new file mode 100644
index 000000000..043213e44
--- /dev/null
+++ b/docs/zh-cn/features/css-modules.md
@@ -0,0 +1,117 @@
+# CSS 模块
+
+> 需要 ^9.8.0
+
+[CSS 模块](https://github.com/css-modules/css-modules) 是一个用于模块化和组合 CSS的流行系统。`vue-loader` 提供了与 CSS 模块的一流集成，可以作为模拟 CSS 作用域的替代方案。
+
+### 使用
+
+在你的 `<style>` 上添加 `module` 属性：
+
+``` html
+<style module>
+.red {
+  color: red;
+}
+.bold {
+  font-weight: bold;
+}
+</style>
+```
+
+这将为 `css-loader` 打开 CSS 模块模式，生成的 CSS 对象将为组件注入一个名叫 `$style` 的计算属性，你可以在你的模块中使用动态绑定：
+
+``` html
+<template>
+  <p :class="$style.red">
+    This should be red
+  </p>
+</template>
+```
+
+由于它是一个计算属性，它也与 `：class` 的 object/array 语法一起使用：
+
+``` html
+<template>
+  <div>
+    <p :class="{ [$style.red]: isRed }">
+      Am I red?
+    </p>
+    <p :class="[$style.red, $style.bold]">
+      Red and bold
+    </p>
+  </div>
+</template>
+```
+
+你也可以在 JavaScript 访问它：
+
+``` html
+<script>
+export default {
+  created () {
+    console.log(this.$style.red)
+    // -> "_1VyoJ-uZOjlOxP7jWUy19_0"
+    // an identifier generated based on filename and className.
+  }
+}
+</script>
+```
+
+请参考 [CSS Modules spec](https://github.com/css-modules/css-modules) 了解更多详细信息 [global exceptions](https://github.com/css-modules/css-modules#exceptions) 和 [composition](https://github.com/css-modules/css-modules#composition).
+
+### 自定义注入名称
+
+在 `.vue` 中你可以定义不止一个 `<style>`，为了避免被覆盖，你可以通过设置 `module` 属性来为它们定义注入后计算属性的名称。
+
+``` html
+<style module="a">
+  /* identifiers injected as a */
+</style>
+
+<style module="b">
+  /* identifiers injected as b */
+</style>
+```
+
+### 配置 `css-loader` Query
+
+CSS 模块处理是通过 [css-loader](https://github.com/webpack/css-loader)。默认 query 如下：
+
+``` js
+{
+  modules: true,
+  importLoaders: true,
+  localIdentName: '[hash:base64]'
+}
+```
+
+你可以使用 `vue-loader` 的 `cssModules` 选项去为 `css-loader` 添加 query 配置：
+
+``` js
+// webpack 1
+vue: {
+  cssModules: {
+    // overwrite local ident name
+    localIdentName: '[path][name]---[local]---[hash:base64:5]',
+    // enable camelCase
+    camelCase: true
+  }
+}
+
+// webpack 2
+module: {
+  rules: [
+    {
+      test: '\.vue$',
+      loader: 'vue-loader',
+      options: {
+        cssModules: {
+          localIdentName: '[path][name]---[local]---[hash:base64:5]',
+          camelCase: true
+        }
+      }
+    }
+  ]
+}
+```
diff --git a/docs/zh-cn/features/es2015.md b/docs/zh-cn/features/es2015.md
new file mode 100644
index 000000000..16f54345a
--- /dev/null
+++ b/docs/zh-cn/features/es2015.md
@@ -0,0 +1,65 @@
+# ES2015
+
+当项目中配置了 `babel-loader` 或者 `buble-loader`，`vue-loader` 会使用他们处理所有 `.vue` 文件中的 `<script>` 部分，允许我们在 Vue 组件中使用 ES2015，如果你还没有使用 ES2015，你应该使用它，下面是一些好的学习资源：
+
+- [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
+- [ES6 Features](https://github.com/lukehoban/es6features)
+- [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
+
+下面是导入其它 Vue 组件的典型写法：
+
+``` html
+<script>
+import ComponentA from './ComponentA.vue'
+import ComponentB from './ComponentB.vue'
+
+export default {
+  components: {
+    ComponentA,
+    ComponentB
+  }
+}
+</script>
+```
+
+我们使用 ES2015 的属性的简洁表示法去定义子组件，`{ ComponentA }` 是 `{ ComponentA: ComponentA }` 的简写，Vue 会自动的将 key 转换为`component-a`，所以你可以在 template 中使用 `<component-a>`.
+
+### 在 Templates 中使用 ES2015
+
+`.vue` 中的 `<template>` 会编译为 JavaScript 渲染函数，然后通过自定义构建的 [Buble](https://buble.surge.sh/guide/) 去支持 ES2015，这允许你使用[属性的简洁表示法](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) 和 [属性名表达式](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)：
+
+``` html
+<div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
+```
+
+可以简写为：
+
+``` html
+<div :class="{ active, [`${prefix}-button`]: isButton }">
+```
+
+**vue@^2.1.0 only:** 你可以在 `v-for` 或者 scoped slots 中使用解构赋值：
+
+``` html
+<li v-for="{ id, text } in items">
+  {{ id }} {{ text }}
+</li>
+```
+
+``` html
+<my-component>
+  <template scope="{ id, text }">
+    <span>{{ id }} {{ text }}</span>
+  </template>
+</my-component>
+```
+
+你还可以使用[`buble` 选项]（../ options.md＃buble）自定义模板中支持的功能。
+
+### 转换普通 `.js` 文件
+
+由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 Webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 Webpakc 中配置 `babel-loader`或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
+
+### 使用 `.babelrc` 配置 Babel
+
+`babel-loader` 遵守 [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)，因此这是推荐配置 Babel presets 和插件的方法。
diff --git a/docs/zh-cn/features/hot-reload.md b/docs/zh-cn/features/hot-reload.md
new file mode 100644
index 000000000..7d8df900a
--- /dev/null
+++ b/docs/zh-cn/features/hot-reload.md
@@ -0,0 +1,7 @@
+# 热重载
+
+"热重载"不是当你修改文件的时候简单重新加载页面。启用热重载后，当你修改 `.vue` 文件时，所有该组件的实例会被替换，**并且不需要刷新页面**。它甚至保持应用程序和修改组件的当前状态！当你调整模版或者修改样式时，这极大的提高了开发体验。
+
+![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
+
+当使用脚手架工具 `vue-cli` 时，热重载是开箱即用的。
\ No newline at end of file
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
new file mode 100644
index 000000000..77273d9c5
--- /dev/null
+++ b/docs/zh-cn/features/postcss.md
@@ -0,0 +1,68 @@
+# PostCSS
+
+由`vue-loader` 处理的 CSS 输出，都是通过 [PostCSS](https://github.com/postcss/postcss) 进行作用域重写，你还可以为 PostCSS 添加自定义插件，例如 [autoprefixer](https://github.com/postcss/autoprefixer) 或者 [CSSNext](http://cssnext.io/)。
+
+## 使用配置文件
+
+`vue-loader` 从 11.0 版本开始支持通过 [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) 自动加载同一个配置文件：
+
+- `postcss.config.js`
+- `.postcssrc`
+- `package.json` 中的 `postcss`
+
+使用配置文件允许一份配置用于处理普通 CSS 文件(通过`postcss-loader`)，和 `.vue` 文件内的 CSS，这是推荐做法。
+
+## 内联选项
+
+或者，你可以使用 `vue-loader` 的 `postcss` 选项来为 `.vue` 文件指定配置。
+
+Webpack 1.x 例子：
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other configs...
+  vue: {
+    // use custom postcss plugins
+    postcss: [require('postcss-cssnext')()]
+  }
+}
+```
+
+Webpack 2.x 例子:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // other options...
+  module: {
+    // module.rules is the same as module.loaders in 1.x
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        // vue-loader options goes here
+        options: {
+          // ...
+          postcss: [require('postcss-cssnext')()]
+        }
+      }
+    ]
+  }
+}
+```
+
+除了插件数组之外，`postcss` 配置选项也接受：
+
+- 一个返回插件数组的函数；
+
+- 一个对象包含配置选项，传递给 PostCSS 处理器。这在使用自定义 parser/stringifiers 时非常有用:
+
+  ``` js
+  postcss: {
+    plugins: [...], // list of plugins
+    options: {
+      parser: sugarss // use sugarss parser
+    }
+  }
+  ```
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
new file mode 100644
index 000000000..f2fe4fc29
--- /dev/null
+++ b/docs/zh-cn/features/scoped-css.md
@@ -0,0 +1,52 @@
+# CSS 作用域
+
+当 `<style>` 标签有 `scoped` 属性时，它的 CSS 只作用于当前组件中的元素。 这类似于 Shadow DOM 中的样式封装。它有一些注意事项，但不需要任何 polyfills。 它通过使用 PostCSS 来实现以下转换：
+
+``` html
+<style scoped>
+.example {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example">hi</div>
+</template>
+```
+
+转换结果：
+
+``` html
+<style>
+.example[_v-f3f3eg9] {
+  color: red;
+}
+</style>
+
+<template>
+  <div class="example" _v-f3f3eg9>hi</div>
+</template>
+```
+
+#### 注意
+
+1. 你可以在一个组件中同时使用 scoped 和 non-scoped styles
+
+  ``` html
+  <style>
+  /* global styles */
+  </style>
+
+  <style scoped>
+  /* local styles */
+  </style>
+  ```
+
+2. 子组件的根节点将同时受父组件作用域和子组件作用域的影响。
+
+3. 部分元素不受作用域影响部分。
+
+4. **CSS 作用域不能代C替 classes**。考虑到浏览器渲染各种 CSS 选择器的方式，`p { color: red }` 在作用域中会慢很多(即转换为属性选择器)。如果你使用 classes 或者 ids 代替，比如 `.example { color: red }`，这样几乎没有性能影响。[Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) 你可以测试它们的不同。
+
+5. **在递归组件中小心使用后代选择器!** 对于带有选择器 `.a .b` 的CSS 规则，如果元素 `.a` 包含递归子组件，所有的子组件中的 `.b` 会被匹配。
+
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
new file mode 100644
index 000000000..d9c5e6081
--- /dev/null
+++ b/docs/zh-cn/options.md
@@ -0,0 +1,190 @@
+# 配置文档
+
+## Webpack 1 和 2 配置差异
+
+Webpack 2：配置直接放到 loader rule 中。
+
+``` js
+module.exports = {
+  // ...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          // vue-loader options
+        }
+      }
+    ]
+  }
+}
+```
+
+Webpack 1.x：在 Webpack 配置中添加根节点 `vue` 块。
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader options
+  }
+}
+```
+
+### loaders
+
+- 类型： `{ [lang: string]: string }`
+
+  如果指定 Webpack loaders 会覆盖 ` .vue` 文件中的语言块的默认 `lang` 属性。 每种类型的默认 `lang` 是：
+  An object specifying Webpack loaders to overwrite the default loaders used for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+
+  - `<template>`: `html`
+  - `<script>`: `js`
+  - `<style>`: `css`
+
+  例如，使用 `babel-loader` 和 `eslint-loader` 处理所有的 `<script>` 块：
+
+  ``` js
+  // Webpack 2.x config
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: 'babel-loader!eslint-loader'
+          }
+        }
+      }
+    ]
+  }
+  ```
+
+### preLoaders
+
+- 类型： `{ [lang: string]: string }`
+- 在大于 >=10.3.0 版本中支持
+
+  配置格式和 `loaders` 相同，但是 `preLoaders` 会在默认 loaders 之前处理。你可以用来预处理语言块 - 一个例子是用来处理构建时的 i18n。
+  
+### postLoaders
+
+- 类型： `{ [lang: string]: string }`
+- 在大于 >=10.3.0 版本中支持
+
+  配置格式和 `loaders` 相同，但是 `postLoaders` 会在默认 loaders 之后处理。你可以用来后处理语言块。注意这会有些复杂：
+
+  - 对于 `html`,默认 loader 返回结果会被编译为 JavaScript 渲染函数。
+
+  - 对于 `css`，由`vue-style-loader` 返回的结果通常不太有用。使用 postcss 插件将会是更好的选择。
+
+### postcss
+
+> 注意： 在 >=11.0.0 版本中，推荐使用 PostCSS 配置文件代替. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+
+- 类型： `Array` or `Function` or `Object`
+
+
+  指定要应用于 `.vue` 文件中 CSS 的自定义 PostCSS 插件。如果使用函数，函数将使用相同的 loader 上下文调用，并返回一个插件数组。
+
+  ``` js
+  // ...
+  {
+    loader: 'vue-loader',
+    options: {
+      // note: do not nest the `postcss` option under `loaders`
+      postcss: [require('postcss-cssnext')()],
+      loaders: {
+        // ...
+      }
+    }
+  }
+  ```
+
+  这个配置选项也可以是一个对象，这在使用依赖于自定义 parser/stringifiers 的项目会非常有用：
+
+  ``` js
+  postcss: {
+    plugins: [...], // list of plugins
+    options: {
+      parser: sugarss // use sugarss parser
+    }
+  }
+  ```
+
+### cssSourceMap
+
+- 类型: `Boolean`
+- 默认值: `true`
+
+  是否开启 CSS 的 source maps，关闭可以避免 `css-loader` 的 some relative path related bugs 同时可以加快构建速度。
+
+  注意，这个值会在 Webpack 配置中没有 `devtool` 的情况下自动设置为 `false`。
+
+### esModule
+
+- 类型: `Boolean`
+- 默认值: `undefined`
+
+  是否导出 esModule 兼容代码，默认情况下 vue-loader 会导出 commonjs 格式，像 `module.exports = ....`。当 `esModule` 设置为 true 的情况下，导出会变为 `exports.__esModule = true; exports = ...`。Useful for interoperating with transpiler other than Babel，比如 TypeScript。
+
+### preserveWhitespace
+
+- 类型: `Boolean`
+- 默认值: `true`
+
+  如果设置为 `false`，模版中 HTML 标签之前的空格将会被忽略。
+
+### transformToRequire
+
+- 类型: `{ [tag: string]: string | Array<string> }`
+- 默认值: `{ img: 'src', image: 'xlink:href' }`
+
+  在模版编译过程中，编译器可以将某些属性，如 `src` 路径，转换为 `require` 调用，以便目标资源可以由 Webpack 处理。 默认配置会转换 `<img>` 标签上的 `src` 属性和 SVG 的 `<image>` 标签上的 `xlink：href` 属性。
+
+### buble
+
+- 类型: `Object`
+- 默认值: `{}`
+
+  在使用 `buble-loader` 时配置它的选项，AND the buble compilation pass for template render functions。
+
+  > 版本警告：在 9.x 版本中，模板表达式通过现在已经删除的 `templateBuble` 选项单独配置。
+
+
+  模板渲染函数编译支持一个特殊的变换 `stripWith`（默认启用），它删除生成的渲染函数中的 `with` 用法，使它们兼容严格模式。
+
+  配置例子：
+
+  ``` js
+  // webpack 1
+  vue: {
+    buble: {
+      // enable object spread operator
+      // NOTE: you need to provide Object.assign polyfill yourself!
+      objectAssign: 'Object.assign',
+
+      // turn off the `with` removal
+      transforms: {
+        stripWith: false
+      }
+    }
+  }
+
+  // webpack 2
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          buble: {
+            // same options
+          }
+        }
+      }
+    ]
+  }
+  ```
diff --git a/docs/zh-cn/start/setup.md b/docs/zh-cn/start/setup.md
new file mode 100644
index 000000000..97474524f
--- /dev/null
+++ b/docs/zh-cn/start/setup.md
@@ -0,0 +1,13 @@
+# 创建项目
+
+### 使用 `vue-cli`
+
+推荐用脚手架工具 `vue-cli` 来创建一个使用 `vue-loader` 的项目：
+
+``` bash
+npm install -g vue-cli
+vue init webpack-simple hello-vue
+cd hello-vue
+npm install
+npm run dev # ready to go!
+```
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
new file mode 100644
index 000000000..4de8776d2
--- /dev/null
+++ b/docs/zh-cn/start/spec.md
@@ -0,0 +1,112 @@
+# Vue 组件细则
+
+`.vue` 文件是一个自定义的文件类型,用类 HTML 语法描述一个 Vue 组件。每个 `.vue` 文件包含三种类型的顶级语言块 `<template>`, `<script>` 和 `<style>`，还允许添加可选的自定义块：
+
+``` html
+<template>
+  <div class="example">{{ msg }}</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello world!'
+    }
+  }
+}
+</script>
+
+<style>
+.example {
+  color: red;
+}
+</style>
+
+<custom1>
+  This could be e.g. documentation for the component.
+</custom1>
+```
+
+`vue-loader` 会解析文件，提取每个语言块，如有必要会通过其它 loaders 处理，最后将他们组装成一个 CommonJS 模块，`module.exports` 出一个 Vue.js 组件对象。
+
+`vue-loader` 支持使用非默认放言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写 style： 
+
+``` html
+<style lang="sass">
+  /* write SASS! */
+</style>
+```
+
+更多细节可以在 [预处理器](../configurations/pre-processors.md) 中找到。
+
+### 语言块
+
+#### `<template>`
+
+- 默认语言：`html`。
+
+- 每个 `.vue` 文件最多包含一个 `<template>` 块
+
+- 内容将被提取为字符串，将编译并用作 Vue 组件的 `template` 选项。
+
+#### `<script>`
+
+- 默认语言：`js` (ES2015 在检测到配置 `babel-loader` 或 `buble-loader` 时自动支持).
+
+- 每个 `.vue` 文件最多包含一个 `<script>` 块
+
+- script 在 CommonJS 环境中执行（就像通过 Webpack 打包的正常 js 模块），这意味这你可以 `require()` 其它依赖。在 ES2015 在支持下,你也可以使用 `import` 和 `export` 语法。
+
+- script 必须导出 Vue.js 组件对象。也可以导出由 `Vue.extend()` 创建的扩展对象，但是普通对象是最好的选择。
+
+#### `<style>`
+
+- 默认语言： `css`。
+
+- 一个 `.vue` 文件可以包含多个 `<style>` 标签。
+
+- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md) 和 [CSS 模块](../features/css-modules.md)) 以帮助你将样式封装到当前组件。多个不同封装的 `<style>` 标签将会混合在一个组件中。
+
+- 默认情况下内容将会使用 `style-loader` 提取并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md).
+
+### 自定义块
+
+> 只在 vue-loader 10.2.0+ 中支持
+
+可以在 `.vue` 文件中填加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loaders 来应用在对应的块上。webpack loaders 需要在 `vue-loader` 的选项 `loaders` 中指定。
+
+更多细节，查看 [自定义块](../configurations/custom-blocks.md)。
+
+### Src 导入
+
+如果你喜欢分隔你的 `.vue` 文件到多个文件中，你可以通过 `src` 属性导入外部文件：
+
+``` html
+<template src="./template.html"></template>
+<style src="./style.css"></style>
+<script src="./script.js"></script>
+```
+
+需要注意的是 `src` 导入遵循和 `require()` 一样的规则，这意味着你相对路径需要以 `./` 开始，你还可以从 NPM 包中直接导入资源，例如：
+
+``` html
+<!-- import a file from the installed "todomvc-app-css" npm package -->
+<style src="todomvc-app-css/index.css">
+```
+
+在自定义块上同样支持 `src` 导入，例如：
+
+``` html
+<unit-test src="./unit-test.js">
+</unit-test>
+```
+
+### 语法高亮
+
+
+目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 等)。 对其他编辑器/IDEs 的贡献将会非常感谢！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作HTML对待。
+
+### 注释
+
+在语言块中使用该语言块对应的注释语法（HTML, CSS, JavaScript, Jade, 等）。顶层注释使用 HTML 注释语法：`<!-- comment contents here -->`
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
new file mode 100644
index 000000000..339fd11a7
--- /dev/null
+++ b/docs/zh-cn/workflow/linting.md
@@ -0,0 +1,92 @@
+# 代码检验
+
+你可能有疑问，在 `.vue` 文件中你怎么检验你的代码，因为它不是 Javascript。我们假设你使用 [ESLint](http://eslint.org/) (如果你没有使用话，你应该去使用！)。
+
+你还需要 [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) 来支持提取并检验你的 `.vue` 文件中的 JavaScript。
+
+确保把下面的配置加入到你的 ESLint 配置中：
+``` json
+"plugins": [
+  "html"
+]
+```
+
+在命令行这样使用：
+
+``` bash
+eslint --ext js,vue MyComponent.vue
+```
+
+别一种方法是使用 [eslint-loader](https://github.com/MoOx/eslint-loader),这样你的 `.vue` 文件会在开发期间每次保存时自动检验。
+
+``` bash
+npm install eslint eslint-loader --save-dev
+```
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue!eslint'
+      }
+    ]
+  }
+}
+```
+
+注意 Webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
+
+我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 linting 配置到 Webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order)中：
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    // only lint local *.vue files
+    preLoaders: [
+      {
+        test: /.vue$/,
+        loader: 'eslint',
+        exclude: /node_modules/
+      }
+    ],
+    // but use vue-loader for all *.vue files
+    loaders: [
+      {
+        test: /.vue$/,
+        loader: 'vue'
+      }
+    ]
+  }
+}
+```
+
+For Webpack 2.x:
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  module: {
+    rules: [
+      // only lint local *.vue files
+      {
+        enforce: 'pre',
+        test: /.vue$/,
+        loader: 'eslint-loader',
+        exclude: /node_modules/
+      },
+      // but use vue-loader for all *.vue files
+      {
+        test: /.vue$/,
+        loader: 'vue-loader'
+      }
+    ]
+  }
+}
+```
diff --git a/docs/zh-cn/workflow/production.md b/docs/zh-cn/workflow/production.md
new file mode 100644
index 000000000..665c2f9bc
--- /dev/null
+++ b/docs/zh-cn/workflow/production.md
@@ -0,0 +1,39 @@
+# 生产环境构建
+
+生产环境打包要做两件事：
+
+1. 缩小软件代码；
+2. 使用 [Vue.js 指南 - 删除警告](https://cn.vuejs.org/v2/guide/deployment.html#删除警告) 去除 Vue.js 中的警告。
+
+下面是例子：
+
+``` js
+// webpack.config.js
+module.exports = {
+  // ... other options
+  plugins: [
+    // short-circuits all Vue.js warning code
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    // minify with dead-code elimination
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      }
+    }),
+    // optimize module ids by occurrence count
+    new webpack.optimize.OccurrenceOrderPlugin()
+  ]
+}
+```
+
+显然我们不会想在开发时使用这些配置，有几种方式来实现：
+
+1. 使用环境变量动态构建；
+
+2. 或者，使用两个分开的 Webpack 配置文件，一个用于开发环境，一个用于生产环境。把可能共用的配置放到第三个文件中，如 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) 所示。
+
+只要达到目标，怎么做取决于你。
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
new file mode 100644
index 000000000..b1a17838f
--- /dev/null
+++ b/docs/zh-cn/workflow/testing-with-mocks.md
@@ -0,0 +1,70 @@
+# Testing with Mocks
+
+In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
+
+`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
+
+Suppose we have a component like this:
+
+``` html
+<!-- example.vue -->
+<template>
+  <div class="msg">{{ msg }}</div>
+</template>
+
+<script>
+// this dependency needs to be mocked
+import SomeService from '../service'
+
+export default {
+  data () {
+    return {
+      msg: SomeService.msg
+    }
+  }
+}
+</script>
+```
+
+Here's how to import it with mocks:
+
+> Note: inject-loader@3.x is currently unstable.
+
+``` bash
+npm install inject-loader@^2.0.0 --save-dev
+```
+
+``` js
+// example.spec.js
+const ExampleInjector = require('!!vue?inject!./example.vue')
+```
+
+Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
+
+- `!!` at the start means "disable all loaders from the global config";
+- `vue?inject!` means "use the `vue` loader, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
+
+The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
+
+``` js
+const ExampleWithMocks = ExampleInjector({
+  // mock it
+  '../service': {
+    msg: 'Hello from a mocked service!'
+  }
+})
+```
+
+Finally, we can test the component like usual:
+
+``` js
+it('should render', () => {
+  const vm = new Vue({
+    template: '<div><test></test></div>',
+    components: {
+      'test': ExampleWithMocks
+    }
+  }).$mount()
+  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
+})
+```
diff --git a/docs/zh-cn/workflow/testing.md b/docs/zh-cn/workflow/testing.md
new file mode 100644
index 000000000..03c0a64c5
--- /dev/null
+++ b/docs/zh-cn/workflow/testing.md
@@ -0,0 +1,101 @@
+# Testing
+
+> The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
+
+When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+
+Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:
+
+``` bash
+npm install\
+  karma karma-webpack\
+  karma-jasmine jasmine-core\
+  karma-phantomjs-launcher phantomjs\
+  --save-dev
+```
+
+``` js
+// we can just use the exact same webpack config by requiring it
+// however, remember to delete the original entry since we don't
+// need it during tests
+var webpackConfig = require('./webpack.config.js')
+delete webpackConfig.entry
+
+// karma.conf.js
+module.exports = function (config) {
+  config.set({
+    browsers: ['PhantomJS'],
+    frameworks: ['jasmine'],
+    // this is the entry file for all our tests.
+    files: ['test/index.js'],
+    // we will pass the entry file to webpack for bundling.
+    preprocessors: {
+      'test/index.js': ['webpack']
+    },
+    // use the webpack config
+    webpack: webpackConfig,
+    // avoid walls of useless text
+    webpackMiddleware: {
+      noInfo: true
+    },
+    singleRun: true
+  })
+}
+```
+
+And for the entry `test/index.js` file:
+
+``` js
+// test/index.js
+// require all test files using special Webpack feature
+// https://webpack.github.io/docs/context.html#require-context
+var testsContext = require.context('.', true, /\.spec$/)
+testsContext.keys().forEach(testsContext)
+```
+
+This entry file simply requires all other files that ends in `.spec.js` in the same folder. Now we can actually write some tests:
+
+``` js
+// test/component-a.spec.js
+var Vue = require('vue')
+var ComponentA = require('../../src/components/a.vue')
+
+describe('a.vue', function () {
+
+  // asserting JavaScript options
+  it('should have correct message', function () {
+    expect(ComponentA.data().msg).toBe('Hello from Component A!')
+  })
+
+  // asserting rendered result by actually rendering the component
+  it('should render correct message', function () {
+    var vm = new Vue({
+      template: '<div><test></test></div>',
+      components: {
+        'test': ComponentA
+      }
+    }).$mount()
+    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
+  })
+})
+```
+
+To run the tests, add the following NPM script:
+
+``` js
+// package.json
+...
+"scripts": {
+  ...
+  "test": "karma start karma.conf.js"
+}
+...
+```
+
+Finally, run:
+
+``` bash
+npm test
+```
+
+Again, [webpack vue-cli template](https://github.com/vuejs-templates/webpack) contains a fully working example with tests.

From e17f249c7ab4a3ba5872cd0513896f43d78f9de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Thu, 23 Mar 2017 07:54:57 -0300
Subject: [PATCH 559/877] [Docs] Updated (#732)

---
 docs/pt_BR/configurations/advanced.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/pt_BR/configurations/advanced.md b/docs/pt_BR/configurations/advanced.md
index 631186f45..5d95bc4a8 100644
--- a/docs/pt_BR/configurations/advanced.md
+++ b/docs/pt_BR/configurations/advanced.md
@@ -49,7 +49,10 @@ module.exports = {
           //   postcss será uma opção melhor.
           postLoaders: {
             html: 'babel-loader'
-          }
+          },
+          
+          // `excludedPreLoaders` should be regex
+          excludedPreLoaders: /(eslint-loader)/
         }
       }
     ]
@@ -80,4 +83,4 @@ module.exports = {
 }
 ```
 
-Um uso mais prático das configurações avançadas do carregador é [extrair o CSS do componente em um único arquivo](./extract-css.md).
\ No newline at end of file
+Um uso mais prático das configurações avançadas do carregador é [extrair o CSS do componente em um único arquivo](./extract-css.md).

From 1bce36bd9a22517808453b1b4f5b56df8ff12c8d Mon Sep 17 00:00:00 2001
From: Alexander <Alex-Sokolov@users.noreply.github.com>
Date: Thu, 23 Mar 2017 18:19:09 +0300
Subject: [PATCH 560/877] Update custom-blocks.md (#733)

---
 docs/en/configurations/custom-blocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index 434f2685f..c9ee19831 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -113,7 +113,7 @@ We are now able to access the `<docs>` block's content of imported components du
 ``` html
 <template>
   <div>
-    <component-b \>
+    <component-b />
     <p>{{ docs }}</p>
   </div>
 </template>

From 990ce9be872c96dc0acddf41aadbedf8e8133d56 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 24 Mar 2017 10:02:51 +0800
Subject: [PATCH 561/877] avoid destructuring for node < 6 compat

---
 lib/style-compiler/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index a3d14b972..2a7be5573 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -26,13 +26,13 @@ module.exports = function (css, map) {
   }
 
   // use the same config loading interface as postcss-loader
-  loadPostcssConfig(vueOptions.postcss).then(({ plugins, options }) => {
-    plugins = [trim].concat(plugins)
-    options = Object.assign({
+  loadPostcssConfig(vueOptions.postcss).then(config => {
+    var plugins = [trim].concat(config.plugins)
+    var options = Object.assign({
       to: this.resourcePath,
       from: this.resourcePath,
       map: false
-    }, options)
+    }, config.options)
 
     // add plugin for vue-loader scoped css rewrite
     if (query.scoped) {

From de581323e38f196baf25203f30b815cbf37a28ab Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 24 Mar 2017 10:02:55 +0800
Subject: [PATCH 562/877] 11.3.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ec8d7321e..2da6c4ece 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.3.1",
+  "version": "11.3.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9c959bbf6ab894c5217b8a452f682d20a2f7172d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Fri, 24 Mar 2017 00:20:48 -0300
Subject: [PATCH 563/877] [Docs] Updated (#735)

* [Docs] Updated

* Fix typo
---
 docs/pt_BR/configurations/custom-blocks.md | 72 +++++++++++++++++++++-
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/docs/pt_BR/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
index f3a01dbd5..f34705884 100644
--- a/docs/pt_BR/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -4,9 +4,9 @@
 
 Você pode definir blocos de linguagem customizados dentro de arquivos `*.vue`. O conteúdo do bloco customizado será processado ppelos carregadores especificados na opção `loaders` do objeto de configuração `vue-loader` e então requerido pelo módulo componente. A configuração é semelhante a descrita em [Configurações Avançada do Carregador](../configurations/advanced.md), exceto o uso padrão do nome da tag em vez do atributo `lang`;
 
-Se for encontrado um carregador correspondente para um bloco customizado, ele será processado. Caso contrário o bloco customizado será simplesmente ignorado.
+Se for encontrado um carregador correspondente para um bloco customizado, ele será processado. Caso contrário o bloco customizado será simplesmente ignorado. Além disso, se o carregador encontrado retornar uma função, essa função será chamada com o componente do arquivo `* .vue` como um parâmetro.
 
-## Exemplo
+## Exemplo de arquivo docs simples
 
 Aqui está um exemplo de extração de todos os blocos customizados `<docs>` em um único arquivo docs;
 
@@ -40,7 +40,7 @@ comp-a h2 {
 
 #### webpack.config.js
 
-``` js
+```js
 // Webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
@@ -65,3 +65,69 @@ module.exports = {
   ]
 }
 ```
+
+## Documentos disponíveis em tempo de execução.
+
+Aqui está um exemplo de injetar os blocos personalizados `<docs>` no componente para que ele esteja disponível durante o tempo de execução.
+
+### docs-loader.js
+
+Para que o conteúdo do bloco personalizado seja injetado, precisamos de um carregador personalizado:
+
+```js
+ module.exports = function (source, map) {
+   this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+     JSON.stringify(source) +
+     '}', map)
+ }
+ ```
+
+#### webpack.config.js
+
+Agora, vamos configurar o webpack para usar o nosso carregador personalizado para blocos customizados `<docs>`.
+
+``` js
+ const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
+ 
+ module.exports = {
+   module: {
+     rules: [
+       {
+         test: /\.vue$/,
+         loader: 'vue',
+         options: {
+           loaders: {
+             'docs': docsLoader
+           }
+         }
+       }
+     ]
+   }
+ }
+ ```
+ 
+ #### component.vue
+ 
+ Agora podemos acessar o conteúdo do bloco `<docs>` de componentes importados durante o tempo de execução.
+ 
+ ``` html
+ <template>
+   <div>
+     <component-b />
+     <p>{{ docs }}</p>
+   </div>
+ </template>
+ 
+ <script>
+ import componentB from 'componentB';
+ 
+ export default = {
+   data () {
+     return {
+       docs: componentB.__docs
+     }
+   },
+   components: {componentB}
+ }
+ </script>
+ ```

From 31506f20c6db2a68ffb24e02a21dfaa2c7379367 Mon Sep 17 00:00:00 2001
From: Sam Wyma <sam.wyma@gmail.com>
Date: Fri, 24 Mar 2017 15:22:46 +0000
Subject: [PATCH 564/877] Change let to var (#738)

---
 lib/style-compiler/load-postcss-config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index 95bac6a1c..43ee6e8dc 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -1,6 +1,6 @@
 var load = require('postcss-load-config')
 
-let loaded
+var loaded
 
 function isObject (val) {
   return val && typeof val === 'object'

From 9ce7003a4a45f2d53ff68a98137ba8972c6467e2 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sat, 25 Mar 2017 00:23:17 +0900
Subject: [PATCH 565/877] custom blocks translation for ja (#737)

* pick up from #664

* translate #664

* improve title

from review comment: https://github.com/vuejs/vue-loader/pull/737#discussion_r107923846
---
 docs/ja/configurations/custom-blocks.md | 70 ++++++++++++++++++++++++-
 docs/ja/start/spec.md                   |  7 +++
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
index a9d41d00c..9b56edba1 100644
--- a/docs/ja/configurations/custom-blocks.md
+++ b/docs/ja/configurations/custom-blocks.md
@@ -4,9 +4,9 @@
 
 `*.vue` ファイル内にカスタム言語ブロックを定義することが出来ます。カスタムブロックの内容は `vue-loader` のオブジェクトで指定された loader によって処理され、次にコンポーネントモジュールによって要求されます。この設定は `lang` 属性の代わりにタグ名を使用する点をのぞいて[高度な loader の設定](../configurations/advanced.md)に記載されたものと似ています。
 
-もしカスタムブロックにマッチする loader を見つけたら、それは処理されます。でなければそのカスタムブロックは単に無視されます。
+もしカスタムブロックにマッチする loader を見つけたら、それは処理されます。でなければそのカスタムブロックは単に無視されます。加えて、見つかった loader が関数を返す場合は、その関数は `*.vue` ファイルのコンポーネントをパラメータとして呼び出します。
 
-## 例
+## 単一ドキュメントファイルの例
 
 全ての `<docs>` カスタムブロックを一つのドキュメントファイルに展開する例を示します：
 
@@ -65,3 +65,69 @@ module.exports = {
   ]
 }
 ```
+
+## 実行時に利用可能なドキュメント
+
+`<docs>`カスタムブロックをコンポーネントに注入して実行時に利用できるようにする例です。
+
+#### docs-loader.js 
+
+カスタムブロックコンテンツを注入するためには、カスタム loader が必要です:
+
+``` js
+module.exports = function (source, map) {
+  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+    JSON.stringify(source) +
+    '}', map)
+}
+```
+
+#### webpack.config.js
+
+次に、`<docs>` カスタムブロック用のカスタム loader を使用するように webpack を設定します。
+
+``` js
+const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            'docs': docsLoader
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+#### component.vue
+
+実行時にインポートされたコンポーネントの `<docs>` ブロックの内容にアクセスできるようになりました。
+
+``` html
+<template>
+  <div>
+    <component-b />
+    <p>{{ docs }}</p>
+  </div>
+</template>
+
+<script>
+import componentB from 'componentB';
+
+export default = {
+  data () {
+    return {
+      docs: componentB.__docs
+    }
+  },
+  components: {componentB}
+}
+</script>
+```
diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
index cc27296a8..8bca22041 100644
--- a/docs/ja/start/spec.md
+++ b/docs/ja/start/spec.md
@@ -94,6 +94,13 @@ export default {
 <style src="todomvc-app-css/index.css">
 ```
 
+`src` によるインポートはカスタムブロックでも動作します、例:
+
+``` html
+<unit-test src="./unit-test.js">
+</unit-test>
+```
+
 ### シンタックスハイライト
 
 現在それらはシンタクスハイライトをサポートしているのは、[Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). 他のエディタ/IDEへのコントリビュートは高く評価されます！もし Vue コンポーネント内でプリプロセッサを使用していない場合は、エディタで `*.vue` ファイルを HTML として扱うことが出来ます。

From 2465ac227437bcde9e19c5a2519187a4dd6ad14e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 25 Mar 2017 00:35:09 +0800
Subject: [PATCH 566/877] 11.3.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2da6c4ece..e6b095a25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 2f6fbe3a28207fc17eaf43de587ebd4cb9695bca Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sat, 25 Mar 2017 01:51:20 +0900
Subject: [PATCH 567/877] Revert "Revert "Change let to var"" (#740)

* Revert "Change let to var" (#739)

* Revert "custom blocks translation for ja (#737)"

This reverts commit 9ce7003a4a45f2d53ff68a98137ba8972c6467e2.

* Revert "Change let to var (#738)"

This reverts commit 31506f20c6db2a68ffb24e02a21dfaa2c7379367.

* Revert "Revert "Change let to var" (#739)"

This reverts commit fc2dbc4ca02a763b6bf78503f04364f0dc06dbeb.

From a8b2688fa3ceeb4429d58422be43ee81b0ebbd32 Mon Sep 17 00:00:00 2001
From: Nicholas Lee <nicholaslee119@gmail.com>
Date: Sun, 26 Mar 2017 08:12:55 +0900
Subject: [PATCH 568/877] Update advanced.md (#742)

refer to https://github.com/vuejs/vue-loader/pull/697
---
 docs/zh-cn/configurations/advanced.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index 3484c20e7..0a51ae979 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -45,6 +45,11 @@ module.exports = {
           postLoaders: {
             html: 'babel-loader'
           }
+          
+          // `excludedPreLoaders` 的内容是正则表达式
+          // 你可以用来从 Loader chain 上剔除那些你不需要 vue-loader 处理的 preloader
+          // 最常用的就是各种 lint
+          excludedPreLoaders: /(eslint-loader)/
         }
       }
     ]

From 20187a6f88508eaf5a54d07354036c1c32a715bc Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 26 Mar 2017 18:31:24 +0900
Subject: [PATCH 569/877] Update advanced.md for ja (#745)

* sync advanced section

* translate 'excludedPreLoaders' option
---
 docs/ja/configurations/advanced.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index 6778fcdbb..6b534b9cc 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -46,7 +46,10 @@ module.exports = {
           //   postcss プラグインを使用する方が良い選択になります。
           postLoaders: {
             html: 'babel-loader'
-          }
+          },
+
+          // `excludedPreLoaders` は正規表現で設定する必要があります。
+          excludedPreLoaders: /(eslint-loader)/
         }
       }
     ]

From 01bb852f354035f4d28c4a368b4f42fead1349b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Tue, 28 Mar 2017 22:08:39 -0300
Subject: [PATCH 570/877] [Docs] Fix typo (#750)

---
 docs/pt_BR/configurations/custom-blocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pt_BR/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
index f34705884..18a23ae4e 100644
--- a/docs/pt_BR/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -2,7 +2,7 @@
 
 > Requer versão 10.2.0+
 
-Você pode definir blocos de linguagem customizados dentro de arquivos `*.vue`. O conteúdo do bloco customizado será processado ppelos carregadores especificados na opção `loaders` do objeto de configuração `vue-loader` e então requerido pelo módulo componente. A configuração é semelhante a descrita em [Configurações Avançada do Carregador](../configurations/advanced.md), exceto o uso padrão do nome da tag em vez do atributo `lang`;
+Você pode definir blocos de linguagem customizados dentro de arquivos `*.vue`. O conteúdo do bloco customizado será processado pelos carregadores especificados na opção `loaders` do objeto de configuração `vue-loader` e então requerido pelo módulo componente. A configuração é semelhante a descrita em [Configurações Avançada do Carregador](../configurations/advanced.md), exceto o uso padrão do nome da tag em vez do atributo `lang`;
 
 Se for encontrado um carregador correspondente para um bloco customizado, ele será processado. Caso contrário o bloco customizado será simplesmente ignorado. Além disso, se o carregador encontrado retornar uma função, essa função será chamada com o componente do arquivo `* .vue` como um parâmetro.
 

From 3878a62a712f5bbbc29de9dbd928b130119b39e9 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Wed, 29 Mar 2017 16:36:56 +0900
Subject: [PATCH 571/877] support pre/post loaders for custom blocks (#744)

---
 lib/loader.js                   | 10 +++++++++-
 package.json                    |  1 +
 test/fixtures/custom-blocks.vue | 15 +++++++++++++++
 test/mock-loaders/blog.js       |  8 ++++++++
 test/mock-loaders/i18n.js       |  6 ++++++
 test/mock-loaders/yaml.js       |  7 +++++++
 test/test.js                    | 26 ++++++++++++++++++++++++++
 7 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/custom-blocks.vue
 create mode 100644 test/mock-loaders/blog.js
 create mode 100644 test/mock-loaders/i18n.js
 create mode 100644 test/mock-loaders/yaml.js

diff --git a/lib/loader.js b/lib/loader.js
index 42864eb7a..9b47464ed 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -174,7 +174,7 @@ module.exports = function (content) {
 
   function getLoaderString (type, part, index, scoped) {
     var loader = getRawLoaderString(type, part, index, scoped)
-    var lang = part.lang || defaultLang[type]
+    var lang = getLangString(type, part)
     if (preLoaders[lang]) {
       loader = loader + ensureBang(preLoaders[lang])
     }
@@ -184,6 +184,14 @@ module.exports = function (content) {
     return loader
   }
 
+  function getLangString (type, part) {
+    if (type === 'script' || type === 'template' || type === 'styles') {
+      return part.lang || defaultLang[type]
+    } else {
+      return type
+    }
+  }
+
   function getRawLoaderString (type, part, index, scoped) {
     var lang = part.lang || defaultLang[type]
     var loader = loaders[lang]
diff --git a/package.json b/package.json
index e6b095a25..75001c85c 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "extract-text-webpack-plugin": "^2.0.0-rc.0",
     "file-loader": "^0.10.0",
     "inject-loader": "^2.0.0",
+    "js-yaml": "^3.8.2",
     "jsdom": "^9.2.1",
     "marked": "^0.3.6",
     "memory-fs": "^0.4.1",
diff --git a/test/fixtures/custom-blocks.vue b/test/fixtures/custom-blocks.vue
new file mode 100644
index 000000000..de3f1032c
--- /dev/null
+++ b/test/fixtures/custom-blocks.vue
@@ -0,0 +1,15 @@
+<i18n lang="yaml">
+en:
+  hello: "hello world"
+ja:
+  hello: "こんにちは、世界"
+</i18n>
+
+<blog>## foo</blog>
+
+<template>
+  <div>
+    <h1>{{ msg }}</h1>
+    <p v-html="blog"></p>
+  </div>
+</template>
diff --git a/test/mock-loaders/blog.js b/test/mock-loaders/blog.js
new file mode 100644
index 000000000..d441233af
--- /dev/null
+++ b/test/mock-loaders/blog.js
@@ -0,0 +1,8 @@
+function normalize (code) {
+  return code.split(/\r?\n/).map(function (line) { return line }).join('')
+}
+
+module.exports = function (source) {
+  var code = "module.exports = function (Component) { Component.options.__blog = '" + source + "' }"
+  return normalize(code)
+}
diff --git a/test/mock-loaders/i18n.js b/test/mock-loaders/i18n.js
new file mode 100644
index 000000000..718312e14
--- /dev/null
+++ b/test/mock-loaders/i18n.js
@@ -0,0 +1,6 @@
+module.exports = function (source) {
+  var value = typeof source === 'string' ? JSON.parse(source) : source
+  var jsonString = JSON.stringify(value).replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029')
+  var code = 'module.exports = function (Component) { Component.options.__i18n = ' + JSON.stringify(jsonString) + ' }'
+  this.callback(null, code)
+}
diff --git a/test/mock-loaders/yaml.js b/test/mock-loaders/yaml.js
new file mode 100644
index 000000000..a27de0b5a
--- /dev/null
+++ b/test/mock-loaders/yaml.js
@@ -0,0 +1,7 @@
+var yaml = require('js-yaml')
+
+module.exports = function (source) {
+  this.cacheable && this.cacheable()
+  var res = yaml.safeLoad(source)
+  return JSON.stringify(res)
+}
diff --git a/test/test.js b/test/test.js
index 8e49f2812..5e71b4438 100644
--- a/test/test.js
+++ b/test/test.js
@@ -716,6 +716,32 @@ describe('vue-loader', function () {
     })
   })
 
+  it('pre/post loaders for custom blocks', done => {
+    test({
+      entry: './test/fixtures/custom-blocks.vue',
+      vue: {
+        preLoaders: {
+          i18n: require.resolve('./mock-loaders/yaml')
+        },
+        loaders: {
+          i18n: require.resolve('./mock-loaders/i18n'),
+          blog: 'marked'
+        },
+        postLoaders: {
+          blog: require.resolve('./mock-loaders/blog')
+        }
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module, {
+        msg: JSON.parse(module.__i18n).en.hello,
+        blog: module.__blog
+      })
+      expect(vnode.children[0].children[0]).to.equal('hello world')
+      expect(vnode.children[2].data.domProps.innerHTML).to.equal('<h2 id="foo">foo</h2>')
+      done()
+    })
+  })
+
   it('custom compiler modules', done => {
     test({
       entry: './test/fixtures/custom-module.vue',

From 5af00e58bb58329ac353c0e4048a62a33f8dac15 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 29 Mar 2017 15:37:31 +0800
Subject: [PATCH 572/877] 11.3.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 75001c85c..591992761 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.3.3",
+  "version": "11.3.4",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 8cf8800beebd73abcc22f1462e7b5c7a42a0253f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 6 Apr 2017 11:19:01 +0800
Subject: [PATCH 573/877] remove @ version for extract-text-webpack-plugin
 (close #747)

---
 docs/en/configurations/extract-css.md    | 2 +-
 docs/ja/configurations/extract-css.md    | 2 +-
 docs/kr/configurations/extract-css.md    | 2 +-
 docs/pt_BR/configurations/extract-css.md | 4 ++--
 docs/ru/configurations/extract-css.md    | 2 +-
 docs/zh-cn/configurations/extract-css.md | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index 952211b51..cc254a70b 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -5,7 +5,7 @@ Example config to extract all the processed CSS in all Vue components into a sin
 ### Webpack 2.x
 
 ``` bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js
diff --git a/docs/ja/configurations/extract-css.md b/docs/ja/configurations/extract-css.md
index 3d3115550..8696a1624 100644
--- a/docs/ja/configurations/extract-css.md
+++ b/docs/ja/configurations/extract-css.md
@@ -5,7 +5,7 @@
 ### Webpack 2.x
 
 ``` bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js
diff --git a/docs/kr/configurations/extract-css.md b/docs/kr/configurations/extract-css.md
index 8d6793896..9ace5208f 100644
--- a/docs/kr/configurations/extract-css.md
+++ b/docs/kr/configurations/extract-css.md
@@ -38,7 +38,7 @@ module.exports = {
 ### Webpack 2.x (^2.1.0-beta.25)
 
 ``` bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js
diff --git a/docs/pt_BR/configurations/extract-css.md b/docs/pt_BR/configurations/extract-css.md
index dce8c6481..b15e95ea4 100644
--- a/docs/pt_BR/configurations/extract-css.md
+++ b/docs/pt_BR/configurations/extract-css.md
@@ -5,7 +5,7 @@ Exemplo de configuração para extrair todo CSS processado de todos componentes
 ### Webpack 2.x
 
 ```bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ```js
@@ -67,4 +67,4 @@ module.exports = {
     new ExtractTextPlugin("style.css")
   ]
 }
-```
\ No newline at end of file
+```
diff --git a/docs/ru/configurations/extract-css.md b/docs/ru/configurations/extract-css.md
index 0664bf186..7df77b65e 100644
--- a/docs/ru/configurations/extract-css.md
+++ b/docs/ru/configurations/extract-css.md
@@ -5,7 +5,7 @@
 ### Webpack 2.x
 
 ``` bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js
diff --git a/docs/zh-cn/configurations/extract-css.md b/docs/zh-cn/configurations/extract-css.md
index 796dfcfba..f037fe543 100644
--- a/docs/zh-cn/configurations/extract-css.md
+++ b/docs/zh-cn/configurations/extract-css.md
@@ -5,7 +5,7 @@
 ### Webpack 2.x
 
 ``` bash
-npm install extract-text-webpack-plugin@2.x --save-dev
+npm install extract-text-webpack-plugin --save-dev
 ```
 
 ``` js

From 2e9330a25485b2b50576b0a766420d4f33e65694 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 6 Apr 2017 11:24:20 +0800
Subject: [PATCH 574/877] bring back ctx.webpack for postcss config (fix #757)

---
 lib/style-compiler/index.js               | 3 +--
 lib/style-compiler/load-postcss-config.js | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index 2a7be5573..29206e0af 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -25,8 +25,7 @@ module.exports = function (css, map) {
     vueOptions = Object.assign({}, this.options.vue, this.vue)
   }
 
-  // use the same config loading interface as postcss-loader
-  loadPostcssConfig(vueOptions.postcss).then(config => {
+  loadPostcssConfig(this, vueOptions.postcss).then(config => {
     var plugins = [trim].concat(config.plugins)
     var options = Object.assign({
       to: this.resourcePath,
diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index 43ee6e8dc..f276ce009 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -6,9 +6,11 @@ function isObject (val) {
   return val && typeof val === 'object'
 }
 
-module.exports = function loadPostcssConfig (inlineConfig) {
+module.exports = function loadPostcssConfig (loaderContext, inlineConfig) {
   if (process.env.VUE_LOADER_TEST || !loaded) {
-    loaded = load({}, null, { argv: false }).catch(() => {
+    loaded = load({
+      webpack: loaderContext
+    }, null, { argv: false }).catch(() => {
       // postcss-load-config throws error when no config file is found,
       // but for us it's optional.
     })

From e7df13dcfcb84eeed3a47a40222aa6fd1b9eb928 Mon Sep 17 00:00:00 2001
From: Grigoriy Beziuk <me@gbezyuk.ru>
Date: Sat, 8 Apr 2017 15:37:39 +0700
Subject: [PATCH 575/877] [JUST MERGE ME] Russian translation update (#761)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* - Initial commit

* - Добавлен русский в LANGS.md

* - extract-css переведён

* - postcss.md переведён

* - setup.md переведён

* - scoped-css.md частично переведён

* - options.md переведён не до конца

* - es2015.md частичный перевод

* - README.md переведены заголовки

* - advanced.md частичный перевод

* - hot-reload.md переведён

* - pre-processors.md частичный перевод

* - css-modules.md частичный перевод

* - SUMMARY.md

* - options.md

* spec.md

* - es2015.md переведен

* - css-modules.md переведен

* - scoped-css.md переведен

* - advanced.md переведен

* - pre-processor.md частично переведен

* - Мелкая правка в spec.md

* - asset-url частично переведен

* - pre-processors допереведен

* - asset-url переведен

* Translated README.md, testing.md and testing-with-mocks.md (first approach)

* Readme reading fixes

* Fixed 'powerful' translation in README.md and some punctuation in testing-with-mocks.md

* Fixed ndashes in definitions

* Review fixes

* Minor fix for README.md

* Added a paragraph about mocks and replaced "mock" with "mock-object"

* Punctuation fixes for testing-with-mocks.md

* Added translation to production.md

* Translated linting.md

* Removed archaic expression

* - README.md добавлена новая строка (пока не переведено)

* - advanced.md добавленения для конфига Webpack 2

* - spec.md добавлены пользовательские секции vue-файлов

* - extract-css правка версии вебпака

* advanced.md правка версии вебпака + примеров

* - spec.md сокращен раздел о пользовательских блоках

* - Добавлены пользовательские блоки в оглавление

* - custom-blocks.md добавлен и переведен новый раздел

* - custom-block.md обновление к новой версии vue-loader

* - css-modules.md переведён заголовок

* - summary.md приведены ссылок в соответствие с заголовками в файлах

* - extract-css.md Webpack 2 перенесен выше

* - options.md Webpack 2 вынесен в начало. Добавлены упоминания preLoader & postLoaders

* - advanced.md Webpack 2 поставлен раньше.  Добавлены упоминания preLoaders & postLoaders

* - extract-css исправления для extract-text-webpack-plugin второй версии

* - PostCSS.md добавлена секция про поддержку файлов конфигов

* - Доработки по postcss

* - options.md допереведено

* production.md исправлена опечатка в названии плагина

* custom-blocks.md исправлен конфиг примера

* advanced.md добавлен excludedPreLoaders

* custom-blocks.md добавлена секция

* Мелкая правка

* custom-blocks.md уточнение

* Домерж

* custom-blocks.md исправлена опечатка
---
 docs/ru/configurations/advanced.md      |  5 +-
 docs/ru/configurations/custom-blocks.md | 70 ++++++++++++++++++++++++-
 docs/ru/workflow/production.md          |  2 +-
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
index 277a85e3c..015dd1ef9 100644
--- a/docs/ru/configurations/advanced.md
+++ b/docs/ru/configurations/advanced.md
@@ -48,7 +48,10 @@ module.exports = {
           //   Использование postcss-плагина будет лучшим вариантом.
           postLoaders: {
             html: 'babel-loader'
-          }
+          },
+
+           // `excludedPreLoaders` должен быть регулярным выражением
+           excludedPreLoaders: /(eslint-loader)/
         }
       }
     ]
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index 31e3a55e2..e5895f366 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -4,9 +4,9 @@
 
 Вы можете определять пользовательски блоки внутри `*.vue` файлов. Содержимое пользовательских блоков будет обрабатываться загрузчиками, указанными в объекте `loaders` настроек `vue-loader` и затем подключено модулем к компоненту. Конфигурация аналогична тому, что описано в разделе [продвинутой конфигурации загрузчиков](../configurations/advanced.md), за исключением совпадений по имени тега, вместо атрибута `lang`.
 
-Если подходящий загрузчик будет найден для пользовательского блока, он будет обработан; в противном случае пользовательский блок будет просто проигнорирован.
+Если подходящий загрузчик будет найден для пользовательского блока, он будет обработан; в противном случае пользовательский блок будет просто проигнорирован. Кроме того, если найденный загрузчик возвращает функцию, эта функция будет вызываться с компонентом из файла `*.vue` в качестве параметра.
 
-## Пример
+## Пример создания единого файла документации
 
 Пример извлечения всех пользовательских блоков `<docs>` в отдельный файл документации:
 
@@ -65,3 +65,69 @@ module.exports = {
   ]
 }
 ```
+
+## Документация доступная во время выполнения
+
+Вот пример того, как можно встроить пользовательские блоки `<docs>` в компонент, чтобы он был доступен во время выполнения.
+
+#### docs-loader.js 
+
+Для инъекции содержимого пользовательского блока понадобится пользовательский загрузчик: 
+
+``` js
+module.exports = function (source, map) {
+  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+    JSON.stringify(source) +
+    '}', map)
+}
+```
+
+#### webpack.config.js
+
+Теперь необходимо настроить Webpack использовать наш загрузчик для пользовательских блоков `<docs>`.
+
+``` js
+const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            'docs': docsLoader
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+#### component.vue
+
+Теперь мы можем получить доступ к содержимому блока `<docs>` импортированного компонента на этапе выполнения. 
+
+``` html
+<template>
+  <div>
+    <component-b />
+    <p>{{ docs }}</p>
+  </div>
+</template>
+
+<script>
+import componentB from 'componentB';
+
+export default = {
+  data () {
+    return {
+      docs: componentB.__docs
+    }
+  },
+  components: {componentB}
+}
+</script>
+```
diff --git a/docs/ru/workflow/production.md b/docs/ru/workflow/production.md
index 11bd6f453..4b0103173 100644
--- a/docs/ru/workflow/production.md
+++ b/docs/ru/workflow/production.md
@@ -25,7 +25,7 @@ module.exports = {
       }
     }),
     // оптимизируем идентификаторы модулей по числу использований
-    new webpack.optimize.OccurenceOrderPlugin()
+    new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
 ```

From d0b07b5e269b20d2653a83cdd4800cbfba35e8a2 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <Alex-Sokolov@users.noreply.github.com>
Date: Sat, 8 Apr 2017 18:03:04 +0300
Subject: [PATCH 576/877] Add note about OccurrenceOrderPlugin (#760)

---
 docs/en/workflow/production.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index ef0bc66f1..931816e62 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // optimize module ids by occurrence count
+    // Webpack 1 only - optimize module ids by occurrence count
     new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }

From ae9d405b76a4c274863e3b15d2bf31236cd8a021 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 9 Apr 2017 00:53:11 +0900
Subject: [PATCH 577/877] Improve ja translations (#766)

* pick up from #760

* tweak ja translations
---
 docs/ja/README.md                        | 21 +++++-----
 docs/ja/SUMMARY.md                       |  2 +-
 docs/ja/configurations/advanced.md       | 12 +++---
 docs/ja/configurations/asset-url.md      |  5 +--
 docs/ja/configurations/custom-blocks.md  |  2 +-
 docs/ja/configurations/extract-css.md    |  2 +-
 docs/ja/configurations/pre-processors.md |  8 ++--
 docs/ja/features/css-modules.md          | 14 +++----
 docs/ja/features/es2015.md               | 10 ++---
 docs/ja/features/postcss.md              | 11 +++--
 docs/ja/features/scoped-css.md           |  2 +-
 docs/ja/options.md                       | 53 ++++++++++++------------
 docs/ja/start/setup.md                   |  2 +-
 docs/ja/start/spec.md                    | 36 +++++++---------
 docs/ja/workflow/linting.md              | 16 +++----
 docs/ja/workflow/production.md           | 15 ++++---
 docs/ja/workflow/testing-with-mocks.md   | 12 +++---
 docs/ja/workflow/testing.md              | 10 ++---
 18 files changed, 110 insertions(+), 123 deletions(-)

diff --git a/docs/ja/README.md b/docs/ja/README.md
index c80aa4030..08504db53 100644
--- a/docs/ja/README.md
+++ b/docs/ja/README.md
@@ -6,13 +6,12 @@
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
-`vue-loader` によって多くのクールな機能が提供されます：
+`vue-loader` によって多くのクールな機能が提供されます:
 
-- デフォルトで ES2015 が有効；
-- `<style>` には SASS、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の Webpack の loader が使用可能；
- カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能；
-- `<style>` と `<template>` で参照される静的なアセットをモジュールの依存として扱い、Webpack の loader で処理可能；
-- 各コンポーネントで scoped CSS をシミュレートすることが可能；
+- デフォルトで ES2015 が有効
+- `<style>` には SASS、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の Webpack の loader が使用可能、カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能
+- `<style>` と `<template>` で参照される静的なアセットをモジュールの依存として扱い、Webpack の loader で処理可能
+- 各コンポーネントで scoped CSS をシミュレートすることが可能
 - 開発時のコンポーネントのホットリロードをサポート
 
 つまり、Webpack と `vue-loader` の組み合わせは Vue.js アプリケーションを作成するための、現代的で柔軟かつとても強力なフロントエンドワークフローを実現することが可能になります。
@@ -29,10 +28,10 @@
 
 しかし Webpack はそれ以上のことが出来ます。 "loader" を用いることで、最終的なバンドルしたファイルを出力する前に Webpack に様々な方法で全てのタイプのファイルを変換できるように設定することが出来ます。いくつかの例をあげると：
 
-- ES2015、CoffeeScript、TypeScript のモジュールをプレーンな ES5 の CommonJS モジュールにトランスパイル；
-- オプションでコンパイルを行う前にソースコードを linter に通すことが可能；
-- Jade テンプレートをプレーンな HTML にトランスパイルし、JavaScript の文字列として展開；
-- SASS ファイルをプレーンな CSS にトランスパイルし、`<style>` タグとして挿入する JavaScript スニペットに変換；
-- HTML または CSS で参照されるイメージファイルを処理し、パスの設定に基づいた目的の場所に移動し、md5 ハッシュを使用して名前付け；
+- ES2015、CoffeeScript、TypeScript のモジュールをプレーンな ES5 の CommonJS モジュールにトランスパイル
+- オプションでコンパイルを行う前にソースコードを linter に通すことが可能
+- Jade テンプレートをプレーンな HTML にトランスパイルし、JavaScript の文字列として展開
+- SASS ファイルをプレーンな CSS にトランスパイルし、`<style>` タグとして挿入する JavaScript スニペットに変換
+- HTML または CSS で参照されるイメージファイルを処理し、パスの設定に基づいた目的の場所に移動し、md5 ハッシュを使用して名前付け
 
 Webpack は非常に強力です。どのように動作するか理解すれば、フロントエンド開発のワークフローを劇的に向上させることが出来ます。欠点としては冗長で複雑な構成です。しかし、このガイドでは Vue.js と `vue-loader` での Webpack を使用する際に一般的な問題の解決策を見つけることができるはずです。
diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
index f489b56ec..30141944d 100644
--- a/docs/ja/SUMMARY.md
+++ b/docs/ja/SUMMARY.md
@@ -15,7 +15,7 @@
   - [カスタムブロック](configurations/custom-blocks.md)
 - ワークフロー
   - [プロダクションビルド](workflow/production.md)
-  - [Linting](workflow/linting.md)
+  - [リント](workflow/linting.md)
   - [テスト](workflow/testing.md)
   - [モックを使用したテスト](workflow/testing-with-mocks.md)
 - [オプションリファレンス](options.md)
diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index 6b534b9cc..13ef1d20b 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -1,14 +1,14 @@
 # 高度な loader の設定
 
-時折こうしたくなるかもしれません：
+時折こうしたくなるかもしれません:
 
-1. `vue-loader` が推測するのではなく、カスタム loader の文字列を言語に適用する。
-2. デフォルトの言語の組み込み loader の設定の上書き。
-3. 特定の言語ブロックをカスタム loader で前処理か後処理をする。
+1. `vue-loader` が推測するのではなく、カスタム loader の文字列を言語に適用する
+2. デフォルトの言語の組み込み loader の設定の上書き
+3. 特定の言語ブロックをカスタム loader で前処理か後処理をする
 
-そうするためには、`vue-loader` に `loaders` オプションを指定してください：
+そうするためには、`vue-loader` に `loaders` オプションを指定してください:
 
-> メモ： `preLoaders` と `postLoaders` は 10.3.0 以上でのみサポートされます
+> メモ: `preLoaders` と `postLoaders` は 10.3.0 以上でのみサポートされます
 
 ### Webpack 2.x
 
diff --git a/docs/ja/configurations/asset-url.md b/docs/ja/configurations/asset-url.md
index 7a06878eb..18cc121e5 100644
--- a/docs/ja/configurations/asset-url.md
+++ b/docs/ja/configurations/asset-url.md
@@ -8,15 +8,14 @@
 <img src="../image.png">
 ```
 
-このようにコンパイルされます：
+このようにコンパイルされます:
 
 ``` js
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 もちろん `.png` ファイルは JavaScript のファイルではありません。[file-loader](https://github.com/webpack/file-loader) または [url-loader](https://github.com/webpack/url-loader) を使用して Webpack を設定する必要があります。`vue-cli` でスキャフォールドされたプロジェクトでは同じような設定がなされています。
 
-利点の全ては次の通りです：
+利点の全ては次の通りです:
 
 1. `file-loader` はアセットファイルのコピー先や配置先を制定したり、バージョンハッシュを利用してキャッシングを改善する方法を指定する事が出来ます。さらに、これは、単に**あなたの `* .vue` ファイルの隣にイメージを置くことができ、配備するURLを心配するのではなくフォルダ構造に基づいて相対パスを使用する**ことを意味します。
-
 2. `url-loader` は、指定されたしきい値よりも小さい場合、条件付きでファイルを base-64 データ URL としてインライン化することができます。これにより、単純なファイルに対する HTTP リクエストの量を減らすことができます。 ファイルがしきい値より大きい場合、自動的に `file-loader` にフォールバックします。
diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
index 9b56edba1..7c4a7ece8 100644
--- a/docs/ja/configurations/custom-blocks.md
+++ b/docs/ja/configurations/custom-blocks.md
@@ -8,7 +8,7 @@
 
 ## 単一ドキュメントファイルの例
 
-全ての `<docs>` カスタムブロックを一つのドキュメントファイルに展開する例を示します：
+全ての `<docs>` カスタムブロックを一つのドキュメントファイルに展開する例を示します:
 
 #### component.vue
 
diff --git a/docs/ja/configurations/extract-css.md b/docs/ja/configurations/extract-css.md
index 8696a1624..63956ba34 100644
--- a/docs/ja/configurations/extract-css.md
+++ b/docs/ja/configurations/extract-css.md
@@ -1,6 +1,6 @@
 # CSS を単一のファイルに抽出する
 
-すべての Vue コンポーネントで処理されたすべての CSS を1つの CSS ファイルに抽出する例：
+すべての Vue コンポーネントで処理されたすべての CSS を 1 つの CSS ファイルに抽出する例:
 
 ### Webpack 2.x
 
diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
index 04576ad65..1b72c8358 100644
--- a/docs/ja/configurations/pre-processors.md
+++ b/docs/ja/configurations/pre-processors.md
@@ -4,7 +4,7 @@ Webpack において、全てのプリプロセッサは対応する loader を
 
 ### CSS
 
-例えば、SASS で `<style>` タグをコンパイルしましょう：
+例えば、SASS で `<style>` タグをコンパイルしましょう:
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -39,7 +39,7 @@ vue-loader を構成する方法の詳細については、[高度な loader の
 
 ### JavaScript
 
-全てのVueコンポーネントのJavaScriptはデフォルトで `babel-loader` によって処理されます。しかしもちろんそれは変更することが可能です：
+全ての Vue コンポーネントの JavaScript はデフォルトで `babel-loader` によって処理されます。しかしもちろんそれは変更することが可能です:
 
 ``` bash
 npm install coffee-loader --save-dev
@@ -53,7 +53,7 @@ npm install coffee-loader --save-dev
 
 ### テンプレート
 
-`pug-loader` のようなほとんどのWebpackテンプレート loader は、コンパイルされたHTML文字列の代わりにテンプレート関数を返すので、template の処理は少し異なります。`pug-loader` を使う代わりに、オリジナルの `pug` をインストールをするだけです：
+`pug-loader` のようなほとんどのWebpackテンプレート loader は、コンパイルされたHTML文字列の代わりにテンプレート関数を返すので、template の処理は少し異なります。`pug-loader` を使う代わりに、オリジナルの `pug` をインストールをするだけです:
 
 ``` bash
 npm install pug --save-dev
@@ -70,7 +70,7 @@ div
 
 ### インラインローダーリクエスト
 
-`lang` 属性で [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) を使用することが可能です：
+`lang` 属性で [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) を使用することが可能です:
 
 ``` html
 <style lang="sass?outputStyle=expanded">
diff --git a/docs/ja/features/css-modules.md b/docs/ja/features/css-modules.md
index 8dd753f7b..380bc2839 100644
--- a/docs/ja/features/css-modules.md
+++ b/docs/ja/features/css-modules.md
@@ -6,7 +6,7 @@
 
 ### 使い方
 
-`module` 属性を `<style>` タグに追加します：
+`module` 属性を `<style>` タグに追加します:
 
 ``` html
 <style module>
@@ -29,7 +29,7 @@
 </template>
 ```
 
-これは算出プロパティなので、`:class` の オブジェクト/配列 構文でも動作します：
+これは算出プロパティなので、`:class` の オブジェクト / 配列構文でも動作します:
 
 ``` html
 <template>
@@ -44,7 +44,7 @@
 </template>
 ```
 
-そして JavaScript からもアクセス可能です：
+そして JavaScript からもアクセス可能です:
 
 ``` html
 <script>
@@ -60,9 +60,9 @@ export default {
 
 [CSS Modules spec](https://github.com/css-modules/css-modules) を参照してください。モードの詳細については [global exceptions](https://github.com/css-modules/css-modules#exceptions) と [composition](https://github.com/css-modules/css-modules#composition)を参照してください。
 
-### カスタム代入
+### カスタム注入名
 
-単一の `*.vue` コンポーネントは複数の `<style>` タグを持つことが出来ます。注入されたスタイルが互いに上書きするのを避けるために、 `module`属性に値を与えることによって、注入された計算されたプロパティの名前をカスタマイズすることができます：
+単一の `*.vue` コンポーネントは複数の `<style>` タグを持つことが出来ます。注入されたスタイルが互いに上書きするのを避けるために、 `module`属性に値を与えることによって、注入された計算されたプロパティの名前をカスタマイズすることができます:
 
 ``` html
 <style module="a">
@@ -76,7 +76,7 @@ export default {
 
 ### `css-loader` クエリの設定
 
-CSS モジュールは [css-loader](https://github.com/webpack/css-loader) によって処理されます。`<style module>` では `css-loader` に使われるデフォルトのクエリは次のようになります。
+CSS モジュールは [css-loader](https://github.com/webpack/css-loader) によって処理されます。`<style module>` では `css-loader` に使われるデフォルトのクエリは次のようになります:
 
 ``` js
 {
@@ -86,7 +86,7 @@ CSS モジュールは [css-loader](https://github.com/webpack/css-loader) に
 }
 ```
 
-vue-loader の `cssModules`オプションを使って` css-loader`に追加のクエリオプションを提供することができます：
+vue-loader の `cssModules`オプションを使って` css-loader`に追加のクエリオプションを提供することができます:
 
 ``` js
 // webpack 1
diff --git a/docs/ja/features/es2015.md b/docs/ja/features/es2015.md
index 521c24feb..a27463230 100644
--- a/docs/ja/features/es2015.md
+++ b/docs/ja/features/es2015.md
@@ -1,11 +1,11 @@
 # ES2015
 
-同一プロジェクト内で `babel-loader` か `buble-loader` を検出したとき、全ての `*.vue` ファイルの `<script>` タグを処理するためにそれらを使用し Vue コンポーネント内で ES2015 を使用できるようにします。もしあなたがまだ新しい言語機能を手に入れていないのであれば、手に入れるべきです。いくつかのよい学習リソースはこちら：
+同一プロジェクト内で `babel-loader` か `buble-loader` を検出したとき、全ての `*.vue` ファイルの `<script>` タグを処理するためにそれらを使用し Vue コンポーネント内で ES2015 を使用できるようにします。もしあなたがまだ新しい言語機能を手に入れていないのであれば、学ぶべきです。いくつかのよい学習リソースはこちら:
 - [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
 - [ES6 Features](https://github.com/lukehoban/es6features)
 - [Exploring ES6 (book)](https://leanpub.com/exploring-es6)
 
-他の Vue コンポーネントを読み込む際の典型的なパターンはこちらです。
+他の Vue コンポーネントを読み込む際の典型的なパターンはこちらです:
 
 ``` html
 <script>
@@ -21,11 +21,11 @@ export default {
 </script>
 ```
 
-ここでは ES2015 のオブジェクトリテラルを使用して子コンポーネントを定義しています。`{ ComponentA }` は `{ ComponentA: ComponentA }` の簡略形です。 Vue はオートでキーを `component-a` に変換し、インポートされたコンポーネントをテンプレート内で `<component-a>` として使用することが出来ます。
+ここでは ES2015 のオブジェクトリテラルを使用して子コンポーネントを定義しています。`{ ComponentA }` は `{ ComponentA: ComponentA }` の簡略形です。 Vue は自動でキーを `component-a` に変換し、インポートされたコンポーネントをテンプレート内で `<component-a>` として使用することが出来ます。
 
 ### テンプレート内のES2015
 
-`*.vue` ファイル内の `<template>` は JavaScript の render 関数にコンパイルされ[Buble](https://buble.surge.sh/guide/) のカスタムビルドで処理され ES2015 の機能をサポートします。これにより [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) と[算出プロパティ](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)などの機能が使用できるようになります。
+`*.vue` ファイル内の `<template>` は JavaScript の render 関数にコンパイルされ[Buble](https://buble.surge.sh/guide/) のカスタムビルドで処理され ES2015 の機能をサポートします。これにより [Object shorthand properties](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) と[算出プロパティ](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)などの機能が使用できるようになります:
 
 ``` html
 <div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
@@ -37,7 +37,7 @@ export default {
 <div :class="{ active, [`${prefix}-button`]: isButton }">
 ```
 
-**vue@^2.1.0 のみ利用可能:** `v-for` かスコープ付きスロットを使用することで、構造化されたパラメータを使用することが出来ます：
+**vue@^2.1.0 のみ利用可能:** `v-for` かスコープ付きスロットを使用することで、構造化されたパラメータを使用することが出来ます:
 
 ``` html
 <li v-for="{ id, text } in items">
diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
index d8a54ee68..3ae7d33e7 100644
--- a/docs/ja/features/postcss.md
+++ b/docs/ja/features/postcss.md
@@ -4,7 +4,7 @@
 
 ## 設定ファイルの使用
 
-バージョン 11.0 以降、 `vue-loader` は [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) でサポートされているものと同じ PostCss の設定ファイルのオートロードをサポートします：
+バージョン 11.0 以降、 `vue-loader` は [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) でサポートされているものと同じ PostCss の設定ファイルのオートロードをサポートします:
 
 - `postcss.config.js`
 - `.postcssrc`
@@ -16,7 +16,7 @@
 
 あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の postcss の設定を指定することが出来ます。
 
-Webpack 1.x の例：
+Webpack 1.x の例:
 
 ``` js
 // webpack.config.js
@@ -52,11 +52,10 @@ module.exports = {
 }
 ```
 
-加えてpluginの配列を提供し、`postcss` オプションは以下も受け入れます：
+加えて plugin の配列を提供し、`postcss` オプションは以下も受け入れます
 
-- プラグインの配列を返す関数；
-
-- PostCSSプロセッサに渡すオプションを含むオブジェクト。これは、カスタム parser/stringifiers に依存するPostCSSプロジェクトを使用している場合に便利です。
+- プラグインの配列を返す関数
+- PostCSSプロセッサに渡すオプションを含むオブジェクト。これは、カスタム parser/stringifiers に依存するPostCSSプロジェクトを使用している場合に便利です:
 
   ``` js
   postcss: {
diff --git a/docs/ja/features/scoped-css.md b/docs/ja/features/scoped-css.md
index 75997cc10..f58728e47 100644
--- a/docs/ja/features/scoped-css.md
+++ b/docs/ja/features/scoped-css.md
@@ -1,6 +1,6 @@
 # スコープ付き CSS
 
-`scoped` 属性をもつ `<style>` タグを利用するとき、その CSS は現在のコンポーネントの要素にのみ適用されます。これは Shadow DOM のスタイルのカプセル化に似ています。いくつか注意点がありますが、polyfill は必要ありません。PostCSS を使用して以下を変換することによって実現しています。
+`scoped` 属性をもつ `<style>` タグを利用するとき、その CSS は現在のコンポーネントの要素にのみ適用されます。これは Shadow DOM のスタイルのカプセル化に似ています。いくつか注意点がありますが、polyfill は必要ありません。PostCSS を使用して以下を変換することによって実現しています:
 
 ``` html
 <style scoped>
diff --git a/docs/ja/options.md b/docs/ja/options.md
index 413551db4..d9ade93c1 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -1,8 +1,8 @@
 # オプションリファレンス
 
-## Webpack 1と2の使い方の違い
+## Webpack 1 と 2 の使い方の違い
 
-Webpack 2 の場合：オプションを loader ルールに直接渡します。
+Webpack 2 の場合: オプションを loader ルールに直接渡します。
 
 ``` js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-Webpack 1.x の場合： Webpack の設定のルートに `vue` ブロックを追加します。
+Webpack 1.x の場合: Webpack の設定のルートに `vue` ブロックを追加します。
 
 ``` js
 module.exports = {
@@ -34,15 +34,15 @@ module.exports = {
 
 ### loaders
 
-- 型： `{ [lang: string]: string }`
+- 型: `{ [lang: string]: string }`
 
-  `* .vue` ファイル内の言語ブロックに使用されるデフォルトの loader を上書きする Webpack loader を指定するオブジェクト。キーは指定されている場合、言語ブロックの `lang` 属性に対応します。各タイプのデフォルトの `lang` は次のとおりです：
+  `* .vue` ファイル内の言語ブロックに使用されるデフォルトの loader を上書きする Webpack loader を指定するオブジェクト。キーは指定されている場合、言語ブロックの `lang` 属性に対応します。各タイプのデフォルトの `lang` は次のとおりです:
 
   - `<template>`: `html`
   - `<script>`: `js`
   - `<style>`: `css`
 
-  たとえば、`babel-loader` と `eslint-loader` を使ってすべての `<script>` ブロックを処理するには：
+  たとえば、`babel-loader` と `eslint-loader` を使ってすべての `<script>` ブロックを処理するには:
 
   ``` js
   // Webpack 2.x config
@@ -63,27 +63,26 @@ module.exports = {
 
 ### preLoaders
 
-- 型： `{ [lang: string]: string }`
+- 型: `{ [lang: string]: string }`
 - 10.3.0 以上でサポートされます。
 
   config 形式は `loaders` と同じですが、`preLoaders` はデフォルト loader の前に対応する言語ブロックに適用されます。これを使用して言語ブロックを前処理することができます。一般的な使用例としては、i18n のビルド時です。
 
 ### postLoaders
 
-- 型：`{ [lang: string]: string }`
+- 型: `{ [lang: string]: string }`
 - 10.3.0 以上でサポートされます。
 
-  config 形式は `loaders` と同じですが、` postLoaders` はデフォルト loader の後に適用されます。これを使用して言語ブロックを後処理することができます。ただしこれは少し複雑になります：
+  config 形式は `loaders` と同じですが、` postLoaders` はデフォルト loader の後に適用されます。これを使用して言語ブロックを後処理することができます。ただしこれは少し複雑になります:
 
   - `html` の場合、デフォルトの loader によって返される結果は、コンパイルされた JavaScript レンダリング関数コードになります。
-
   - `css` の場合、結果は` vue-style-loader` によって返されます。これはほとんどの場合特に有用ではありません。postcss プラグインを使用する方が良いでしょう。
 
 ### postcss
 
-  > メモ: 11.0.0 以上では代わりにPostCSSの設定ファイル推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
+  > メモ: 11.0.0 以上では代わりに PostCSS の設定ファイル推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
 
-- 型： `Array` もしくは `Function` か `Object`
+- 型: `Array` もしくは `Function` か `Object`
 
   カスタムした PostCSS プラグインを `*.vue` ファイル内の CSS に適用するよう指定します。もし関数を使用しているなら、この関数は同じ loader のコンテキストを使用して呼び出され、プラグインの配列を返す必要があります。
 
@@ -114,46 +113,46 @@ module.exports = {
 
 ### cssSourceMap
 
-- 型： `Boolean`
+- 型: `Boolean`
 - デフォルト: `true`
 
   CSS のソースマップを有効にするかどうか。これを無効にすると、`css-loader` の相対パス関連のバグを避けることができ、ビルドを少し早くすることができます。
 
-  注意： もしメインの Webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
+  注意: もしメインの Webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
 
 ### esModule
 
-- 型： `Boolean`
-- デフォルト： `undefined`
+- 型: `Boolean`
+- デフォルト: `undefined`
 
   esModule 互換コードを発行するかどうか。デフォルトの vue-loader のデフォルトの出力は `module.exports = ....` のような commonjs 形式で発行します。 `esModule` が true にセットされているとき、デフォルトの出力は `exports.__esModule = true; exports = ...` にトランスパイルされます。TypeScript のような Babel 以外の transpiler との相互運用に役立ちます。
 
 ### preserveWhitespace
 
-- 型： `Boolean`
-- デフォルト： `true`
+- 型: `Boolean`
+- デフォルトx: `true`
 
   もし `false` に設定されていたら、テンプレート内の HTML タグ間の空白は無視されます。
 
 ### transformToRequire
 
-- 型： `{ [tag: string]: string | Array<string> }`
-- デフォルト： `{ img: 'src', image: 'xlink:href' }`
+- 型: `{ [tag: string]: string | Array<string> }`
+- デフォルト: `{ img: 'src', image: 'xlink:href' }`
 
-  テンプレートのコンパイル中、コンパイラは `src` の URL のような特定の属性を `require` 呼び出しに変換することができます。これによりターゲットの asset を Webpack が処理できるようになります。デフォルトの設定は `<img>` タグの `src` 属性と SVG の `<image>` タグの `xlink：href` 属性を変換します。
+  テンプレートのコンパイル中、コンパイラは `src` の URL のような特定の属性を `require` 呼び出しに変換することができます。これによりターゲットの asset を Webpack が処理できるようになります。デフォルトの設定は `<img>` タグの `src` 属性と SVG の `<image>` タグの `xlink:href` 属性を変換します。
 
 ### buble
 
-  型： `Object`
-  デフォルト： `{}`
+  型: `Object`
+  デフォルト: `{}`
 
-  `bubble-loader`（存在する場合）のオプションとテンプレートレンダリング関数のための buble のコンパイルパスを設定します。
+  `bubble-loader`(存在する場合)のオプションとテンプレートレンダリング関数のための buble のコンパイルパスを設定します。
 
-  > バージョンメモ： 9.x では、テンプレート式は削除された `templateBuble` オプションによって別々に設定されます。
+  > バージョンメモ: 9.x では、テンプレート式は削除された `templateBuble` オプションによって別々に設定されます。
 
-  このテンプレートレンダリング関数のコンパイルでは、特別な変換 `stripWidth` （デフォルトで有効）がサポートされ、生成されたレンダリング関数で `with` の使用法が削除され、strict-mode に準拠します。
+  このテンプレートレンダリング関数のコンパイルでは、特別な変換 `stripWidth` (デフォルトで有効)がサポートされ、生成されたレンダリング関数で `with` の使用法が削除され、strict-mode に準拠します。
 
-  設定の例：
+  設定の例:
 
   ``` js
   // webpack 1
diff --git a/docs/ja/start/setup.md b/docs/ja/start/setup.md
index 786b22878..29fc8d877 100644
--- a/docs/ja/start/setup.md
+++ b/docs/ja/start/setup.md
@@ -2,7 +2,7 @@
 
 ### `vue-cli` の使用
 
-`vue-loader` を使用するプロジェクトの足場作りは `vue-cli` を使用することをお薦めします：
+`vue-loader` を使用するプロジェクトの足場作り (scaffolding) には `vue-cli` を使用することをお薦めします:
 
 ``` bash
 npm install -g vue-cli
diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
index 8bca22041..092a9a2ab 100644
--- a/docs/ja/start/spec.md
+++ b/docs/ja/start/spec.md
@@ -1,6 +1,6 @@
 # Vue Component の仕様
 
-`*.vue` ファイルは HTML ライクな構文を使用して Vue コンポーネントを記述するカスタムファイルフォーマットです。各 `*.vue` ファイルは `<template>`、`<script>`、`<style>` の三つのトップレベル言語のブロックで構成されています。
+`*.vue` ファイルは HTML のような構文を使用して Vue コンポーネントを記述するカスタムファイルフォーマットです。各 `*.vue` ファイルは `<template>`、`<script>`、`<style>` の三つのトップレベル言語のブロックで構成されています。
 
 ``` html
 <template>
@@ -34,7 +34,7 @@ export default {
 
 ``` html
 <style lang="sass">
-  /* write SASS! */
+  /* SASS で書きます! */
 </style>
 ```
 詳細は [プリプロセッサの仕様](../configurations/pre-processors.md) で確認することが出来ます。
@@ -44,30 +44,22 @@ export default {
 #### `<template>`
 
 - デフォルトの言語は `html`
-
-- それぞれの `*.vue` ファイルは最大で一つの `<template>` ブロックを含みます。
-
-- 内容は文字列に展開され、コンパイルされた Vue コンポーネントの `template` オプションで使用されます。
+- それぞれの `*.vue` ファイルは最大で一つの `<template>` ブロックを含みます
+- 内容は文字列に展開され、コンパイルされた Vue コンポーネントの `template` オプションで使用されます
 
 #### `<script>`
 
 - デフォルトの言語は `js`（`babel-loader` や `buble-loader` が検出される場合、自動的にES2015がサポートされる）
-
-- それぞれの `*.vue` ファイルは最大で一つの `<script>` ブロックを含みます。
-
-- スクリプトは CommonJS のように処理されます（ Webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `recuire()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます。
-
-- スクリプトは Vue.js コンポーネントのオプションオブジェクトをエクスポートする必要があります。 'Vue.extend()' によって拡張されたコンストラクタもエクスポートすることが可能ですが、プレーンなオブジェクトが好ましいです。
+- それぞれの `*.vue` ファイルは最大で一つの `<script>` ブロックを含みます
+- スクリプトは CommonJS のように処理されます（ Webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `recuire()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます
+- スクリプトは Vue.js コンポーネントのオプションオブジェクトをエクスポートする必要があります。 `Vue.extend()` によって拡張されたコンストラクタもエクスポートすることが可能ですが、プレーンなオブジェクトが好ましいです
 
 #### `<style>`
 
-- デフォルトの言語は `css`。
-
-- 複数の `<style>` タグは単一の `*.vue` ファイルでサポートされます。
-
-- `<style>` タグは `scoped` か `module` （詳しくは [Scoped CSS](../features/scoped-css.md) と [CSS Modules](../features/css-modules.md) をみてください）を使用してコンポーネントにスタイルをカプセル化する事が出来ます。異なるカプセルモードをもつ複数の `<style>` タグは同じコンポーネント内で混在させることが出来ます。
-
-- デフォルトではコンテンツは `style-loader` を使用して実際の `<style>` タグとして抽出され、ドキュメントの `<head>` に動的に挿入されます。また、[すべてのコンポーネントのすべてのスタイルが単一のCSSファイルに抽出されるようにWebpackを設定する](../configurations/extract-css.md)こともできます。
+- デフォルトの言語は `css`
+- 複数の `<style>` タグは単一の `*.vue` ファイルでサポートされます
+- `<style>` タグは `scoped` か `module` （詳しくは [Scoped CSS](../features/scoped-css.md) と [CSS Modules](../features/css-modules.md) をみてください）を使用してコンポーネントにスタイルをカプセル化する事が出来ます。異なるカプセルモードをもつ複数の `<style>` タグは同じコンポーネント内で混在させることが出来ます
+- デフォルトではコンテンツは `style-loader` を使用して実際の `<style>` タグとして抽出され、ドキュメントの `<head>` に動的に挿入されます。また、[すべてのコンポーネントのすべてのスタイルが単一のCSSファイルに抽出されるようにWebpackを設定する](../configurations/extract-css.md)ことも出来ます
 
 ### カスタムブロック
 
@@ -79,7 +71,7 @@ export default {
 
 ### ソースのインポート
 
-もし `*.vue` コンポーネントを複数のファイルに分割したい場合は、`src` 属性を使って言語ブロック用の外部ファイルをインポートすることが出来ます。
+もし `*.vue` コンポーネントを複数のファイルに分割したい場合は、`src` 属性を使って言語ブロック用の外部ファイルをインポートすることが出来ます:
 
 ``` html
 <template src="./template.html"></template>
@@ -87,7 +79,7 @@ export default {
 <script src="./script.js"></script>
 ```
 
-`src` のインポートは CommonJS の `require()` 呼び出しと同じパス解決規則に従うことに注意してください。相対パスは `./` で始める必要があり、インストールされた NPM パッケージから直接リソースをインポートすることができます。
+`src` のインポートは CommonJS の `require()` 呼び出しと同じパス解決規則に従うことに注意してください。相対パスは `./` で始める必要があり、インストールされた NPM パッケージから直接リソースをインポートすることができます:
 
 ``` html
 <!-- インストールされた "todomvc-app-css" npm パッケージ からファイルをインポートします-->
@@ -107,4 +99,4 @@ export default {
 
 ### コメント
 
-それぞれのブロック内でそれぞれの言語のコメントシンタックスを使用することが出来る（HTML、CSS、JavaScript、Jade、etc）。最上部のコメントは HTML コメントシンタックスを使用してください： `<!-- コメントはこちら -->`
+それぞれのブロック内でそれぞれの言語のコメントシンタックスを使用することが出来る (HTML、CSS、JavaScript、Jade、etc) 。最上部のコメントは HTML コメントシンタックスを使用してください: `<!-- コメントはこちら -->`
diff --git a/docs/ja/workflow/linting.md b/docs/ja/workflow/linting.md
index b2aee5979..8f6e475e9 100644
--- a/docs/ja/workflow/linting.md
+++ b/docs/ja/workflow/linting.md
@@ -1,10 +1,10 @@
-# Linting
+# リント
 
-あなたはJavaScriptでない `*.vue` の中のコードをどうやって lint するのか疑問に思っているかも知れません。[ESLint](http://eslint.org/)を使用していると仮定します（もし使っていないのならばすべきです！）
+あなたは JavaScript でない `*.vue` の中のコードをどうやってリント (lint) するのか疑問に思っているかも知れません。[ESLint](http://eslint.org/) を使用していると仮定します(もし使っていないのならばすべきです!)
 
 `* .vue`ファイル内のJavaScriptの抽出と埋め込みをサポートする[eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html)も同様に必要です。
 
-あなたの ESLint の設定にプラグインを含めてください：
+あなたの ESLint の設定にプラグインを含めてください:
 
 ``` json
 "plugins": [
@@ -12,13 +12,13 @@
 ]
 ```
 
-コマンドラインで次を実行してください：
+コマンドラインで次を実行してください:
 
 ``` bash
 eslint --ext js,vue MyComponent.vue
 ```
 
-別のオプションは `*.vue` ファイルが開発中に保存時されたとき、自動的に lint されるように[eslint-loader](https://github.com/MoOx/eslint-loader)を使用しています：
+別のオプションは `*.vue` ファイルが開発中に保存時されたとき、自動的にリントされるように [eslint-loader](https://github.com/MoOx/eslint-loader) を使用しています:
 
 ``` bash
 npm install eslint eslint-loader --save-dev
@@ -38,16 +38,16 @@ module.exports = {
   }
 }
 ```
-Webpack ローダーチェーンは**まずはじめに**に適用されることをご了承ください。`vue` の前に `eslint` を適用して、コンパイル前のソースコードを lint してください。
+Webpack ローダーチェーンは**まずはじめに**に適用されることをご了承ください。`vue` の前に `eslint` を適用して、コンパイル前のソースコードをリントしてください。
 
-一つ私たちが考慮する必要があるのは、NPM パッケージでリリースされているサードパーティの* .vueコンポーネントを使用することです。そのような場合には、サードパーティー製のコンポーネントを処理するために  `vue-loader` を使用したいと思いますが、それを lint したくはありません。そういうときは lint を Webpack の [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) に分けることが可能です：
+1 つ私たちが考慮する必要があるのは、NPM パッケージでリリースされているサードパーティの* .vueコンポーネントを使用することです。そのような場合には、サードパーティー製のコンポーネントを処理するために  `vue-loader` を使用したいと思いますが、それをリントしたくはありません。そういうときはリントを Webpack の [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) に分けることが可能です:
 
 ``` js
 // webpack.config.js
 module.exports = {
   // 他のオプション
   module: {
-    // lint対象はローカルの *.vue ファイルのみ
+    // リント対象はローカルの *.vue ファイルのみ
     preLoaders: [
       {
         test: /.vue$/,
diff --git a/docs/ja/workflow/production.md b/docs/ja/workflow/production.md
index e92a5b968..d20d061e4 100644
--- a/docs/ja/workflow/production.md
+++ b/docs/ja/workflow/production.md
@@ -1,11 +1,11 @@
 # プロダクションビルド
 
-プロダクション用にバンドルを構築するときは二つのことを行います：
+プロダクション用にバンドルを構築するときは 2 つのことを行います:
 
-1. アプリケーションコードを縮小します：
+1. アプリケーションコードを縮小します:
 2. [Vue.jsガイドに記載されているセットアップの説明](https://vuejs.org/guide/deployment.html) を使用して Vue.js のソースコードから全ての警告を削除します
 
-設定例を以下に示します：
+設定例を以下に示します:
 
 ``` js
 // webpack.config.js
@@ -24,16 +24,15 @@ module.exports = {
         warnings: false
       }
     }),
-    // 発生回数別にモジュールIDを最適化します
+    // Webpack 1 のみ - 発生回数別にモジュールIDを最適化します
     new webpack.optimize.OccurenceOrderPlugin()
   ]
 }
 ```
 
-明らかに開発中にこの設定を使いたくないので、これにはいくつかの方法をとります：
+明らかに開発中にこの設定を使いたくないので、これにはいくつかの方法をとります:
 
-1. 環境変数に基づいて構成オブジェクトを動的に構築します；
-
-2. または、開発用と運用用の2つの Webpack 設定ファイルを使用します。[vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)に示すように、3つ目のファイルに共通のオプションをいくつか共有することもできます。
+1. 環境変数に基づいて構成オブジェクトを動的に構築します
+2. または、開発用と運用用の2つの Webpack 設定ファイルを使用します。[vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) に示すように、3 つ目のファイルに共通のオプションをいくつか共有することもできます
 
 目標を達成している限り、それはあなた次第です。
diff --git a/docs/ja/workflow/testing-with-mocks.md b/docs/ja/workflow/testing-with-mocks.md
index 7776fbef8..b14df1881 100644
--- a/docs/ja/workflow/testing-with-mocks.md
+++ b/docs/ja/workflow/testing-with-mocks.md
@@ -4,7 +4,7 @@
 
 `vue-loader` は、[inject-loader](https://github.com/plasticine/inject-loader)を使って任意の依存関係を `*.vue` コンポーネントに注入する機能を提供します。一般的な考え方としては、コンポーネントモジュールを直接インポートするのではなく、`inject-loader` を使用して、そのモジュール用の「モジュールファクトリ」関数を作成するというものです。この関数がモックのオブジェクトで呼び出されると、モックが注入されたモジュールのインスタンスが返されます。
 
-次のようなコンポーネントがあるとします：
+次のようなコンポーネントがあるとします:
 
 ``` html
 <!-- example.vue -->
@@ -26,9 +26,9 @@ export default {
 </script>
 ```
 
-モックをインポートする方法は次のとおりです：
+モックをインポートする方法は次のとおりです:
 
-> 注意: inject-loader@3.x は現在不安定です。
+> 注意: inject-loader@3.x は現在 unstable です。
 
 ``` bash
 npm install inject-loader@^2.0.0 --save-dev
@@ -39,12 +39,12 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-注意。狂気じみた文字列を必要とします - ここではいくつかのインライン [webpack loader](https://webpack.github.io/docs/loaders.html）を使用しています。簡単な説明としては：
+注意。狂気じみた文字列を必要とします - ここではいくつかのインライン [webpack loader](https://webpack.github.io/docs/loaders.html) を使用しています。簡単な説明としては:
 
 - `!!`は "グローバル設定からすべてのローダを無効にする"ことを意味します；
 - `vue？inject！` は  "`vue` loader を使い、`？inject` クエリを渡す"ことを意味します。 これは `vue-loader` に、依存性注入モードでコンポーネントをコンパイルするように指示します。
 
-返される `ExampleInjector` は、`example.vue` モジュールのインスタンスを生成するために呼び出すことができるファクトリ関数です：
+返される `ExampleInjector` は、`example.vue` モジュールのインスタンスを生成するために呼び出すことができるファクトリ関数です:
 
 ``` js
 const ExampleWithMocks = ExampleInjector({
@@ -55,7 +55,7 @@ const ExampleWithMocks = ExampleInjector({
 })
 ```
 
-最後に、コンポーネントを通常どおりテストすることができます：
+最後に、コンポーネントを通常どおりテストすることができます:
 
 ``` js
 it('should render', () => {
diff --git a/docs/ja/workflow/testing.md b/docs/ja/workflow/testing.md
index f06007732..ccdc16da4 100644
--- a/docs/ja/workflow/testing.md
+++ b/docs/ja/workflow/testing.md
@@ -1,6 +1,6 @@
 # テスト
 
-> [webpack vue-cliテンプレート](https://github.com/vuejs-templates/webpack)には、事前に設定されたユニットテストとe2eテストの設定が用意されています。
+> [webpack vue-cli テンプレート](https://github.com/vuejs-templates/webpack)には、事前に設定された単体テストと e2e テストの設定が用意されています。
 
 `* .vue`ファイルをテストするときには、普通の CommonJS ベースのテストランナーを使うことができません。なぜならそのテストランナーは `*.vue` ファイルの扱い方を知らないからです。代わりに、Webpack + vue-loader を使用してテストファイルをバンドルします。推奨設定は [Karma](http://karma-runner.github.io/0.13/index.html) と [karma-webpack](https://github.com/webpack/karma-webpack) です。
 
@@ -43,7 +43,7 @@ module.exports = function (config) {
 }
 ```
 
-そして`test/index.js`ファイルのエントリの場合：
+そして`test/index.js`ファイルのエントリの場合:
 
 ``` js
 // test/index.js
@@ -53,7 +53,7 @@ var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
 ```
 
-このエントリファイルは、単に同じフォルダ内の `.spec.js` で終わる他のすべてのファイルを必要とします。これで実際にいくつかのテストを書くことができます：
+このエントリファイルは、単に同じフォルダ内の `.spec.js` で終わる他のすべてのファイルを必要とします。これで実際にいくつかのテストを書くことができます:
 
 ``` js
 // test/component-a.spec.js
@@ -80,7 +80,7 @@ describe('a.vue', function () {
 })
 ```
 
-テストを実行するには、次の NPM スクリプトを追加します：
+テストを実行するには、次の NPM スクリプトを追加します:
 
 ``` js
 // package.json
@@ -92,7 +92,7 @@ describe('a.vue', function () {
 ...
 ```
 
-最後に実行します：
+最後に実行します:
 
 ``` bash
 npm test

From a3ab0cd412cda1d557371bbc6bf6a47c9f6c9777 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 9 Apr 2017 01:56:09 +0900
Subject: [PATCH 578/877] add issue template (#767)

---
 .github/ISSUE_TEMPLATE.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..bd0e4f286
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
+<!--
+IMPORTANT: Please use the following link to create a new issue:
+
+  https://new-issue.vuejs.org/?repo=vuejs/vue-loader
+
+If your issue was not created using the app above, it will be closed immediately.
+-->

From faf6919b612c98f36d9f63cb41e406d554c3b55d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Apr 2017 15:30:09 +0800
Subject: [PATCH 579/877] save

---
 lib/component-normalizer.js | 35 +++++++++++++++++++++++------------
 lib/loader.js               | 36 +++++++++++++++++-------------------
 test/test.js                | 20 +++++++++++++-------
 3 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 2a72a28ba..15f207acb 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -4,8 +4,8 @@
 module.exports = function normalizeComponent (
   rawScriptExports,
   compiledTemplate,
-  scopeId,
-  cssModules
+  injectStyles,
+  scopeId
 ) {
   var esModule
   var scriptExports = rawScriptExports = rawScriptExports || {}
@@ -28,21 +28,32 @@ module.exports = function normalizeComponent (
     options.staticRenderFns = compiledTemplate.staticRenderFns
   }
 
+  if (injectStyles) {
+    var injected = false
+    var cssModules
+    var inject = function () {
+      if (!injected) {
+        injected = true
+        cssModules = injectStyles()
+      }
+      // inject cssModules
+      if (cssModules) {
+        for (var key in cssModules) {
+          this[key] = cssModules[key]
+        }
+      }
+    }
+    var existing = options.beforeCreate
+    options.beforeCreate = existing
+      ? [].concat(existing, inject)
+      : [inject]
+  }
+
   // scopedId
   if (scopeId) {
     options._scopeId = scopeId
   }
 
-  // inject cssModules
-  if (cssModules) {
-    var computed = Object.create(options.computed || null)
-    Object.keys(cssModules).forEach(function (key) {
-      var module = cssModules[key]
-      computed[key] = function () { return module }
-    })
-    options.computed = computed
-  }
-
   return {
     esModule: esModule,
     exports: scriptExports,
diff --git a/lib/loader.js b/lib/loader.js
index 9b47464ed..45db43ee8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -286,7 +286,7 @@ module.exports = function (content) {
 
   // add requires for styles
   if (parts.styles.length) {
-    output += '\n/* styles */\n'
+    var styleInjectionCode = 'function __injectVueStyle__ () {\n'
     var hasModules = false
     parts.styles.forEach(function (style, i) {
       // require style
@@ -302,11 +302,11 @@ module.exports = function (content) {
         }
         if (!hasModules) {
           hasModules = true
-          output += 'var cssModules = {}\n'
+          styleInjectionCode += 'var cssModules = {}\n'
         }
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
-          output += requireString
+          styleInjectionCode += requireString
         } else {
           cssModules[moduleName] = true
 
@@ -317,21 +317,25 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          output += 'cssModules["' + moduleName + '"] = ' + requireString + '\n'
+          styleInjectionCode += 'cssModules["' + moduleName + '"] = ' + requireString + '\n'
         }
       } else {
-        output += requireString + '\n'
+        styleInjectionCode += requireString + '\n'
       }
     })
-    output += '\n'
+    if (hasModules) {
+      styleInjectionCode += `return cssModules`
+    }
+    styleInjectionCode += '}\n'
+    output += styleInjectionCode
   }
 
   // we require the component normalizer function, and call it like so:
   // normalizeComponent(
   //   scriptExports,
   //   compiledTemplate,
-  //   scopeId,
-  //   cssModules
+  //   injectStyles,
+  //   scopeId
   // )
   output += 'var Component = require(' +
     loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
@@ -365,19 +369,13 @@ module.exports = function (content) {
   }
   output += ',\n'
 
+  // style
+  output += '  /* styles */\n  '
+  output += (parts.styles.length ? '__injectVueStyle__' : 'null') + ',\n'
+
   // scopeId
   output += '  /* scopeId */\n  '
-  output += (hasScoped ? JSON.stringify(moduleId) : 'null') + ',\n'
-
-  // cssModules
-  output += '  /* cssModules */\n  '
-  if (cssModules) {
-    // inject style modules as computed properties
-    output += 'cssModules'
-  } else {
-    output += 'null'
-  }
-  output += '\n'
+  output += (hasScoped ? JSON.stringify(moduleId) : 'null') + '\n'
 
   // close normalizeComponent call
   output += ')\n'
diff --git a/test/test.js b/test/test.js
index 5e71b4438..f42da6311 100644
--- a/test/test.js
+++ b/test/test.js
@@ -72,7 +72,12 @@ function test (options, assert) {
           console.log(err[0].data.error.stack)
           expect(err).to.be.null
         }
-        assert(window, interopDefault(window.vueModule), window.vueModule)
+        const module = interopDefault(window.vueModule)
+        const instance = {}
+        if (module.beforeCreate) {
+          module.beforeCreate.call(instance)
+        }
+        assert(window, module, window.vueModule, instance)
       }
     })
   })
@@ -458,11 +463,9 @@ describe('vue-loader', function () {
             localIdentName: localIdentName
           }
         }
-      }, (window) => {
-        var module = window.vueModule
-
+      }, (window, module, raw, instance) => {
         // get local class name
-        var className = module.computed.style().red
+        var className = instance.style.red
         expect(className).to.match(regexToMatch)
 
         // class name in style
@@ -480,7 +483,7 @@ describe('vue-loader', function () {
         expect(style).to.contain('animation: ' + animationName + ' 1s;')
 
         // default module + pre-processor + scoped
-        var anotherClassName = module.computed.$style().red
+        var anotherClassName = instance.$style.red
         expect(anotherClassName).to.match(regexToMatch).and.not.equal(className)
         var id = 'data-v-' + hash('vue-loader/test/fixtures/css-modules.vue')
         expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
@@ -514,7 +517,10 @@ describe('vue-loader', function () {
       }
 
       var output = requireFromString(code, './test.build.js')
-      expect(output.computed.style().red).to.exist
+      var mockInstance = {}
+
+      output.beforeCreate.call(mockInstance)
+      expect(mockInstance.style.red).to.exist
 
       done()
     })

From 66f21779789ae4f544e489e5cb745b66e3d74e74 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Apr 2017 15:32:15 +0800
Subject: [PATCH 580/877] fix tests

---
 test/test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test.js b/test/test.js
index f42da6311..a85911007 100644
--- a/test/test.js
+++ b/test/test.js
@@ -74,8 +74,8 @@ function test (options, assert) {
         }
         const module = interopDefault(window.vueModule)
         const instance = {}
-        if (module.beforeCreate) {
-          module.beforeCreate.call(instance)
+        if (module && module.beforeCreate) {
+          module.beforeCreate.forEach(hook => hook.call(instance))
         }
         assert(window, module, window.vueModule, instance)
       }
@@ -519,7 +519,7 @@ describe('vue-loader', function () {
       var output = requireFromString(code, './test.build.js')
       var mockInstance = {}
 
-      output.beforeCreate.call(mockInstance)
+      output.beforeCreate.forEach(hook => hook.call(mockInstance))
       expect(mockInstance.style.red).to.exist
 
       done()

From 98e69d559afea20329491da7fd0f44c2c3bd97f5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 11 Apr 2017 21:53:57 +0800
Subject: [PATCH 581/877] simplify cssModules injection

---
 lib/component-normalizer.js | 18 ++----------------
 lib/loader.js               | 30 ++----------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 15f207acb..b86d41219 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -29,24 +29,10 @@ module.exports = function normalizeComponent (
   }
 
   if (injectStyles) {
-    var injected = false
-    var cssModules
-    var inject = function () {
-      if (!injected) {
-        injected = true
-        cssModules = injectStyles()
-      }
-      // inject cssModules
-      if (cssModules) {
-        for (var key in cssModules) {
-          this[key] = cssModules[key]
-        }
-      }
-    }
     var existing = options.beforeCreate
     options.beforeCreate = existing
-      ? [].concat(existing, inject)
-      : [inject]
+      ? [].concat(existing, injectStyles)
+      : [injectStyles]
   }
 
   // scopedId
diff --git a/lib/loader.js b/lib/loader.js
index 45db43ee8..ab55875f8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -281,13 +281,10 @@ module.exports = function (content) {
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
 
-  // css modules
-  var cssModules
-
   // add requires for styles
   if (parts.styles.length) {
     var styleInjectionCode = 'function __injectVueStyle__ () {\n'
-    var hasModules = false
+    var cssModules = {}
     parts.styles.forEach(function (style, i) {
       // require style
       var requireString = style.src
@@ -297,13 +294,6 @@ module.exports = function (content) {
       var moduleName = (style.module === true) ? '$style' : style.module
       // setCssModule
       if (moduleName) {
-        if (!cssModules) {
-          cssModules = {}
-        }
-        if (!hasModules) {
-          hasModules = true
-          styleInjectionCode += 'var cssModules = {}\n'
-        }
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
           styleInjectionCode += requireString
@@ -317,15 +307,12 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          styleInjectionCode += 'cssModules["' + moduleName + '"] = ' + requireString + '\n'
+          styleInjectionCode += 'this["' + moduleName + '"] = ' + requireString + '\n'
         }
       } else {
         styleInjectionCode += requireString + '\n'
       }
     })
-    if (hasModules) {
-      styleInjectionCode += `return cssModules`
-    }
     styleInjectionCode += '}\n'
     output += styleInjectionCode
   }
@@ -449,22 +436,9 @@ module.exports = function (content) {
         '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
         '  } else {\n'
       // update
-      if (cssModules) {
-        output +=
-        '    if (module.hot.data.cssModules && JSON.stringify(module.hot.data.cssModules) !== JSON.stringify(cssModules)) {\n' +
-        '      delete Component.options._Ctor\n' +
-        '    }\n'
-      }
       output +=
         '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
         '  }\n'
-      if (cssModules) {
-        // save cssModules
-        output +=
-        '  module.hot.dispose(function (data) {\n' +
-        '    data.cssModules = cssModules\n' +
-        '  })\n'
-      }
       output += '})()}\n'
     }
     // final export

From a29681e0e1b9721dee6682b730c3882690a4e010 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 00:08:51 +0800
Subject: [PATCH 582/877] update ssr style injection strategy

---
 lib/component-normalizer.js |  3 +++
 lib/loader.js               | 19 ++++++++++++++-----
 package.json                |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index b86d41219..c9251cfa0 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -33,6 +33,9 @@ module.exports = function normalizeComponent (
     options.beforeCreate = existing
       ? [].concat(existing, injectStyles)
       : [injectStyles]
+    // used by ssr in case component is cached and beforeCreate
+    // never gets called
+    options._injectStyles = injectStyles
   }
 
   // scopedId
diff --git a/lib/loader.js b/lib/loader.js
index ab55875f8..2dc3ec7ba 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -283,7 +283,8 @@ module.exports = function (content) {
 
   // add requires for styles
   if (parts.styles.length) {
-    var styleInjectionCode = 'function __injectVueStyle__ () {\n'
+    var styleInjectionCode =
+      'function __injectVueStyle__ () {\n'
     var cssModules = {}
     parts.styles.forEach(function (style, i) {
       // require style
@@ -291,26 +292,34 @@ module.exports = function (content) {
         ? getRequireForImport('styles', style, style.scoped)
         : getRequire('styles', style, i, style.scoped)
 
+      var hasStyleLoader = requireString.indexOf('style-loader') > -1
+      var hasVueStyleLoader = requireString.indexOf('vue-style-loader') > -1
+      // vue-style-loader exposes inject functions during SSR so they are
+      // always called
+      var invokeStyle = isServer && hasVueStyleLoader
+        ? code => `;(${code}).__inject__()`
+        : code => code
+
       var moduleName = (style.module === true) ? '$style' : style.module
       // setCssModule
       if (moduleName) {
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
-          styleInjectionCode += requireString
+          styleInjectionCode += invokeStyle(requireString) + '\n'
         } else {
           cssModules[moduleName] = true
 
           // `(vue-)style-loader` exposes the name-to-hash map directly
           // `css-loader` exposes it in `.locals`
           // add `.locals` if the user configured to not use style-loader.
-          if (requireString.indexOf('style-loader') < 0) {
+          if (!hasStyleLoader) {
             requireString += '.locals'
           }
 
-          styleInjectionCode += 'this["' + moduleName + '"] = ' + requireString + '\n'
+          styleInjectionCode += invokeStyle('this["' + moduleName + '"] = ' + requireString) + '\n'
         }
       } else {
-        styleInjectionCode += requireString + '\n'
+        styleInjectionCode += invokeStyle(requireString) + '\n'
       }
     })
     styleInjectionCode += '}\n'
diff --git a/package.json b/package.json
index 591992761..0c2f49e98 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.0.11",
-    "vue-style-loader": "^2.0.0",
+    "vue-style-loader": "^3.0.0",
     "vue-template-es2015-compiler": "^1.2.2"
   },
   "peerDependencies": {

From fe3e3ab75f5bf43c0eca58f1906aee5cb514723d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 16:29:15 +0800
Subject: [PATCH 583/877] adjust style injection calling by taking context as
 argument

---
 lib/component-normalizer.js | 31 +++++++++++++++++++++----------
 lib/loader.js               | 10 +++++-----
 test/test.js                |  4 +++-
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index c9251cfa0..40ed3b0f2 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -1,3 +1,5 @@
+/* globals __VUE_SSR_CONTEXT__ */
+
 // this module is a runtime utility for cleaner component module output and will
 // be included in the final webpack user bundle
 
@@ -28,21 +30,30 @@ module.exports = function normalizeComponent (
     options.staticRenderFns = compiledTemplate.staticRenderFns
   }
 
-  if (injectStyles) {
-    var existing = options.beforeCreate
-    options.beforeCreate = existing
-      ? [].concat(existing, injectStyles)
-      : [injectStyles]
-    // used by ssr in case component is cached and beforeCreate
-    // never gets called
-    options._injectStyles = injectStyles
-  }
-
   // scopedId
   if (scopeId) {
     options._scopeId = scopeId
   }
 
+  var existing = options.beforeCreate
+  var registerComponent = function (context) {
+    if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
+      context = __VUE_SSR_CONTEXT__
+    }
+    if (injectStyles) {
+      injectStyles(this, context)
+    }
+  }
+
+  // inject component registration as beforeCreate hook
+  options.beforeCreate = existing
+    ? [].concat(existing, registerComponent)
+    : [registerComponent]
+
+  // used by ssr in case component is cached and beforeCreate
+  // never gets called
+  options._ssrRegister = registerComponent
+
   return {
     esModule: esModule,
     exports: scriptExports,
diff --git a/lib/loader.js b/lib/loader.js
index 2dc3ec7ba..781359c6e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -18,12 +18,12 @@ var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 var hasBabel = false
 try {
-  hasBabel = !!require('babel-loader')
+  hasBabel = !!require(normalize.dep('babel-loader'))
 } catch (e) {}
 
 var hasBuble = false
 try {
-  hasBuble = !!require('buble-loader')
+  hasBuble = !!require(normalize.dep('buble-loader'))
 } catch (e) {}
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
@@ -284,7 +284,7 @@ module.exports = function (content) {
   // add requires for styles
   if (parts.styles.length) {
     var styleInjectionCode =
-      'function __injectVueStyle__ () {\n'
+      'function __injectVueStyle__ (vm, context) {\n'
     var cssModules = {}
     parts.styles.forEach(function (style, i) {
       // require style
@@ -297,7 +297,7 @@ module.exports = function (content) {
       // vue-style-loader exposes inject functions during SSR so they are
       // always called
       var invokeStyle = isServer && hasVueStyleLoader
-        ? code => `;(${code}).__inject__()`
+        ? code => `;(${code}).__inject__(context)`
         : code => code
 
       var moduleName = (style.module === true) ? '$style' : style.module
@@ -316,7 +316,7 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          styleInjectionCode += invokeStyle('this["' + moduleName + '"] = ' + requireString) + '\n'
+          styleInjectionCode += invokeStyle('vm["' + moduleName + '"] = ' + requireString) + '\n'
         }
       } else {
         styleInjectionCode += invokeStyle(requireString) + '\n'
diff --git a/test/test.js b/test/test.js
index a85911007..8f64050fd 100644
--- a/test/test.js
+++ b/test/test.js
@@ -575,7 +575,9 @@ describe('vue-loader', function () {
         rules: [{ test: /\.vue$/, loader: rawLoaderPath }]
       }
     }, code => {
-      const renderer = SSR.createBundleRenderer(code)
+      const renderer = SSR.createBundleRenderer(code, {
+        basedir: __dirname
+      })
       const context = {}
       renderer.renderToString(context, (err, res) => {
         if (err) return done(err)

From 010db3075c0611558bb23b5df6d0ae650e83fbb3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 16:50:16 +0800
Subject: [PATCH 584/877] preserve old client-side behavior

---
 lib/component-normalizer.js | 45 ++++++++++++++++++++++++-------------
 lib/loader.js               | 29 +++++++++++++++---------
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 40ed3b0f2..cce176a1a 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -7,7 +7,8 @@ module.exports = function normalizeComponent (
   rawScriptExports,
   compiledTemplate,
   injectStyles,
-  scopeId
+  scopeId,
+  isServer
 ) {
   var esModule
   var scriptExports = rawScriptExports = rawScriptExports || {}
@@ -35,24 +36,38 @@ module.exports = function normalizeComponent (
     options._scopeId = scopeId
   }
 
-  var existing = options.beforeCreate
-  var registerComponent = function (context) {
-    if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
-      context = __VUE_SSR_CONTEXT__
+  var hook
+  if (isServer) {
+    hook = function (context) {
+      if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
+        context = __VUE_SSR_CONTEXT__
+      }
+      if (injectStyles) {
+        injectStyles(this, context)
+      }
+      // TODO: register module identifier for async chunk inferrence
     }
-    if (injectStyles) {
-      injectStyles(this, context)
+    // used by ssr in case component is cached and beforeCreate
+    // never gets called
+    options._ssrRegister = hook
+  } else if (injectStyles) {
+    var cssModules = injectStyles({})
+    if (cssModules) {
+      hook = function () {
+        for (var key in cssModules) {
+          this[key] = cssModules[key]
+        }
+      }
     }
   }
 
-  // inject component registration as beforeCreate hook
-  options.beforeCreate = existing
-    ? [].concat(existing, registerComponent)
-    : [registerComponent]
-
-  // used by ssr in case component is cached and beforeCreate
-  // never gets called
-  options._ssrRegister = registerComponent
+  if (hook) {
+    // inject component registration as beforeCreate hook
+    var existing = options.beforeCreate
+    options.beforeCreate = existing
+      ? [].concat(existing, hook)
+      : [hook]
+  }
 
   return {
     esModule: esModule,
diff --git a/lib/loader.js b/lib/loader.js
index 781359c6e..52d78746d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -282,10 +282,10 @@ module.exports = function (content) {
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
 
   // add requires for styles
+  var cssModules
   if (parts.styles.length) {
     var styleInjectionCode =
-      'function __injectVueStyle__ (vm, context) {\n'
-    var cssModules = {}
+      'function injectStyle (cssModuleTarget, ssrContext) {\n'
     parts.styles.forEach(function (style, i) {
       // require style
       var requireString = style.src
@@ -297,15 +297,16 @@ module.exports = function (content) {
       // vue-style-loader exposes inject functions during SSR so they are
       // always called
       var invokeStyle = isServer && hasVueStyleLoader
-        ? code => `;(${code}).__inject__(context)`
-        : code => code
+        ? code => `  ;(${code}).__inject__(ssrContext)\n`
+        : code => `  ${code}\n`
 
       var moduleName = (style.module === true) ? '$style' : style.module
       // setCssModule
       if (moduleName) {
+        cssModules = cssModules || {}
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
-          styleInjectionCode += invokeStyle(requireString) + '\n'
+          styleInjectionCode += invokeStyle(requireString)
         } else {
           cssModules[moduleName] = true
 
@@ -316,12 +317,15 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          styleInjectionCode += invokeStyle('vm["' + moduleName + '"] = ' + requireString) + '\n'
+          styleInjectionCode += invokeStyle('cssModuleTarget["' + moduleName + '"] = ' + requireString)
         }
       } else {
-        styleInjectionCode += invokeStyle(requireString) + '\n'
+        styleInjectionCode += invokeStyle(requireString)
       }
     })
+    if (cssModules) {
+      styleInjectionCode += '  return cssModuleTarget\n'
+    }
     styleInjectionCode += '}\n'
     output += styleInjectionCode
   }
@@ -331,7 +335,8 @@ module.exports = function (content) {
   //   scriptExports,
   //   compiledTemplate,
   //   injectStyles,
-  //   scopeId
+  //   scopeId,
+  //   isServer
   // )
   output += 'var Component = require(' +
     loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
@@ -367,11 +372,15 @@ module.exports = function (content) {
 
   // style
   output += '  /* styles */\n  '
-  output += (parts.styles.length ? '__injectVueStyle__' : 'null') + ',\n'
+  output += (parts.styles.length ? 'injectStyle' : 'null') + ',\n'
 
   // scopeId
   output += '  /* scopeId */\n  '
-  output += (hasScoped ? JSON.stringify(moduleId) : 'null') + '\n'
+  output += (hasScoped ? JSON.stringify(moduleId) : 'null') + ',\n'
+
+  // isServer
+  output += '  /* isServer */\n  '
+  output += (isServer ? 'true' : 'false') + '\n'
 
   // close normalizeComponent call
   output += ')\n'

From a93cc3ad84b823929ac4fe17a04a298402faf577 Mon Sep 17 00:00:00 2001
From: Grigoriy Beziuk <me@gbezyuk.ru>
Date: Wed, 12 Apr 2017 16:02:06 +0700
Subject: [PATCH 585/877] Russian Translation Update (#772)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* - Initial commit

* - Добавлен русский в LANGS.md

* - extract-css переведён

* - postcss.md переведён

* - setup.md переведён

* - scoped-css.md частично переведён

* - options.md переведён не до конца

* - es2015.md частичный перевод

* - README.md переведены заголовки

* - advanced.md частичный перевод

* - hot-reload.md переведён

* - pre-processors.md частичный перевод

* - css-modules.md частичный перевод

* - SUMMARY.md

* - options.md

* spec.md

* - es2015.md переведен

* - css-modules.md переведен

* - scoped-css.md переведен

* - advanced.md переведен

* - pre-processor.md частично переведен

* - Мелкая правка в spec.md

* - asset-url частично переведен

* - pre-processors допереведен

* - asset-url переведен

* Translated README.md, testing.md and testing-with-mocks.md (first approach)

* Readme reading fixes

* Fixed 'powerful' translation in README.md and some punctuation in testing-with-mocks.md

* Fixed ndashes in definitions

* Review fixes

* Minor fix for README.md

* Added a paragraph about mocks and replaced "mock" with "mock-object"

* Punctuation fixes for testing-with-mocks.md

* Added translation to production.md

* Translated linting.md

* Removed archaic expression

* - README.md добавлена новая строка (пока не переведено)

* - advanced.md добавленения для конфига Webpack 2

* - spec.md добавлены пользовательские секции vue-файлов

* - extract-css правка версии вебпака

* advanced.md правка версии вебпака + примеров

* - spec.md сокращен раздел о пользовательских блоках

* - Добавлены пользовательские блоки в оглавление

* - custom-blocks.md добавлен и переведен новый раздел

* - custom-block.md обновление к новой версии vue-loader

* - css-modules.md переведён заголовок

* - summary.md приведены ссылок в соответствие с заголовками в файлах

* - extract-css.md Webpack 2 перенесен выше

* - options.md Webpack 2 вынесен в начало. Добавлены упоминания preLoader & postLoaders

* - advanced.md Webpack 2 поставлен раньше.  Добавлены упоминания preLoaders & postLoaders

* - extract-css исправления для extract-text-webpack-plugin второй версии

* - PostCSS.md добавлена секция про поддержку файлов конфигов

* - Доработки по postcss

* - options.md допереведено

* production.md исправлена опечатка в названии плагина

* custom-blocks.md исправлен конфиг примера

* advanced.md добавлен excludedPreLoaders

* custom-blocks.md добавлена секция

* Мелкая правка

* custom-blocks.md уточнение

* Домерж

* custom-blocks.md исправлена опечатка

* Update production.md

* production.md изменена ссылка
---
 docs/ru/workflow/production.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/workflow/production.md b/docs/ru/workflow/production.md
index 4b0103173..e8f3bf3e7 100644
--- a/docs/ru/workflow/production.md
+++ b/docs/ru/workflow/production.md
@@ -3,7 +3,7 @@
 Когда мы собираем финальную версию приложения, мы делаем две вещи:
 
 1. Минифицируем код нашего приложения;
-2. Используем [описанные в руководстве по Vue.js настройки](https://vuejs.org/guide/deployment.html), чтобы устранить все возможные проблемы в коде
+2. Используем [описанные в руководстве по Vue.js настройки](https://ru.vuejs.org/v2/guide/deployment.html), чтобы устранить все возможные проблемы в коде
 
 Вот пример конфигурации:
 
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // оптимизируем идентификаторы модулей по числу использований
+    // только для Webpack 1 – оптимизируем идентификаторы модулей по числу использований
     new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }

From 624e7dadac7496d7e5af1352d650b1ce5d5cf7c5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 17:05:46 +0800
Subject: [PATCH 586/877] revert

---
 lib/loader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 52d78746d..37d3cc91b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -18,12 +18,12 @@ var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 var hasBabel = false
 try {
-  hasBabel = !!require(normalize.dep('babel-loader'))
+  hasBabel = !!require('babel-loader')
 } catch (e) {}
 
 var hasBuble = false
 try {
-  hasBuble = !!require(normalize.dep('buble-loader'))
+  hasBuble = !!require('buble-loader')
 } catch (e) {}
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/

From eb933bff804a143183a093b802d961ecda08b426 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 17:06:23 +0800
Subject: [PATCH 587/877] bump dev deps

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0c2f49e98..542e8c9d1 100644
--- a/package.json
+++ b/package.json
@@ -77,9 +77,9 @@
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
     "url-loader": "^0.5.7",
-    "vue": "^2.1.0",
-    "vue-server-renderer": "^2.1.10",
-    "vue-template-compiler": "^2.1.0",
+    "vue": "^2.3.0",
+    "vue-server-renderer": "^2.3.0",
+    "vue-template-compiler": "^2.3.0",
     "webpack": "^2.2.0"
   }
 }

From 35c9caa8114e25a03f30d5eb91368b77863474cd Mon Sep 17 00:00:00 2001
From: Arliang <arliang725@163.com>
Date: Wed, 12 Apr 2017 17:07:28 +0800
Subject: [PATCH 588/877] Fixed typo (#770)

---
 docs/zh-cn/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 4de8776d2..a6d83424e 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -30,7 +30,7 @@ export default {
 
 `vue-loader` 会解析文件，提取每个语言块，如有必要会通过其它 loaders 处理，最后将他们组装成一个 CommonJS 模块，`module.exports` 出一个 Vue.js 组件对象。
 
-`vue-loader` 支持使用非默认放言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写 style： 
+`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写 style： 
 
 ``` html
 <style lang="sass">

From 9e757ac4a6983ece86f878f080a0955feeb3ed02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Wed, 12 Apr 2017 09:45:25 -0300
Subject: [PATCH 589/877] Add note about OccurrenceOrderPlugin (#773)

---
 docs/pt_BR/workflow/production.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pt_BR/workflow/production.md b/docs/pt_BR/workflow/production.md
index 2f454b8d2..897becb39 100644
--- a/docs/pt_BR/workflow/production.md
+++ b/docs/pt_BR/workflow/production.md
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // Otimizar ids de módulo por contagem de ocorrências
+    // Webpack 1 apenas - otimiza ids de módulo por contagem de ocorrências
     new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
@@ -36,4 +36,4 @@ Obviamente não queremos usar estás configurações durante o desenvolvimento,
 
 2. Ou use dois arquivos de configuração do Webpack separados,  um para o desenvolvimento e outro para produção. E talvez compartilhe algumas opções comuns entre eles em um terceiro arquivo, como mostrado em [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
 
-Isto é com você, desde que o objetivo seja atingido.
\ No newline at end of file
+Isto é com você, desde que o objetivo seja atingido.

From d04629a89ecf13af14c7590bbd88f9604e849a0b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 20:45:55 +0800
Subject: [PATCH 590/877] add marker for vue-style-loader to detect whether a
 request is made by a vue file

---
 lib/loader.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/loader.js b/lib/loader.js
index 37d3cc91b..8a9bd552d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -199,6 +199,8 @@ module.exports = function (content) {
     var styleCompiler = ''
     if (type === 'styles') {
       styleCompiler = styleCompilerPath + '?' + JSON.stringify({
+        // a marker for vue-style-loader to know that this is an import from a vue file
+        vue: true,
         id: moduleId,
         scoped: !!scoped,
         hasInlineConfig: !!query.postcss

From e5a421c249eadd02acce26d709b7b4632026388e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 12 Apr 2017 20:52:41 +0800
Subject: [PATCH 591/877] lazy inject on client

---
 lib/component-normalizer.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index cce176a1a..999c9bb43 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -39,6 +39,7 @@ module.exports = function normalizeComponent (
   var hook
   if (isServer) {
     hook = function (context) {
+      // context is injected if this is a cached call
       if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
         context = __VUE_SSR_CONTEXT__
       }
@@ -51,9 +52,14 @@ module.exports = function normalizeComponent (
     // never gets called
     options._ssrRegister = hook
   } else if (injectStyles) {
-    var cssModules = injectStyles({})
-    if (cssModules) {
-      hook = function () {
+    var injected = false // only need to inject once on the client
+    var cssModules
+    hook = function () {
+      if (!injected) {
+        injected = true
+        cssModules = injectStyles({})
+      }
+      if (cssModules) {
         for (var key in cssModules) {
           this[key] = cssModules[key]
         }

From f49bfa51d4c62aba4587c49fbbb59ea763e7781e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Apr 2017 15:36:42 +0800
Subject: [PATCH 592/877] collect component identifier during render

---
 lib/component-normalizer.js | 10 +++++++---
 lib/loader.js               |  9 +++++----
 test/test.js                |  8 ++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 999c9bb43..f52442e26 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -8,7 +8,7 @@ module.exports = function normalizeComponent (
   compiledTemplate,
   injectStyles,
   scopeId,
-  isServer
+  moduleIdentifier /* server only */
 ) {
   var esModule
   var scriptExports = rawScriptExports = rawScriptExports || {}
@@ -37,16 +37,20 @@ module.exports = function normalizeComponent (
   }
 
   var hook
-  if (isServer) {
+  if (moduleIdentifier) { // server build
     hook = function (context) {
       // context is injected if this is a cached call
       if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
         context = __VUE_SSR_CONTEXT__
       }
+      // inject component styles
       if (injectStyles) {
         injectStyles(this, context)
       }
-      // TODO: register module identifier for async chunk inferrence
+      // register component module identifier for async chunk inferrence
+      if (context && context._registeredComponents) {
+        context._registeredComponents.add(moduleIdentifier)
+      }
     }
     // used by ssr in case component is cached and beforeCreate
     // never gets called
diff --git a/lib/loader.js b/lib/loader.js
index 8a9bd552d..b1434023b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,4 +1,5 @@
 var path = require('path')
+var hash = require('hash-sum')
 var parse = require('./parser')
 var genId = require('./utils/gen-id')
 var normalize = require('./utils/normalize')
@@ -338,7 +339,7 @@ module.exports = function (content) {
   //   compiledTemplate,
   //   injectStyles,
   //   scopeId,
-  //   isServer
+  //   moduleIdentifier (server only)
   // )
   output += 'var Component = require(' +
     loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
@@ -380,9 +381,9 @@ module.exports = function (content) {
   output += '  /* scopeId */\n  '
   output += (hasScoped ? JSON.stringify(moduleId) : 'null') + ',\n'
 
-  // isServer
-  output += '  /* isServer */\n  '
-  output += (isServer ? 'true' : 'false') + '\n'
+  // moduleIdentifier (server only)
+  output += '  /* moduleIdentifier (server only) */\n  '
+  output += (isServer ? JSON.stringify(hash(this.request)) : 'null') + '\n'
 
   // close normalizeComponent call
   output += ')\n'
diff --git a/test/test.js b/test/test.js
index 8f64050fd..08468a9b7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -561,7 +561,7 @@ describe('vue-loader', function () {
     })
   })
 
-  it('SSR style extraction', done => {
+  it('SSR style and moduleId extraction', done => {
     bundle({
       target: 'node',
       entry: './test/fixtures/ssr-style.js',
@@ -578,7 +578,9 @@ describe('vue-loader', function () {
       const renderer = SSR.createBundleRenderer(code, {
         basedir: __dirname
       })
-      const context = {}
+      const context = {
+        _registeredComponents: new Set()
+      }
       renderer.renderToString(context, (err, res) => {
         if (err) return done(err)
         expect(res).to.contain('server-rendered')
@@ -590,6 +592,8 @@ describe('vue-loader', function () {
         expect(context.styles).to.contain('comp-a h2 {\n  color: #f00;')
         // from imported css file
         expect(context.styles).to.contain('h1 { color: red;')
+        // collect component identifiers during render
+        expect(Array.from(context._registeredComponents).length).to.equal(2)
         done()
       })
     })

From e6daf96d69414465adf2c58d1d491e8f14036d18 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Apr 2017 12:38:09 +0800
Subject: [PATCH 593/877] make js default loader check work when npm-linked

---
 lib/loader.js           | 17 ++++++-----------
 lib/utils/has-loader.js | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 lib/utils/has-loader.js

diff --git a/lib/loader.js b/lib/loader.js
index b1434023b..fff078333 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -2,9 +2,10 @@ var path = require('path')
 var hash = require('hash-sum')
 var parse = require('./parser')
 var genId = require('./utils/gen-id')
-var normalize = require('./utils/normalize')
-var loaderUtils = require('loader-utils')
 var querystring = require('querystring')
+var loaderUtils = require('loader-utils')
+var normalize = require('./utils/normalize')
+var hasLoader = require('./utils/has-loader')
 
 // internal lib loaders
 var selectorPath = normalize.lib('selector')
@@ -17,15 +18,9 @@ var componentNormalizerPath = normalize.lib('component-normalizer')
 var styleLoaderPath = normalize.dep('vue-style-loader')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
-var hasBabel = false
-try {
-  hasBabel = !!require('babel-loader')
-} catch (e) {}
-
-var hasBuble = false
-try {
-  hasBuble = !!require('buble-loader')
-} catch (e) {}
+// check whether default js loader exists
+var hasBabel = hasLoader('babel')
+var hasBuble = hasLoader('buble')
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
diff --git a/lib/utils/has-loader.js b/lib/utils/has-loader.js
new file mode 100644
index 000000000..dfeb1e4d4
--- /dev/null
+++ b/lib/utils/has-loader.js
@@ -0,0 +1,15 @@
+var fs = require('fs')
+var path = require('path')
+var cwd = process.cwd()
+
+module.exports = function (loader) {
+  loader += '-loader'
+  var hasLoader = false
+  try {
+    hasLoader = !!require(loader)
+  } catch (e) {}
+  if (!hasLoader) {
+    hasLoader = fs.existsSync(path.resolve(cwd, 'node_modules', loader))
+  }
+  return hasLoader
+}

From 2712ccc2e098749d3084ece642449a7972ecf920 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Apr 2017 17:57:09 +0800
Subject: [PATCH 594/877] improve css modules hot-reload

---
 lib/component-normalizer.js | 16 ++-------
 lib/loader.js               | 69 ++++++++++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index f52442e26..ada182e80 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -45,7 +45,7 @@ module.exports = function normalizeComponent (
       }
       // inject component styles
       if (injectStyles) {
-        injectStyles(this, context)
+        injectStyles.call(this, context)
       }
       // register component module identifier for async chunk inferrence
       if (context && context._registeredComponents) {
@@ -56,19 +56,7 @@ module.exports = function normalizeComponent (
     // never gets called
     options._ssrRegister = hook
   } else if (injectStyles) {
-    var injected = false // only need to inject once on the client
-    var cssModules
-    hook = function () {
-      if (!injected) {
-        injected = true
-        cssModules = injectStyles({})
-      }
-      if (cssModules) {
-        for (var key in cssModules) {
-          this[key] = cssModules[key]
-        }
-      }
-    }
+    hook = injectStyles
   }
 
   if (hook) {
diff --git a/lib/loader.js b/lib/loader.js
index fff078333..027f43177 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -278,12 +278,23 @@ module.exports = function (content) {
   var output = ''
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
+  var needsHotReload = (
+    !isServer &&
+    !isProduction &&
+    (parts.script || parts.template)
+  )
+
+  if (needsHotReload) {
+    output += 'var disposed = false\n'
+  }
 
   // add requires for styles
   var cssModules
   if (parts.styles.length) {
-    var styleInjectionCode =
-      'function injectStyle (cssModuleTarget, ssrContext) {\n'
+    var styleInjectionCode = 'function injectStyle (ssrContext) {\n'
+    if (needsHotReload) {
+      styleInjectionCode += `  if (disposed) return\n`
+    }
     parts.styles.forEach(function (style, i) {
       // require style
       var requireString = style.src
@@ -301,7 +312,12 @@ module.exports = function (content) {
       var moduleName = (style.module === true) ? '$style' : style.module
       // setCssModule
       if (moduleName) {
-        cssModules = cssModules || {}
+        if (!cssModules) {
+          cssModules = {}
+          if (needsHotReload) {
+            output += `var cssModules = {}\n`
+          }
+        }
         if (moduleName in cssModules) {
           loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
           styleInjectionCode += invokeStyle(requireString)
@@ -315,15 +331,36 @@ module.exports = function (content) {
             requireString += '.locals'
           }
 
-          styleInjectionCode += invokeStyle('cssModuleTarget["' + moduleName + '"] = ' + requireString)
+          if (!needsHotReload) {
+            styleInjectionCode += invokeStyle('this["' + moduleName + '"] = ' + requireString)
+          } else {
+            // handle hot reload for CSS modules.
+            // we store the exported locals in an object and proxy to it by
+            // defining getters inside component instances' lifecycle hook.
+            styleInjectionCode +=
+              invokeStyle(`cssModules["${moduleName}"] = ${requireString}`) +
+              `Object.defineProperty(this, "${moduleName}", { get: function () { return cssModules["${moduleName}"] }})\n`
+
+            var requirePath = getRequireString('styles', style, i, style.scoped)
+            output +=
+              `module.hot && module.hot.accept([${requirePath}], function () {\n` +
+              // 1. check if style has been injected
+              `  var oldLocals = cssModules["${moduleName}"]\n` +
+              `  if (!oldLocals) return\n` +
+              // 2. re-import (side effect: updates the <style>)
+              `  var newLocals = ${requireString}\n` +
+              // 3. compare new and old locals to see if selectors changed
+              `  if (JSON.stringify(newLocals) === JSON.stringify(oldLocals)) return\n` +
+              // 4. locals changed. Update and force re-render.
+              `  cssModules["${moduleName}"] = newLocals\n` +
+              `  require("${hotReloadAPIPath}").rerender("${moduleId}")\n` +
+              `})\n`
+          }
         }
       } else {
         styleInjectionCode += invokeStyle(requireString)
       }
     })
-    if (cssModules) {
-      styleInjectionCode += '  return cssModuleTarget\n'
-    }
     styleInjectionCode += '}\n'
     output += styleInjectionCode
   }
@@ -435,11 +472,7 @@ module.exports = function (content) {
 
   if (!query.inject) {
     // hot reload
-    if (
-      !isServer &&
-      !isProduction &&
-      (parts.script || parts.template)
-    ) {
+    if (needsHotReload) {
       output +=
         '\n/* hot reload */\n' +
         'if (module.hot) {(function () {\n' +
@@ -452,9 +485,21 @@ module.exports = function (content) {
         '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
         '  } else {\n'
       // update
+      if (cssModules) {
+        output +=
+        '    if (module.hot.data.cssModules && Object.keys(module.hot.data.cssModules) !== Object.keys(cssModules)) {\n' +
+        '      delete Component.options._Ctor\n' +
+        '    }\n'
+      }
       output +=
         '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
         '  }\n'
+      // dispose
+      output +=
+        '  module.hot.dispose(function (data) {\n' +
+        (cssModules ? '    data.cssModules = cssModules\n' : '') +
+        '    disposed = true\n' +
+        '  })\n'
       output += '})()}\n'
     }
     // final export

From 24812a8b3afa0ad74f143283dbe30eb12be7471d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 17 Apr 2017 17:58:01 +0800
Subject: [PATCH 595/877] bump hot-reload-api version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 542e8c9d1..61bea43a8 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "source-map": "^0.5.6",
-    "vue-hot-reload-api": "^2.0.11",
+    "vue-hot-reload-api": "^2.1.0",
     "vue-style-loader": "^3.0.0",
     "vue-template-es2015-compiler": "^1.2.2"
   },

From 48dbdb4c9d1758ecbd3bef8729191120b30f88b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Mon, 17 Apr 2017 12:12:33 +0200
Subject: [PATCH 596/877] Docs: scoped uses data attribtute (fix #419)

---
 docs/en/features/scoped-css.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/features/scoped-css.md b/docs/en/features/scoped-css.md
index 4a1f19709..4bcf398ff 100644
--- a/docs/en/features/scoped-css.md
+++ b/docs/en/features/scoped-css.md
@@ -18,13 +18,13 @@ Into the following:
 
 ``` html
 <style>
-.example[_v-f3f3eg9] {
+.example[data-v-f3f3eg9] {
   color: red;
 }
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>hi</div>
+  <div class="example" data-v-f3f3eg9>hi</div>
 </template>
 ```
 

From 51e738077f145c2249eb4f395372944826e4efbc Mon Sep 17 00:00:00 2001
From: kiwidan92 <kiwidan92@gmail.com>
Date: Thu, 20 Apr 2017 12:33:57 +1200
Subject: [PATCH 597/877] Fix typo (#782)

---
 docs/en/configurations/advanced.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 17aa63da7..2a4a33b2e 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -1,6 +1,6 @@
 # Advanced Loader Configuration
 
-Sometimes the you may want to:
+Sometimes you may want to:
 
 1. Apply a custom loader string to a language instead of letting `vue-loader` infer it;
 

From 649f219148906291beb30fce6c2499ae3a6e3f0f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 20 Apr 2017 13:15:41 +0800
Subject: [PATCH 598/877] use better context injection for 2.3

---
 lib/component-normalizer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index ada182e80..9a97239dd 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -39,7 +39,9 @@ module.exports = function normalizeComponent (
   var hook
   if (moduleIdentifier) { // server build
     hook = function (context) {
-      // context is injected if this is a cached call
+      // 2.3 injection
+      context = context || (this.$vnode && this.$vnode.ssrContext)
+      // 2.2 with runInNewContext: true
       if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
         context = __VUE_SSR_CONTEXT__
       }

From 5346db27f858ef8f331826695ddeb1ba10135439 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 23 Apr 2017 21:48:04 +0800
Subject: [PATCH 599/877] only inject when __inject__ is exposed (e.g. when
 used with extract-text-webpack-plugin)

---
 lib/loader.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 027f43177..8fb0d0423 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -295,6 +295,9 @@ module.exports = function (content) {
     if (needsHotReload) {
       styleInjectionCode += `  if (disposed) return\n`
     }
+    if (isServer) {
+      styleInjectionCode += `var i\n`
+    }
     parts.styles.forEach(function (style, i) {
       // require style
       var requireString = style.src
@@ -306,7 +309,7 @@ module.exports = function (content) {
       // vue-style-loader exposes inject functions during SSR so they are
       // always called
       var invokeStyle = isServer && hasVueStyleLoader
-        ? code => `  ;(${code}).__inject__(ssrContext)\n`
+        ? code => `;(i=${code},i.__inject__&&i.__inject__(ssrContext),i)\n`
         : code => `  ${code}\n`
 
       var moduleName = (style.module === true) ? '$style' : style.module

From 205294ce89337ebb58fa1ed33eabf617ab3ee466 Mon Sep 17 00:00:00 2001
From: Carson <huguangju@users.noreply.github.com>
Date: Tue, 25 Apr 2017 13:00:03 +0800
Subject: [PATCH 600/877] add Chinese translation link (#787)

---
 docs/LANGS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/LANGS.md b/docs/LANGS.md
index 4e23e5549..e8bff3d04 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -3,3 +3,4 @@
 * [Русский](ru/)
 * [Português](pt_BR/)
 * [日本語](ja/)
+* [中文](zh-cn/)

From e56ef6173cbf16c0375adae442b0785ed39cf37f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 25 Apr 2017 15:22:53 +0800
Subject: [PATCH 601/877] built-in support for CSS extraction with extractCSS
 option

---
 lib/loader.js            | 50 +++++++++++++++++++++++++++++++++++-----
 lib/utils/has-loader.js  | 15 ------------
 lib/utils/try-require.js | 16 +++++++++++++
 3 files changed, 60 insertions(+), 21 deletions(-)
 delete mode 100644 lib/utils/has-loader.js
 create mode 100644 lib/utils/try-require.js

diff --git a/lib/loader.js b/lib/loader.js
index 8fb0d0423..f6df21907 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -5,7 +5,7 @@ var genId = require('./utils/gen-id')
 var querystring = require('querystring')
 var loaderUtils = require('loader-utils')
 var normalize = require('./utils/normalize')
-var hasLoader = require('./utils/has-loader')
+var tryRequire = require('./utils/try-require')
 
 // internal lib loaders
 var selectorPath = normalize.lib('selector')
@@ -19,8 +19,8 @@ var styleLoaderPath = normalize.dep('vue-style-loader')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 // check whether default js loader exists
-var hasBabel = hasLoader('babel')
-var hasBuble = hasLoader('buble')
+var hasBabel = !!tryRequire('babel-loader')
+var hasBuble = !!tryRequire('buble-loader')
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
@@ -83,7 +83,9 @@ module.exports = function (content) {
 
   var defaultLoaders = {
     html: templateCompilerPath + templateCompilerOptions,
-    css: styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
+    css: options.extractCSS
+      ? getCSSExtractLoader()
+      : styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
     js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
   }
 
@@ -190,10 +192,10 @@ module.exports = function (content) {
 
   function getRawLoaderString (type, part, index, scoped) {
     var lang = part.lang || defaultLang[type]
-    var loader = loaders[lang]
 
     var styleCompiler = ''
     if (type === 'styles') {
+      // style compiler that needs to be applied for all styles
       styleCompiler = styleCompilerPath + '?' + JSON.stringify({
         // a marker for vue-style-loader to know that this is an import from a vue file
         vue: true,
@@ -201,8 +203,18 @@ module.exports = function (content) {
         scoped: !!scoped,
         hasInlineConfig: !!query.postcss
       }) + '!'
+      // normalize scss/sass
+      if (lang === 'sass') {
+        lang = 'sass?indentedSyntax'
+      } else if (lang === 'scss') {
+        lang = 'sass'
+      }
     }
 
+    var loader = options.extractCSS
+      ? loaders[lang] || getCSSExtractLoader(lang)
+      : loaders[lang]
+
     var injectString = (type === 'script' && query.inject)
       ? 'inject-loader!'
       : ''
@@ -252,7 +264,7 @@ module.exports = function (content) {
 
   // sass => sass-loader
   // sass-loader => sass-loader
-  // sass?indentedsyntax!css => sass-loader?indentedSyntax!css-loader
+  // sass?indentedSyntax!css => sass-loader?indentedSyntax!css-loader
   function ensureLoader (lang) {
     return lang.split('!').map(function (loader) {
       return loader.replace(/^([\w-]+)(\?.*)?/, function (_, name, query) {
@@ -275,6 +287,32 @@ module.exports = function (content) {
     }
   }
 
+  function getCSSExtractLoader (lang) {
+    var extract
+    var op = options.extractCSS
+    // extractCSS option is an instance of ExtractTextPlugin
+    if (typeof op.extract === 'function') {
+      extract = op.extract
+    } else {
+      var plugin = tryRequire('extract-text-webpack-plugin')
+      if (!plugin) {
+        throw new Error(
+          '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
+          'as a peer dependency.'
+        )
+      } else {
+        extract = plugin.extract
+      }
+    }
+    var langLoader = lang
+      ? ensureBang(ensureLoader(lang))
+      : ''
+    return extract({
+      use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
+      fallback: 'vue-style-loader'
+    })
+  }
+
   var output = ''
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
diff --git a/lib/utils/has-loader.js b/lib/utils/has-loader.js
deleted file mode 100644
index dfeb1e4d4..000000000
--- a/lib/utils/has-loader.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var fs = require('fs')
-var path = require('path')
-var cwd = process.cwd()
-
-module.exports = function (loader) {
-  loader += '-loader'
-  var hasLoader = false
-  try {
-    hasLoader = !!require(loader)
-  } catch (e) {}
-  if (!hasLoader) {
-    hasLoader = fs.existsSync(path.resolve(cwd, 'node_modules', loader))
-  }
-  return hasLoader
-}
diff --git a/lib/utils/try-require.js b/lib/utils/try-require.js
new file mode 100644
index 000000000..aa22c2337
--- /dev/null
+++ b/lib/utils/try-require.js
@@ -0,0 +1,16 @@
+var fs = require('fs')
+var path = require('path')
+var cwd = process.cwd()
+
+// attempts to first require a dep using projects cwd (when vue-loader is linked)
+// then try a normal require.
+module.exports = function tryRequire (dep) {
+  var cwdPath = path.resolve(cwd, 'node_modules', dep)
+  if (fs.existsSync(cwdPath)) {
+    return require(cwdPath)
+  } else {
+    try {
+      return require(dep)
+    } catch (e) {}
+  }
+}

From d715da398c67bb4eb2572296fdf8bf3f2af33b11 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 25 Apr 2017 15:26:15 +0800
Subject: [PATCH 602/877] tests for extractCSS option

---
 lib/loader.js | 12 +++++-------
 test/test.js  | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index f6df21907..6019d9ea5 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -288,26 +288,24 @@ module.exports = function (content) {
   }
 
   function getCSSExtractLoader (lang) {
-    var extract
+    var extractor
     var op = options.extractCSS
     // extractCSS option is an instance of ExtractTextPlugin
     if (typeof op.extract === 'function') {
-      extract = op.extract
+      extractor = op
     } else {
-      var plugin = tryRequire('extract-text-webpack-plugin')
-      if (!plugin) {
+      extractor = tryRequire('extract-text-webpack-plugin')
+      if (!extractor) {
         throw new Error(
           '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
           'as a peer dependency.'
         )
-      } else {
-        extract = plugin.extract
       }
     }
     var langLoader = lang
       ? ensureBang(ensureLoader(lang))
       : ''
-    return extract({
+    return extractor.extract({
       use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
       fallback: 'vue-style-loader'
     })
diff --git a/test/test.js b/test/test.js
index 08468a9b7..9ca17de66 100644
--- a/test/test.js
+++ b/test/test.js
@@ -293,6 +293,41 @@ describe('vue-loader', function () {
     })
   })
 
+  it('extract CSS using option', done => {
+    bundle({
+      entry: './test/fixtures/extract-css.vue',
+      vue: {
+        extractCSS: true
+      },
+      plugins: [
+        new ExtractTextPlugin('test.output.css')
+      ]
+    }, (code, warnings) => {
+      var css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+      done()
+    })
+  })
+
+  it('extract CSS using option (passing plugin instance)', done => {
+    const plugin = new ExtractTextPlugin('test.output.css')
+    bundle({
+      entry: './test/fixtures/extract-css.vue',
+      vue: {
+        extractCSS: plugin
+      },
+      plugins: [
+        plugin
+      ]
+    }, (code, warnings) => {
+      var css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+      done()
+    })
+  })
+
   it('dependency injection', done => {
     test({
       entry: './test/fixtures/inject.js'

From c8dfac1cf685756561515cf6912482f7f75e0b84 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 26 Apr 2017 17:00:29 +0800
Subject: [PATCH 603/877] use resolve for even more robust dep checking

---
 lib/utils/try-require.js |   12 +-
 package.json             |    1 +
 yarn.lock                | 4348 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 4356 insertions(+), 5 deletions(-)
 create mode 100644 yarn.lock

diff --git a/lib/utils/try-require.js b/lib/utils/try-require.js
index aa22c2337..ccc3f4de5 100644
--- a/lib/utils/try-require.js
+++ b/lib/utils/try-require.js
@@ -1,13 +1,15 @@
-var fs = require('fs')
-var path = require('path')
 var cwd = process.cwd()
+var resolve = require('resolve')
 
 // attempts to first require a dep using projects cwd (when vue-loader is linked)
 // then try a normal require.
 module.exports = function tryRequire (dep) {
-  var cwdPath = path.resolve(cwd, 'node_modules', dep)
-  if (fs.existsSync(cwdPath)) {
-    return require(cwdPath)
+  var fromCwd
+  try {
+    fromCwd = resolve.sync(dep, { basedir: cwd })
+  } catch (e) {}
+  if (fromCwd) {
+    return require(fromCwd)
   } else {
     try {
       return require(dep)
diff --git a/package.json b/package.json
index 61bea43a8..c341f45bb 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "postcss": "^5.0.21",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
+    "resolve": "^1.3.3",
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.1.0",
     "vue-style-loader": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..42144c822
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4348 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abab@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+
+abbrev@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  dependencies:
+    acorn "^4.0.3"
+
+acorn-globals@^3.0.0, acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
+
+acorn@^5.0.0, acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+
+ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+
+ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.7"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  dependencies:
+    arrify "^1.0.0"
+    micromatch "^2.1.5"
+
+aproba@^1.0.3:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+array.prototype.find@^2.0.1:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+asn1.js@^4.0.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+assertion-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async@^2.1.2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
+  dependencies:
+    lodash "^4.14.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws4@^1.2.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  dependencies:
+    chalk "^1.1.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+babel-core@^6.24.1, babel-core@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.24.1"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
+babel-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    lodash "^4.2.0"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    lodash "^4.2.0"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^6.2.4:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+  dependencies:
+    find-cache-dir "^0.1.1"
+    loader-utils "^0.2.16"
+    mkdirp "^0.5.1"
+    object-assign "^4.0.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+    lodash "^4.2.0"
+
+babel-plugin-transform-es2015-classes@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-regenerator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
+  dependencies:
+    regenerator-transform "0.9.11"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-preset-es2015@^6.6.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.24.1"
+    babel-plugin-transform-es2015-classes "^6.24.1"
+    babel-plugin-transform-es2015-computed-properties "^6.24.1"
+    babel-plugin-transform-es2015-destructuring "^6.22.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
+    babel-plugin-transform-es2015-for-of "^6.22.0"
+    babel-plugin-transform-es2015-function-name "^6.24.1"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-umd "^6.24.1"
+    babel-plugin-transform-es2015-object-super "^6.24.1"
+    babel-plugin-transform-es2015-parameters "^6.24.1"
+    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
+    babel-plugin-transform-regenerator "^6.24.1"
+
+babel-register@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
+  dependencies:
+    babel-core "^6.24.1"
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.2"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
+babel-template@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+    babylon "^6.11.0"
+    lodash "^4.2.0"
+
+babel-traverse@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    babylon "^6.15.0"
+    debug "^2.2.0"
+    globals "^9.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+babel-types@^6.19.0, babel-types@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+  dependencies:
+    babel-runtime "^6.22.0"
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^1.0.1"
+
+babylon@^6.11.0, babylon@^6.15.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
+
+balanced-match@^0.4.1, balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+base64-js@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+big.js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
+
+binary-extensions@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+bluebird@^3.0.5, bluebird@^3.1.1:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.6"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+brace-expansion@^1.0.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
+browser-stdout@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
+  dependencies:
+    buffer-xor "^1.0.2"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  dependencies:
+    pako "~0.2.0"
+
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
+buffer-shims@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+buffer-xor@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000662"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000662.tgz#616b17a525b52fec14611f88af3d5a9b5438c050"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chai@^3.0.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+  dependencies:
+    assertion-error "^1.0.1"
+    deep-eql "^0.1.3"
+    type-detect "^1.0.0"
+
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+character-parser@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  dependencies:
+    is-regex "^1.0.3"
+
+chokidar@^1.4.3:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  dependencies:
+    inherits "^2.0.1"
+
+circular-json@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+
+clap@^1.0.9:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  dependencies:
+    chalk "^1.1.3"
+
+clean-css@^3.3.0:
+  version "3.4.25"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.25.tgz#9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+cli-cursor@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-width@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+coa@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
+  dependencies:
+    q "^1.1.2"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+coffee-loader@^0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.7.3.tgz#fadbc6efd6fc7ecc88c5b3046a2c292066bcb54a"
+  dependencies:
+    loader-utils "^1.0.2"
+
+coffee-script@^1.10.0:
+  version "1.12.5"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346"
+
+color-convert@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@2.9.0, commander@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+config-chain@~1.1.5:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+consolidate@^0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
+  dependencies:
+    bluebird "^3.1.1"
+
+constantinople@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
+  dependencies:
+    acorn "^3.1.0"
+    is-expression "^2.0.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
+content-type-parser@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
+
+convert-source-map@^1.1.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+
+core-js@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.2.tgz#c43ae86d238f08f1728a345ed60ceb0aef63c060"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    json-parse-helpfulerror "^1.0.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    require-from-string "^1.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.2.tgz#51210062d7bb7479f6c65bb41a92208b1d61abad"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    ripemd160 "^1.0.0"
+    sha.js "^2.3.6"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.4.tgz#d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"
+  dependencies:
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+crypto-browserify@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+
+css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+
+css-loader@^0.26.0:
+  version "0.26.4"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.4.tgz#b61e9e30db94303e6ffc892f10ecd09ad025a1fd"
+  dependencies:
+    babel-code-frame "^6.11.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano ">=2.6.1 <4"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.0.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.0.0"
+    postcss-modules-local-by-default "^1.0.1"
+    postcss-modules-scope "^1.0.0"
+    postcss-modules-values "^1.1.0"
+    source-list-map "^0.1.7"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+
+css-selector-tokenizer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+"cssnano@>=2.6.1 <4":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
+de-indent@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+
+debug@*, debug@^2.1.1, debug@^2.2.0:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
+  dependencies:
+    ms "0.7.3"
+
+debug@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
+  dependencies:
+    ms "0.7.2"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-eql@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+  dependencies:
+    type-detect "0.1.1"
+
+deep-extend@~0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+define-properties@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+diff@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+
+diffie-hellman@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+doctrine@^1.2.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+domain-browser@^1.1.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+editorconfig@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
+  dependencies:
+    bluebird "^3.0.5"
+    commander "^2.9.0"
+    lru-cache "^3.2.0"
+    sigmund "^1.0.1"
+
+electron-to-chromium@^1.2.7:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.8.tgz#b2c8a2c79bb89fbbfd3724d9555e15095b5f5fb6"
+
+elliptic@^6.0.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+enhanced-resolve@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    object-assign "^4.0.1"
+    tapable "^0.2.5"
+
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  dependencies:
+    prr "~0.0.0"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.0"
+    is-callable "^1.1.3"
+    is-regex "^1.0.3"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.15"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
+  dependencies:
+    es6-iterator "2"
+    es6-symbol "~3.1"
+
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-symbol "^3.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  dependencies:
+    esprima "^2.7.1"
+    estraverse "^1.9.1"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.2.0"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-config-vue@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-vue/-/eslint-config-vue-2.0.2.tgz#a3ab1004899e49327a94c63e24d47a396b2f4848"
+
+eslint-plugin-html@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.1.tgz#3a829510e82522f1e2e44d55d7661a176121fce1"
+  dependencies:
+    htmlparser2 "^3.8.2"
+
+eslint-plugin-react@^6.9.0:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
+  dependencies:
+    array.prototype.find "^2.0.1"
+    doctrine "^1.2.2"
+    has "^1.0.1"
+    jsx-ast-utils "^1.3.4"
+    object.assign "^4.0.4"
+
+eslint-plugin-vue@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-2.0.1.tgz#814aa24b5a892d1a95a9d65d980a11202e597e3b"
+  dependencies:
+    eslint-plugin-html "^2.0.0"
+    eslint-plugin-react "^6.9.0"
+
+eslint@^3.14.1:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.5.2"
+    debug "^2.1.1"
+    doctrine "^2.0.0"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
+
+espree@^3.4.0:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.2.tgz#38dbdedbedc95b8961a1fbf04734a8f6a9c8c592"
+  dependencies:
+    acorn "^5.0.1"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.6.0, esprima@^2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
+
+esrecurse@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  dependencies:
+    estraverse "~4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+
+estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+estraverse@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+evp_bytestokey@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
+  dependencies:
+    create-hash "^1.1.1"
+
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+expose-loader@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.3.tgz#35fbd3659789e4faa81f59de8b7e9fc39e466d51"
+
+extend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extract-text-webpack-plugin@^2.0.0-rc.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+  dependencies:
+    ajv "^4.11.2"
+    async "^2.1.2"
+    loader-utils "^1.0.2"
+    webpack-sources "^0.1.0"
+
+extsprintf@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-loader@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842"
+  dependencies:
+    loader-utils "^1.0.2"
+
+filename-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  dependencies:
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.29"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.0.2, function-bind@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
+
+gauge@~2.7.1:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^9.0.0, globals@^9.14.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growl@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hash-sum@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  dependencies:
+    inherits "^2.0.1"
+
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+he@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+htmlparser2@^3.8.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+
+iconv-lite@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
+icss-replace-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+ignore@^3.2.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+
+inject-loader@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-2.0.1.tgz#1a7b45d60a81610459ac76079c3ce2a654d0dfc7"
+  dependencies:
+    loader-utils "^0.2.3"
+
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    lodash "^4.3.0"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+interpret@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+
+invariant@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
+is-dotfile@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-expression@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
+  dependencies:
+    acorn "~3.3.0"
+    object-assign "^4.0.1"
+
+is-expression@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  dependencies:
+    acorn "~4.0.2"
+    object-assign "^4.0.1"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-my-json-valid@^2.10.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-number@^2.0.2, is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-regex@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-resolvable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
+  dependencies:
+    tryit "^1.0.1"
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jju@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"
+
+jodid25519@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  dependencies:
+    jsbn "~0.1.0"
+
+js-base64@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
+js-beautify@^1.6.3:
+  version "1.6.12"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.12.tgz#78b75933505d376da6e5a28e9b7887e0094db8b5"
+  dependencies:
+    config-chain "~1.1.5"
+    editorconfig "^0.13.2"
+    mkdirp "~0.5.0"
+    nopt "~3.0.1"
+
+js-stringify@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.2:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^3.1.1"
+
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^9.2.1:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+  dependencies:
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
+    whatwg-encoding "^1.0.1"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json-loader@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
+
+json-parse-helpfulerror@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
+  dependencies:
+    jju "^1.1.0"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json3@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.0.2"
+    json-schema "0.2.3"
+    verror "1.3.6"
+
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
+jsx-ast-utils@^1.3.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
+
+kind-of@^3.0.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
+  dependencies:
+    is-buffer "^1.1.5"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.9:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+
+lodash._basecreate@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+
+lodash.create@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._basecreate "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+lru-cache@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
+  dependencies:
+    pseudomap "^1.0.1"
+
+lru-cache@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  dependencies:
+    pseudomap "^1.0.1"
+    yallist "^2.0.0"
+
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+marked@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
+
+math-expression-evaluator@^1.2.14:
+  version "1.2.16"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
+
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+micromatch@^2.1.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+
+mime-types@^2.1.12, mime-types@~2.1.7:
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  dependencies:
+    mime-db "~1.27.0"
+
+mime@1.3.x:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
+minimalistic-assert@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+
+minimatch@^3.0.0, minimatch@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.3.0.tgz#d29b7428d3f52c82e2e65df1ecb7064e1aabbfb5"
+  dependencies:
+    browser-stdout "1.3.0"
+    commander "2.9.0"
+    debug "2.6.0"
+    diff "3.2.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.1"
+    growl "1.9.2"
+    json3 "3.3.2"
+    lodash.create "3.1.1"
+    mkdirp "0.5.1"
+    supports-color "3.1.2"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+ms@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
+mute-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+
+nan@^2.3.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+node-libs-browser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.1.4"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "0.0.1"
+    os-browserify "^0.2.0"
+    path-browserify "0.0.0"
+    process "^0.11.0"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.0.5"
+    stream-browserify "^2.0.1"
+    stream-http "^2.3.1"
+    string_decoder "^0.10.25"
+    timers-browserify "^2.0.2"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.6.29:
+  version "0.6.34"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+  dependencies:
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "^2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+nopt@~3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
+normalize-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-newline/-/normalize-newline-3.0.0.tgz#1cbea804aba436001f83938ab21ec039d69ae9d3"
+
+normalize-package-data@^2.3.2:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+npmlog@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.1"
+    set-blocking "~2.0.0"
+
+null-loader@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-0.1.1.tgz#17be9abfcd3ff0e1512f6fc4afcb1f5039378fae"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
+
+oauth-sign@~0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-keys@^1.0.10, object-keys@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
+object.assign@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.0"
+    object-keys "^1.0.10"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+once@^1.3.0, once@^1.3.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+os-browserify@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+pako@~0.2.0:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+
+parse-asn1@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+pbkdf2@^3.0.3:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
+  dependencies:
+    create-hmac "^1.1.2"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  dependencies:
+    find-up "^1.0.0"
+
+pluralize@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-load-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+    postcss-load-options "^1.2.0"
+    postcss-load-plugins "^2.3.0"
+
+postcss-load-options@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+
+postcss-load-plugins@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  dependencies:
+    cosmiconfig "^2.1.1"
+    object-assign "^4.1.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-modules-local-by-default@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
+  dependencies:
+    css-selector-tokenizer "^0.6.0"
+    postcss "^5.0.4"
+
+postcss-modules-scope@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
+  dependencies:
+    css-selector-tokenizer "^0.6.0"
+    postcss "^5.0.4"
+
+postcss-modules-values@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
+  dependencies:
+    icss-replace-symbols "^1.0.2"
+    postcss "^5.0.14"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.4:
+  version "5.2.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+private@^0.1.6:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+process@^0.11.0:
+  version "0.11.9"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
+
+progress@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+
+promise@^7.0.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
+  dependencies:
+    asap "~2.0.3"
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+
+prr@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+
+pseudomap@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+public-encrypt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
+pug-attrs@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
+  dependencies:
+    constantinople "^3.0.1"
+    js-stringify "^1.0.1"
+    pug-runtime "^2.0.3"
+
+pug-code-gen@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
+  dependencies:
+    constantinople "^3.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.1"
+    pug-attrs "^2.0.2"
+    pug-error "^1.3.2"
+    pug-runtime "^2.0.3"
+    void-elements "^2.0.1"
+    with "^5.0.0"
+
+pug-error@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
+
+pug-filters@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.2.tgz#3590b41adb34749f71d3f1f1a9f745011119117b"
+  dependencies:
+    clean-css "^3.3.0"
+    constantinople "^3.0.1"
+    jstransformer "1.0.0"
+    pug-error "^1.3.2"
+    pug-walk "^1.1.2"
+    resolve "^1.1.6"
+    uglify-js "^2.6.1"
+
+pug-lexer@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-2.3.2.tgz#68b19d96ea5dc0e4a86148b01cb966c17815a614"
+  dependencies:
+    character-parser "^2.1.1"
+    is-expression "^3.0.0"
+    pug-error "^1.3.2"
+
+pug-linker@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-2.0.3.tgz#b331ffa25737dde69c127b56c10ff17fae766dca"
+  dependencies:
+    pug-error "^1.3.2"
+    pug-walk "^1.1.2"
+
+pug-load@^2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.6.tgz#86da4b31c4f76fd9a471982b9b3d00e6c8a3f945"
+  dependencies:
+    object-assign "^4.1.0"
+    pug-walk "^1.1.2"
+
+pug-parser@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-2.0.2.tgz#53a680cfd05039dcb0c27d029094bc4a792689b0"
+  dependencies:
+    pug-error "^1.3.2"
+    token-stream "0.0.1"
+
+pug-runtime@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
+
+pug-strip-comments@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
+  dependencies:
+    pug-error "^1.3.2"
+
+pug-walk@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.2.tgz#debb24c070a95d5fc2aebf3589261833d2332e3b"
+
+pug@^2.0.0-beta6:
+  version "2.0.0-beta9"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-beta9.tgz#158ec6dbace5bb78f2b25e8825477d03ea6e14b0"
+  dependencies:
+    pug-code-gen "^1.1.1"
+    pug-filters "^2.1.0"
+    pug-lexer "^2.3.1"
+    pug-linker "^2.0.1"
+    pug-load "^2.0.4"
+    pug-parser "^2.0.2"
+    pug-runtime "^2.0.3"
+    pug-strip-comments "^1.0.2"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+q@^1.1.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
+randomatic@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  dependencies:
+    is-number "^2.0.2"
+    kind-of "^3.0.2"
+
+randombytes@^2.0.0, randombytes@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
+
+raw-loader@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+
+rc@^1.1.7:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
+  version "2.2.9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
+  dependencies:
+    buffer-shims "~1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~1.0.0"
+    util-deprecate "~1.0.1"
+
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
+regenerate@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+
+regenerator-runtime@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
+
+regenerator-transform@0.9.11:
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+    is-primitive "^2.0.0"
+
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@^2.79.0, request@^2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+require-uncached@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
+
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  dependencies:
+    once "^1.3.0"
+
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
+sax@^1.2.1, sax@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+serialize-javascript@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+sha.js@^2.3.6:
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
+  dependencies:
+    inherits "^2.0.1"
+
+shelljs@^0.7.5:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+skeleton-loader@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/skeleton-loader/-/skeleton-loader-0.0.5.tgz#0f00aff547f6651db2f52b69decddf969098f678"
+  dependencies:
+    loader-utils "^0.2.16"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^0.1.7, source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
+source-list-map@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4"
+
+source-map-support@^0.4.2:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.4.x:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.5.6, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  dependencies:
+    amdefine ">=0.0.4"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jodid25519 "^1.0.0"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-http@^2.3.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.2.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^3.0.0"
+
+string_decoder@^0.10.25:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+  dependencies:
+    buffer-shims "~1.0.0"
+
+stringstream@~0.0.4:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+stylus-loader@^2.0.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-2.5.1.tgz#d5ad8a7e0958adc12b8581e7bb169b9a61d54216"
+  dependencies:
+    loader-utils "^0.2.9"
+    lodash.clonedeep "^4.5.0"
+    when "~3.6.x"
+
+stylus@^0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
+sugarss@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+  dependencies:
+    postcss "^5.2.4"
+
+supports-color@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.0, supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+table@^3.7.8:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+tapable@^0.2.5, tapable@~0.2.5:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
+
+tar-pack@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+timers-browserify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
+  dependencies:
+    setimmediate "^1.0.4"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
+to-fast-properties@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+
+token-stream@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tryit@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
+type-detect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+uglify-js@^2.6.1, uglify-js@^2.8.5:
+  version "2.8.22"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
+url-loader@^0.5.7:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
+  dependencies:
+    loader-utils "^1.0.2"
+    mime "1.3.x"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  dependencies:
+    os-homedir "^1.0.0"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util@0.10.3, util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+uuid@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
+verror@1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  dependencies:
+    extsprintf "1.0.2"
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+void-elements@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+
+vue-hot-reload-api@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
+
+vue-server-renderer@^2.3.0:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.2.6.tgz#0a20535544b6948bca076380d058e19bb1304eef"
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.1.0"
+    resolve "^1.2.0"
+    source-map "0.5.6"
+    vue-ssr-html-stream "^2.1.0"
+
+vue-ssr-html-stream@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/vue-ssr-html-stream/-/vue-ssr-html-stream-2.2.0.tgz#56d78b96c9c172b43749a324c156e888aca96d92"
+  dependencies:
+    serialize-javascript "^1.3.0"
+
+vue-style-loader@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
+  dependencies:
+    hash-sum "^1.0.2"
+    loader-utils "^1.0.2"
+
+vue-template-compiler@^2.3.0:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.2.6.tgz#2e2928daf0cd0feca9dfc35a9729adeae173ec68"
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.1.0"
+
+vue-template-es2015-compiler@^1.2.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
+
+vue@^2.3.0:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed"
+
+watchpack@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+  dependencies:
+    async "^2.1.2"
+    chokidar "^1.4.3"
+    graceful-fs "^4.1.2"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+
+webpack-sources@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.5.3"
+
+webpack-sources@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
+  dependencies:
+    source-list-map "^1.1.1"
+    source-map "~0.5.3"
+
+webpack@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^4.7.0"
+    ajv-keywords "^1.1.1"
+    async "^2.1.2"
+    enhanced-resolve "^3.0.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^0.2.16"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^3.1.0"
+    tapable "~0.2.5"
+    uglify-js "^2.8.5"
+    watchpack "^1.3.1"
+    webpack-sources "^0.2.3"
+    yargs "^6.0.0"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
+  dependencies:
+    iconv-lite "0.4.13"
+
+whatwg-url@^4.3.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.1.tgz#df4dc2e3f25a63b1fa5b32ed6d6c139577d690de"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+when@~3.6.x:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+wide-align@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
+  dependencies:
+    string-width "^1.0.1"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+with@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  dependencies:
+    acorn "^3.1.0"
+    acorn-globals "^3.0.0"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+xml-name-validator@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yallist@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs-parser@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs@^6.0.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^4.2.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"

From ba23b3d155fd1fb354f46dcad47abb7b8e40c0fc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 26 Apr 2017 18:34:33 +0800
Subject: [PATCH 604/877] use beta for ci

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c341f45bb..d6ba8a703 100644
--- a/package.json
+++ b/package.json
@@ -78,9 +78,9 @@
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
     "url-loader": "^0.5.7",
-    "vue": "^2.3.0",
-    "vue-server-renderer": "^2.3.0",
-    "vue-template-compiler": "^2.3.0",
+    "vue": "^2.3.0-beta.1",
+    "vue-server-renderer": "^2.3.0-beta.1",
+    "vue-template-compiler": "^2.3.0-beta.1",
     "webpack": "^2.2.0"
   }
 }

From 5c9b80cd7742f57a2ea0e2364ac3d2ffd8848182 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 26 Apr 2017 18:56:57 +0800
Subject: [PATCH 605/877] update docs

---
 docs/en/configurations/extract-css.md | 40 ++++++++++++++++--
 docs/en/options.md                    | 61 +++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index cc254a70b..f40b2c017 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -1,12 +1,46 @@
 # Extracting CSS into a Single File
 
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+## The Easy Way
+
+> requires vue-loader@^12.0.0 and webpack@^2.0.0
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+The above will automatically handle extraction for `<style>` inside `*.vue` files and works with most pre-processors out of the box.
+
+Note this only extracts `*.vue` files though - CSS imported in JavaScript still needs to be configured separately.
+
+## Manual Configuration
+
 Example config to extract all the processed CSS in all Vue components into a single CSS file:
 
 ### Webpack 2.x
 
-``` bash
-npm install extract-text-webpack-plugin --save-dev
-```
 
 ``` js
 // webpack.config.js
diff --git a/docs/en/options.md b/docs/en/options.md
index c08a4bd73..06cba5169 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -185,3 +185,64 @@ module.exports = {
     ]
   }
   ```
+
+### extractCSS
+
+> New in 12.0.0
+
+Automatically extracts the CSS using `extract-text-webpack-plugin`. Works for most pre-processors out of the box, and handles minification in production as well.
+
+The value passed in can be `true`, or an instance of the plugin (so that you can use multiple instances of the extract plugin for multiple extracted files).
+
+This should be only used in production so that hot-reload works during development.
+
+Example:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+Or passing in an instance of the plugin:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var plugin = new ExtractTextPlugin("style.css")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: plugin
+        }
+      }
+    ]
+  },
+  plugins: [
+    plugin
+  ]
+}
+```

From 4d37780296ce3e97450e1634e0bf59ccf52ff28d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 26 Apr 2017 18:57:10 +0800
Subject: [PATCH 606/877] 12.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6ba8a703..e2e7df63d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "11.3.4",
+  "version": "12.0.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 595d5023a5952bee89147e76f2ca091b4eab9d30 Mon Sep 17 00:00:00 2001
From: Matt O'Connell <oconnell@adobe.com>
Date: Wed, 26 Apr 2017 23:31:41 -0400
Subject: [PATCH 607/877] Do not consider private properties to be named
 exports (fix: https://github.com/vuejs/vue-loader/issues/759) (#765)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 6019d9ea5..f9710f07d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -466,7 +466,7 @@ module.exports = function (content) {
     // check named exports
     output +=
       'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +
-        'return key !== "default" && key !== "__esModule"' +
+        'return key !== "default" && key.substr(0, 2) !== "__"' +
       '})) {' +
         'console.error("named exports are not supported in *.vue files.")' +
       '}\n'

From 7529218cdda6f8b80aa63456e05e3221b5909eb2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 12:48:48 +0800
Subject: [PATCH 608/877] support deps registered by postcss plugins

---
 lib/style-compiler/index.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index 29206e0af..a2c9bf354 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -55,13 +55,20 @@ module.exports = function (css, map) {
 
     return postcss(plugins)
       .process(css, options)
-      .then(function (result) {
+      .then(result => {
+        if (result.messages) {
+          result.messages.forEach(m => {
+            if (m.type === 'dependency') {
+              this.addDependency(m.file)
+            }
+          })
+        }
         var map = result.map && result.map.toJSON()
         cb(null, result.css, map)
         return null // silence bluebird warning
       })
   }).catch(e => {
-    console.log(e)
+    console.error(e)
     cb(e)
   })
 }

From 35229b0eb8548ace386a1c52f2c4e1bd4b20e674 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 13:13:33 +0800
Subject: [PATCH 609/877] make keyframes scoped (close #731)

---
 lib/style-compiler/plugins/scope-id.js | 19 +++++++++++++++++--
 test/fixtures/scoped-css.vue           |  7 +++++++
 test/test.js                           |  9 ++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index dbcad9fd6..7a2b3f2bb 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -3,11 +3,18 @@ var selectorParser = require('postcss-selector-parser')
 
 module.exports = postcss.plugin('add-id', function (opts) {
   return function (root) {
+    var keyframes = Object.create(null)
+
     root.each(function rewriteSelector (node) {
       if (!node.selector) {
         // handle media queries
-        if (node.type === 'atrule' && node.name === 'media') {
-          node.each(rewriteSelector)
+        if (node.type === 'atrule') {
+          if (node.name === 'media') {
+            node.each(rewriteSelector)
+          } else if (node.name === 'keyframes') {
+            // register keyframes
+            keyframes[node.params] = node.params = node.params + '-' + opts.id
+          }
         }
         return
       }
@@ -23,5 +30,13 @@ module.exports = postcss.plugin('add-id', function (opts) {
         })
       }).process(node.selector).result
     })
+
+    if (Object.keys(keyframes).length) {
+      root.walkDecls(decl => {
+        if (/-?animation$/.test(decl.prop) && keyframes[decl.value]) {
+          decl.value = keyframes[decl.value]
+        }
+      })
+    }
   }
 })
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index ce28b06bd..9c989090d 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -8,6 +8,13 @@
 h1 {
   color: green;
 }
+.anim {
+  animation: color;
+}
+@keyframes color {
+  from { color: red; }
+  to { color: green; }
+}
 </style>
 
 <template>
diff --git a/test/test.js b/test/test.js
index 9ca17de66..078c97f37 100644
--- a/test/test.js
+++ b/test/test.js
@@ -193,9 +193,12 @@ describe('vue-loader', function () {
 
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
-      expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
-      expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
-      expect(style).to.contain('h1[' + id + '] {\n  color: green;\n}')
+      expect(style).to.contain(`.test[${id}] {\n  color: yellow;\n}`)
+      expect(style).to.contain(`.test[${id}]:after {\n  content: \'bye!\';\n}`)
+      expect(style).to.contain(`h1[${id}] {\n  color: green;\n}`)
+      // scoped keyframes
+      expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id};\n}`)
+      expect(style).to.contain(`@keyframes color-${id} {`)
       done()
     })
   })

From c6882f165cfae40da2dee8ab5e0b8416e1ab82d3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 13:27:45 +0800
Subject: [PATCH 610/877] only infer scss/sass loader when no explicit loaders
 have been specified (fix #790)

---
 lib/loader.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index f9710f07d..e584c2291 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -203,11 +203,13 @@ module.exports = function (content) {
         scoped: !!scoped,
         hasInlineConfig: !!query.postcss
       }) + '!'
-      // normalize scss/sass
-      if (lang === 'sass') {
-        lang = 'sass?indentedSyntax'
-      } else if (lang === 'scss') {
-        lang = 'sass'
+      // normalize scss/sass if no specific loaders have been provided
+      if (!loaders[lang]) {
+        if (lang === 'sass') {
+          lang = 'sass?indentedSyntax'
+        } else if (lang === 'scss') {
+          lang = 'sass'
+        }
       }
     }
 

From 063001e2c6b7c3323173f0615bac9074009ecddf Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 13:28:53 +0800
Subject: [PATCH 611/877] 12.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e2e7df63d..b2e34f773 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 2f299fc8ed323fd036a65dc2c0d2bf117447a4f9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 13:31:33 +0800
Subject: [PATCH 612/877] Revert "make keyframes scoped (close #731)"

This reverts commit 35229b0eb8548ace386a1c52f2c4e1bd4b20e674.
---
 lib/style-compiler/plugins/scope-id.js | 19 ++-----------------
 test/fixtures/scoped-css.vue           |  7 -------
 test/test.js                           |  9 +++------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index 7a2b3f2bb..dbcad9fd6 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -3,18 +3,11 @@ var selectorParser = require('postcss-selector-parser')
 
 module.exports = postcss.plugin('add-id', function (opts) {
   return function (root) {
-    var keyframes = Object.create(null)
-
     root.each(function rewriteSelector (node) {
       if (!node.selector) {
         // handle media queries
-        if (node.type === 'atrule') {
-          if (node.name === 'media') {
-            node.each(rewriteSelector)
-          } else if (node.name === 'keyframes') {
-            // register keyframes
-            keyframes[node.params] = node.params = node.params + '-' + opts.id
-          }
+        if (node.type === 'atrule' && node.name === 'media') {
+          node.each(rewriteSelector)
         }
         return
       }
@@ -30,13 +23,5 @@ module.exports = postcss.plugin('add-id', function (opts) {
         })
       }).process(node.selector).result
     })
-
-    if (Object.keys(keyframes).length) {
-      root.walkDecls(decl => {
-        if (/-?animation$/.test(decl.prop) && keyframes[decl.value]) {
-          decl.value = keyframes[decl.value]
-        }
-      })
-    }
   }
 })
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 9c989090d..ce28b06bd 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -8,13 +8,6 @@
 h1 {
   color: green;
 }
-.anim {
-  animation: color;
-}
-@keyframes color {
-  from { color: red; }
-  to { color: green; }
-}
 </style>
 
 <template>
diff --git a/test/test.js b/test/test.js
index 078c97f37..9ca17de66 100644
--- a/test/test.js
+++ b/test/test.js
@@ -193,12 +193,9 @@ describe('vue-loader', function () {
 
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
-      expect(style).to.contain(`.test[${id}] {\n  color: yellow;\n}`)
-      expect(style).to.contain(`.test[${id}]:after {\n  content: \'bye!\';\n}`)
-      expect(style).to.contain(`h1[${id}] {\n  color: green;\n}`)
-      // scoped keyframes
-      expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id};\n}`)
-      expect(style).to.contain(`@keyframes color-${id} {`)
+      expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
+      expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
+      expect(style).to.contain('h1[' + id + '] {\n  color: green;\n}')
       done()
     })
   })

From 08491c9e3802dab47f07a67e20dc3ef87e48ecf8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 13:32:17 +0800
Subject: [PATCH 613/877] 12.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2e34f773..3070c1760 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 8695e9cf671beb3e0f55fe39e4717f97d03c0188 Mon Sep 17 00:00:00 2001
From: SU_ZE__ <ze.su.coiner@gmail.com>
Date: Thu, 27 Apr 2017 20:31:14 +0800
Subject: [PATCH 614/877] docs (#796)

webpakc -> webpack
---
 docs/zh-cn/features/es2015.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/features/es2015.md b/docs/zh-cn/features/es2015.md
index 16f54345a..74e6fc277 100644
--- a/docs/zh-cn/features/es2015.md
+++ b/docs/zh-cn/features/es2015.md
@@ -58,7 +58,7 @@ export default {
 
 ### 转换普通 `.js` 文件
 
-由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 Webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 Webpakc 中配置 `babel-loader`或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
+由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 Webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 Webpack 中配置 `babel-loader`或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
 
 ### 使用 `.babelrc` 配置 Babel
 

From 2155a2e739089c09044adb118d1edf4e7b804f7e Mon Sep 17 00:00:00 2001
From: Grigoriy Beziuk <me@gbezyuk.ru>
Date: Fri, 28 Apr 2017 08:06:03 +0800
Subject: [PATCH 615/877] [JUST MERGE ME] Russian translation update (#791)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение
---
 docs/ru/configurations/extract-css.md | 41 ++++++++++++++++--
 docs/ru/features/scoped-css.md        |  4 +-
 docs/ru/options.md                    | 61 +++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/docs/ru/configurations/extract-css.md b/docs/ru/configurations/extract-css.md
index 7df77b65e..e092e87bb 100644
--- a/docs/ru/configurations/extract-css.md
+++ b/docs/ru/configurations/extract-css.md
@@ -1,13 +1,46 @@
 # Извлечение CSS в отдельный файл
 
-Пример конфигурации для извлечения CSS из всех компонентов Vue в отдельный CSS-файл:
-
-### Webpack 2.x
-
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
 ```
 
+## Простой путь
+
+> требуется vue-loader@^12.0.0 и webpack@^2.0.0
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // другие настройки...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+Указанный выше пример будет автоматически обрабатывать извлечение `<style>` изнутри `*.vue` файлов и работать с большинством пре-процессоров из коробки.
+
+Обратите внимание, что это будет извлекать только из `*.vue` файлов, для CSS импортрируемого в JavaScript по-прежнему будет требоваться отдельная настройка.
+
+## Конфигурация вручную
+
+Пример конфигурации для извлечения CSS из всех компонентов Vue в отдельный CSS-файл:
+
+### Webpack 2.x
+
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
index 46448e7d3..1ca2c27aa 100644
--- a/docs/ru/features/scoped-css.md
+++ b/docs/ru/features/scoped-css.md
@@ -18,13 +18,13 @@
 
 ``` html
 <style>
-.example[_v-f3f3eg9] {
+.example[data-v-f3f3eg9] {
   color: red;
 }
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>hi</div>
+  <div class="example" data-v-f3f3eg9>hi</div>
 </template>
 ```
 
diff --git a/docs/ru/options.md b/docs/ru/options.md
index bade17b84..d99b5a143 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -185,3 +185,64 @@ module.exports = {
     ]
   }
   ```
+
+### extractCSS
+
+> Добавлено в версии 12.0.0
+
+Автоматически извлекает CSS с помощью `extract-text-webpack-plugin`. Работает для большинства пре-процессоров из коробки и минифицирует при сборке в production.
+
+Передаваемое значение может быть `true`, или экземпляром плагина (так что вы можете использовать несколько экземпляров extract plugin для разных извлекаемых файлов).
+
+Это должно использоваться только в production, чтобы горячая перезагрузка модулей работала в процессе разработки.
+
+Например:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // другие настройки...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+Или можно передать экземпляр плагина:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var plugin = new ExtractTextPlugin("style.css")
+
+module.exports = {
+  // другие настройки...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: plugin
+        }
+      }
+    ]
+  },
+  plugins: [
+    plugin
+  ]
+}
+```
\ No newline at end of file

From 8e34badc58452b68b5539e830d59591256f167c9 Mon Sep 17 00:00:00 2001
From: Carson <huguangju@users.noreply.github.com>
Date: Fri, 28 Apr 2017 11:12:26 +0800
Subject: [PATCH 616/877] update Chinese translation (#794)

* update Chinese translation

* Do not consider private properties to be named exports (fix: https://github.com/vuejs/vue-loader/issues/759) (#765)

* support deps registered by postcss plugins

* make keyframes scoped (close #731)

* only infer scss/sass loader when no explicit loaders have been specified (fix #790)

* 12.0.1

* Revert "make keyframes scoped (close #731)"

This reverts commit 35229b0eb8548ace386a1c52f2c4e1bd4b20e674.

* 12.0.2
---
 docs/zh-cn/README.md                       |  8 +-
 docs/zh-cn/SUMMARY.md                      |  4 +-
 docs/zh-cn/configurations/advanced.md      | 16 ++--
 docs/zh-cn/configurations/asset-url.md     | 10 +--
 docs/zh-cn/configurations/custom-blocks.md |  7 +-
 docs/zh-cn/configurations/extract-css.md   | 46 +++++++++--
 docs/zh-cn/features/css-modules.md         |  4 +-
 docs/zh-cn/features/es2015.md              |  8 +-
 docs/zh-cn/features/hot-reload.md          |  4 +-
 docs/zh-cn/features/postcss.md             |  6 +-
 docs/zh-cn/features/scoped-css.md          |  7 +-
 docs/zh-cn/options.md                      | 89 ++++++++++++++++++----
 docs/zh-cn/start/spec.md                   | 18 ++---
 docs/zh-cn/workflow/linting.md             |  2 +-
 docs/zh-cn/workflow/production.md          |  6 +-
 docs/zh-cn/workflow/testing-with-mocks.md  | 22 +++---
 docs/zh-cn/workflow/testing.md             | 33 ++++----
 17 files changed, 190 insertions(+), 100 deletions(-)

diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index 6af9d30bb..f09fa22d2 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -27,12 +27,12 @@
 
 一个基本的例子，想像我们有一些 CommonJS 模块，它不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过`<script>` 标签加载。Webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
 
-但是 Webpack 可以做的不止这些。使用 "loaders"，我们可以配置 Webpack 以任何方式去转换所有类型的文件。一些例子包括：
+但是 Webpack 可以做的不止这些。使用 "loaders"，我们可以配置 Webpack 以任何方式去转换所有类型的文件。包括以下例子：
 
-- 转换 ES2015,CoffeeScript 或者 TypeScript 模块为普通的 ES5 CommonJS 模块；
+- 转换 ES2015，CoffeeScript 或者 TypeScript 模块为普通的 ES5 CommonJS 模块；
 - 可以选择在编译之前检验你的源代码；
 - 将 Jade 模版转换为纯 HTML 并且嵌入 Javascript 字符串中；
-- 将 SASS 文件转换为纯 CSS，then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
+- 将 SASS 文件转换为纯 CSS，然后将其转换成 JavaScript 片段，将生成的 CSS 作为 `<style>` 标签插入页面；
 - 处理 HTML 或者 CSS 中引用的图片，移动到配置的路径中，并且使用 md5 hash 重命名。
 
-当你理解 Webpack 原理后会感觉它是如此强大，它可以大大优化你的前端工作流程。它主要的缺点是配置复杂麻烦，但是使用本指南， Vue.js 和 `vue-loader`使用时的常见问题，应该可以帮助你找到解决方案。
+当你理解 Webpack 原理后会感觉它是如此强大，它可以大大优化你的前端工作流程。它主要的缺点是配置复杂麻烦，但是使用本指南，应该可以帮助你找到 Vue.js 和 `vue-loader` 使用时的最常见问题的解决方案。
diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index 5689d977a..6aa5eb440 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -9,7 +9,7 @@
   - [热重载](features/hot-reload.md)
 - 配置
   - [预处理器](configurations/pre-processors.md)
-  - [处理资源路径](configurations/asset-url.md)
+  - [资源路径处理](configurations/asset-url.md)
   - [进阶配置](configurations/advanced.md)
   - [提取 CSS 文件](configurations/extract-css.md)
   - [自定义块](configurations/custom-blocks.md)
@@ -17,5 +17,5 @@
   - [生产环境构建](workflow/production.md)
   - [代码检验](workflow/linting.md)
   - [测试](workflow/testing.md)
-  - [使用 Mocks 测试](workflow/testing-with-mocks.md)
+  - [使用 Mock 测试](workflow/testing-with-mocks.md)
 - [选项参考](options.md)
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index 0a51ae979..b4f066a9e 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -1,14 +1,14 @@
 # Loader 进阶配置
 
-有些时候你想要这样：
+你有时可能想实现：
 
 1. 对语言应用自定义 loader string，而不是让 `vue-loader` 去推断；
 
-2. 覆盖默认语言的内置配置。
+2. 覆盖默认语言的内置 loader 配置。
 
-3. 默认语言预处理或者后处理配置。
+3. 使用自定义 loader 预处理或后处理特定语言块。
 
-为了实现这些，详细说明 `vue-loader` 的 `loaders` 选项：
+为此，请指定 `vue-loader` 的 `loaders` 选项：
 
 > 注意 `preLoaders` 和 `postLoaders` 只在版本 >=10.3.0 支持
 
@@ -18,7 +18,7 @@
 module.exports = {
   // other options...
   module: {
-    // module.rules is the same as module.loaders in 1.x
+    // module.rules 与 1.x中的 module.loaders 相同
     rules: [
       {
         test: /\.vue$/,
@@ -45,10 +45,8 @@ module.exports = {
           postLoaders: {
             html: 'babel-loader'
           }
-          
-          // `excludedPreLoaders` 的内容是正则表达式
-          // 你可以用来从 Loader chain 上剔除那些你不需要 vue-loader 处理的 preloader
-          // 最常用的就是各种 lint
+
+          // `excludedPreLoaders` 应是正则表达式
           excludedPreLoaders: /(eslint-loader)/
         }
       }
diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index 3cc760abd..a0ef574de 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -1,6 +1,6 @@
-# 处理资源路径
+# 资源路径处理
 
-默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理你的样式和模版文件。在处理过程中，所有的资源路径例如 `<img src="...">`, `background: url(...)` 和 `@import` **会作为模块依赖**。
+默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理你的样式和模版文件。在编译过程中，所有的资源路径例如 `<img src="...">`, `background: url(...)` 和 `@import` **会作为模块依赖**。
 
 例如，`url(./image.png)` 会被转换为 `require('./image.png')`,
 
@@ -14,10 +14,10 @@
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-因为 `.png` 不是一个 JavaScript 文件，你需要配置 Webpack 使用 [file-loader](https://github.com/webpack/file-loader) 或者 [url-loader](https://github.com/webpack/url-loader) 去处理它们。脚手器工具 `vue-cli` 已经为你配置好了。
+因为 `.png` 不是一个 JavaScript 文件，你需要配置 Webpack 使用 [file-loader](https://github.com/webpack/file-loader) 或者 [url-loader](https://github.com/webpack/url-loader) 去处理它们。`vue-cli` 脚手器工具已经为你配置好了。
 
 使用它们的好处：
 
-1. `file-loader` 允许你指定资源文件的位置，允许使用 hashes 命名以获得长时间的缓存。此外，这意味着 **你可以就近管理你的图片文件，可以使用相对路径而不用担心布署**。使用正确的配置，Webpack 将会在输出中自动重写为正常的文件路径。
+1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理你的图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，Webpack 将会在打包输出中自动重写文件路径为正确的URL。
 
-2. `url-loader` 允许你设置转换为内联 base64 的文件最小值，这会减少小文件的 HTTP 请求。如果文件大于设置值，会自动的交给 `file-loader` 处理。
+2. `url-loader` 允许你有条件将文件转换为内联的 base-64 URL（当文件小于给定的阈值），这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index ae5edf39d..8b1d6f0de 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -2,13 +2,14 @@
 
 > 在大于 10.2.0 中支持
 
-在 `.vue` 文件中，你可以自定义语言块。自定义块将会被 `vue-loader` 选项 `loaders` 中指定的 loaders 处理，然后被组件模块依赖。配置类似 [Loader 进阶配置](../configurations/advanced.md)，除了匹配使用的是标签名称，而不是 `lang` 属性。
+在 `.vue` 文件中，你可以自定义语言块。自定义块的内容将由 `vue-loader` 的 options 中的 `loader` 对象中指定的 loader 处理，然后被组件模块依赖。类似 [Loader 进阶配置](../configurations/advanced.md)中的配置，但使用的是标签名匹配，而不是 `lang` 属性。
 
-如果 loader 匹配到自定义块，它会被处理；其它情况会被忽略。
+如果找到一个自定义块的 matching loader，该自定义块将被处理; 否则自定义块将被忽略。
+另外，如果找到的 loader 返回一个函数，该函数将以 `* .vue` 文件的组件作为参数来调用。
 
 ## 例子
 
-这个例子是提取自定义块 `<docs>` 的内容到单个 docs 文件中：
+这是提取自定义块 `<docs>` 的内容到单个 docs 文件中的例子：
 
 #### component.vue
 
diff --git a/docs/zh-cn/configurations/extract-css.md b/docs/zh-cn/configurations/extract-css.md
index f037fe543..531360816 100644
--- a/docs/zh-cn/configurations/extract-css.md
+++ b/docs/zh-cn/configurations/extract-css.md
@@ -1,13 +1,47 @@
 # 提取 CSS 到单个文件
 
-提取所有 Vue 组件中的 CSS 到单个文件的例子：
-
-### Webpack 2.x
-
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
 ```
 
+## 简单的方法
+
+> requires vue-loader@^12.0.0 and webpack@^2.0.0
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+上述内容将自动处理 `*.vue` 文件内的 `<style>` 提取，并与大多数预处理器一样开箱即用。
+
+注意这只是提取 `*.vue` 文件 - 但在 JavaScript 中导入的 CSS 仍然需要单独配置。
+
+## 手动配置
+
+将所有 Vue 组件中的所有已处理的 CSS 提取为单个 CSS 文件配置示例：
+
+### Webpack 2.x
+
+
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
@@ -23,7 +57,7 @@ module.exports = {
           loaders: {
             css: ExtractTextPlugin.extract({
               use: 'css-loader',
-              fallback: 'vue-style-loader' // <- this is a dep of vue-loader, so no need to explicitly install if using npm3
+              fallback: 'vue-style-loader' // <- 这是vue-loader的依赖，所以如果使用npm3，则不需要显式安装
             })
           }
         }
@@ -59,7 +93,7 @@ module.exports = {
   vue: {
     loaders: {
       css: ExtractTextPlugin.extract("css"),
-      // you can also include <style lang="less"> or other langauges
+      // 你还可以引入 <style lang="less"> 或其它语言
       less: ExtractTextPlugin.extract("css!less")
     }
   },
diff --git a/docs/zh-cn/features/css-modules.md b/docs/zh-cn/features/css-modules.md
index 043213e44..24a689081 100644
--- a/docs/zh-cn/features/css-modules.md
+++ b/docs/zh-cn/features/css-modules.md
@@ -19,7 +19,7 @@
 </style>
 ```
 
-这将为 `css-loader` 打开 CSS 模块模式，生成的 CSS 对象将为组件注入一个名叫 `$style` 的计算属性，你可以在你的模块中使用动态绑定：
+这将为 `css-loader` 打开 CSS 模块模式，生成的 CSS 对象将为组件注入一个名叫 `$style` 的计算属性，你可以在你的模块中使用动态 class 绑定：
 
 ``` html
 <template>
@@ -29,7 +29,7 @@
 </template>
 ```
 
-由于它是一个计算属性，它也与 `：class` 的 object/array 语法一起使用：
+由于它是一个计算属性，它也适用于 `:class` 的 object/array 语法：
 
 ``` html
 <template>
diff --git a/docs/zh-cn/features/es2015.md b/docs/zh-cn/features/es2015.md
index 74e6fc277..8c0184e1c 100644
--- a/docs/zh-cn/features/es2015.md
+++ b/docs/zh-cn/features/es2015.md
@@ -1,6 +1,6 @@
 # ES2015
 
-当项目中配置了 `babel-loader` 或者 `buble-loader`，`vue-loader` 会使用他们处理所有 `.vue` 文件中的 `<script>` 部分，允许我们在 Vue 组件中使用 ES2015，如果你还没有使用 ES2015，你应该使用它，下面是一些好的学习资源：
+当项目中配置了 `babel-loader` 或者 `buble-loader`，`vue-loader` 会使用他们处理所有 `.vue` 文件中的 `<script>` 部分，允许我们在 Vue 组件中使用 ES2015，如果你还没有使用 ES2015，你应该使用它，这有一些不错的学习资源：
 
 - [Babel - Learn ES2015](https://babeljs.io/docs/learn-es2015/)
 - [ES6 Features](https://github.com/lukehoban/es6features)
@@ -54,12 +54,12 @@ export default {
 </my-component>
 ```
 
-你还可以使用[`buble` 选项]（../ options.md＃buble）自定义模板中支持的功能。
+你还可以使用 [`buble` 选项](../options.md#buble) 自定义模板中支持的功能。
 
 ### 转换普通 `.js` 文件
 
-由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 Webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 Webpack 中配置 `babel-loader`或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
+由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 Webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 Webpack 中配置 `babel-loader` 或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
 
 ### 使用 `.babelrc` 配置 Babel
 
-`babel-loader` 遵守 [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)，因此这是推荐配置 Babel presets 和插件的方法。
+`babel-loader` 遵守 [`.babelrc`](https://babeljs.io/docs/usage/babelrc/)，因此这是配置 Babel presets 和插件推荐的方法。
diff --git a/docs/zh-cn/features/hot-reload.md b/docs/zh-cn/features/hot-reload.md
index 7d8df900a..944d23923 100644
--- a/docs/zh-cn/features/hot-reload.md
+++ b/docs/zh-cn/features/hot-reload.md
@@ -1,7 +1,7 @@
 # 热重载
 
-"热重载"不是当你修改文件的时候简单重新加载页面。启用热重载后，当你修改 `.vue` 文件时，所有该组件的实例会被替换，**并且不需要刷新页面**。它甚至保持应用程序和修改组件的当前状态！当你调整模版或者修改样式时，这极大的提高了开发体验。
+"热重载"不是当你修改文件的时候简单重新加载页面。启用热重载后，当你修改 `.vue` 文件时，所有该组件的实例会被替换，**并且不需要刷新页面**。它甚至保持应用程序和被替换组件的当前状态！当你调整模版或者修改样式时，这极大的提高了开发体验。
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
-当使用脚手架工具 `vue-cli` 时，热重载是开箱即用的。
\ No newline at end of file
+当使用脚手架工具 `vue-cli` 时，热重载是开箱即用的。
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
index 77273d9c5..175353824 100644
--- a/docs/zh-cn/features/postcss.md
+++ b/docs/zh-cn/features/postcss.md
@@ -10,7 +10,7 @@
 - `.postcssrc`
 - `package.json` 中的 `postcss`
 
-使用配置文件允许一份配置用于处理普通 CSS 文件(通过`postcss-loader`)，和 `.vue` 文件内的 CSS，这是推荐做法。
+使用配置文件允许你在由 `postcss-loader` 处理的普通CSS文件和 `*.vue` 文件中的 CSS 之间共享相同的配置，这是推荐的做法。
 
 ## 内联选项
 
@@ -54,9 +54,9 @@ module.exports = {
 
 除了插件数组之外，`postcss` 配置选项也接受：
 
-- 一个返回插件数组的函数；
+- 返回插件数组的函数；
 
-- 一个对象包含配置选项，传递给 PostCSS 处理器。这在使用自定义 parser/stringifiers 时非常有用:
+- 要传递给 PostCSS 处理器的包含 options 的对象。当你使用的 PostCSS 项目依赖自定义 `parser/stringifiers`时，这很有用：
 
   ``` js
   postcss: {
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
index f2fe4fc29..7f533f7d3 100644
--- a/docs/zh-cn/features/scoped-css.md
+++ b/docs/zh-cn/features/scoped-css.md
@@ -42,11 +42,10 @@
   </style>
   ```
 
-2. 子组件的根节点将同时受父组件作用域和子组件作用域的影响。
+2. 子组件的根节点将同时受父组件和子组件作用域 CSS 的影响。
 
-3. 部分元素不受作用域影响部分。
+3. Partials 不受作用域样式影响。
 
-4. **CSS 作用域不能代C替 classes**。考虑到浏览器渲染各种 CSS 选择器的方式，`p { color: red }` 在作用域中会慢很多(即转换为属性选择器)。如果你使用 classes 或者 ids 代替，比如 `.example { color: red }`，这样几乎没有性能影响。[Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) 你可以测试它们的不同。
+4. **CSS 作用域不能代替 classes**。考虑到浏览器渲染各种 CSS 选择器的方式，当使用 scoped 时，`p { color: red }` 在作用域中会慢很多倍（即当与属性选择器组合时）。如果你使用 classes 或者 ids 代替，比如 `.example { color: red }`，这样几乎没有性能影响。[Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) 你可以测试它们的不同。
 
 5. **在递归组件中小心使用后代选择器!** 对于带有选择器 `.a .b` 的CSS 规则，如果元素 `.a` 包含递归子组件，所有的子组件中的 `.b` 会被匹配。
-
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index d9c5e6081..6b79401da 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -1,6 +1,6 @@
-# 配置文档
+# 选项参考
 
-## Webpack 1 和 2 配置差异
+## Webpack 1 和 2 之间的使用差异
 
 Webpack 2：配置直接放到 loader rule 中。
 
@@ -36,8 +36,7 @@ module.exports = {
 
 - 类型： `{ [lang: string]: string }`
 
-  如果指定 Webpack loaders 会覆盖 ` .vue` 文件中的语言块的默认 `lang` 属性。 每种类型的默认 `lang` 是：
-  An object specifying Webpack loaders to overwrite the default loaders used for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+  指定 Webpack loader 对象覆盖用于 `*.vue` 文件内的语言块的默认 loader。如果指定，该键对应于语言块的 `lang` 属性。 每种类型的默认 `lang` 是：
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -65,18 +64,18 @@ module.exports = {
 ### preLoaders
 
 - 类型： `{ [lang: string]: string }`
-- 在大于 >=10.3.0 版本中支持
+- 仅在 >=10.3.0 版本中支持
+
+  配置格式和 `loaders` 相同，但是 `preLoaders` 会在默认 loaders 之前处理。你可以用来预处理语言块 - 一个常见用例是用来处理构建时的 i18n。
 
-  配置格式和 `loaders` 相同，但是 `preLoaders` 会在默认 loaders 之前处理。你可以用来预处理语言块 - 一个例子是用来处理构建时的 i18n。
-  
 ### postLoaders
 
 - 类型： `{ [lang: string]: string }`
-- 在大于 >=10.3.0 版本中支持
+- 仅在 >=10.3.0 版本中支持
 
   配置格式和 `loaders` 相同，但是 `postLoaders` 会在默认 loaders 之后处理。你可以用来后处理语言块。注意这会有些复杂：
 
-  - 对于 `html`,默认 loader 返回结果会被编译为 JavaScript 渲染函数。
+  - 对于 `html`，默认 loader 返回结果会被编译为 JavaScript 渲染函数。
 
   - 对于 `css`，由`vue-style-loader` 返回的结果通常不太有用。使用 postcss 插件将会是更好的选择。
 
@@ -94,7 +93,7 @@ module.exports = {
   {
     loader: 'vue-loader',
     options: {
-      // note: do not nest the `postcss` option under `loaders`
+      // 注意：不要在 `loader` 下嵌入 `postcss` 选项
       postcss: [require('postcss-cssnext')()],
       loaders: {
         // ...
@@ -128,7 +127,7 @@ module.exports = {
 - 类型: `Boolean`
 - 默认值: `undefined`
 
-  是否导出 esModule 兼容代码，默认情况下 vue-loader 会导出 commonjs 格式，像 `module.exports = ....`。当 `esModule` 设置为 true 的情况下，导出会变为 `exports.__esModule = true; exports = ...`。Useful for interoperating with transpiler other than Babel，比如 TypeScript。
+  是否导出兼容 esModule 的代码，默认情况下 vue-loader 会导出 commonjs 格式，像 `module.exports = ....`。当 `esModule` 设置为 true 的情况下，导出会变为 `exports.__esModule = true; exports = ...`。适用于与 Babel 以外的 transpiler 互操作，比如 TypeScript。
 
 ### preserveWhitespace
 
@@ -149,11 +148,10 @@ module.exports = {
 - 类型: `Object`
 - 默认值: `{}`
 
-  在使用 `buble-loader` 时配置它的选项，AND the buble compilation pass for template render functions。
+  配置 `buble-loader` 的选项（如果存在），并且 buble 编译传递模板渲染函数。
 
   > 版本警告：在 9.x 版本中，模板表达式通过现在已经删除的 `templateBuble` 选项单独配置。
 
-
   模板渲染函数编译支持一个特殊的变换 `stripWith`（默认启用），它删除生成的渲染函数中的 `with` 用法，使它们兼容严格模式。
 
   配置例子：
@@ -162,8 +160,8 @@ module.exports = {
   // webpack 1
   vue: {
     buble: {
-      // enable object spread operator
-      // NOTE: you need to provide Object.assign polyfill yourself!
+      // 启用对象扩展运算符
+      // 注意：你需要自己提供 Object.assign polyfill！
       objectAssign: 'Object.assign',
 
       // turn off the `with` removal
@@ -188,3 +186,64 @@ module.exports = {
     ]
   }
   ```
+
+### extractCSS
+
+> 12.0.0 新增
+
+使用 `extract-text-webpack-plugin` 自动提取 CSS。 适用于大多数预处理器，且也可在生产环境进行压缩。
+
+传入的值可以是 `true`，也可以是插件的一个实例（这样可以为多个提取的文件使用多个提取插件的实例）。
+
+这应当只用于生产环境，以便可以在开发过程中使用热重载。
+
+示例:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+或者传递插件的一个实例：
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var plugin = new ExtractTextPlugin("style.css")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: plugin
+        }
+      }
+    ]
+  },
+  plugins: [
+    plugin
+  ]
+}
+```
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index a6d83424e..44f23dee8 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -1,6 +1,6 @@
 # Vue 组件细则
 
-`.vue` 文件是一个自定义的文件类型,用类 HTML 语法描述一个 Vue 组件。每个 `.vue` 文件包含三种类型的顶级语言块 `<template>`, `<script>` 和 `<style>`，还允许添加可选的自定义块：
+`.vue` 文件是一个自定义的文件类型，用类 HTML 语法描述一个 Vue 组件。每个 `.vue` 文件包含三种类型的顶级语言块 `<template>`, `<script>` 和 `<style>`，还允许添加可选的自定义块：
 
 ``` html
 <template>
@@ -28,9 +28,9 @@ export default {
 </custom1>
 ```
 
-`vue-loader` 会解析文件，提取每个语言块，如有必要会通过其它 loaders 处理，最后将他们组装成一个 CommonJS 模块，`module.exports` 出一个 Vue.js 组件对象。
+`vue-loader` 会解析文件，提取每个语言块，如有必要会通过其它 loader 处理，最后将他们组装成一个 CommonJS 模块，`module.exports` 出一个 Vue.js 组件对象。
 
-`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写 style： 
+`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写样式：
 
 ``` html
 <style lang="sass">
@@ -52,13 +52,13 @@ export default {
 
 #### `<script>`
 
-- 默认语言：`js` (ES2015 在检测到配置 `babel-loader` 或 `buble-loader` 时自动支持).
+- 默认语言：`js` (在检测到 `babel-loader` 或 `buble-loader` 配置时自动支持ES2015).
 
 - 每个 `.vue` 文件最多包含一个 `<script>` 块
 
-- script 在 CommonJS 环境中执行（就像通过 Webpack 打包的正常 js 模块），这意味这你可以 `require()` 其它依赖。在 ES2015 在支持下,你也可以使用 `import` 和 `export` 语法。
+- 该脚本在类 CommonJS 环境中执行（就像通过 Webpack 打包的正常 js 模块），这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
 
-- script 必须导出 Vue.js 组件对象。也可以导出由 `Vue.extend()` 创建的扩展对象，但是普通对象是最好的选择。
+- 脚本必须导出 Vue.js 组件对象。也可以导出由 `Vue.extend()` 创建的扩展对象，但是普通对象是更好的选择。
 
 #### `<style>`
 
@@ -66,9 +66,9 @@ export default {
 
 - 一个 `.vue` 文件可以包含多个 `<style>` 标签。
 
-- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md) 和 [CSS 模块](../features/css-modules.md)) 以帮助你将样式封装到当前组件。多个不同封装的 `<style>` 标签将会混合在一个组件中。
+- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md) 和 [CSS 模块](../features/css-modules.md)) 以帮助你将样式封装到当前组件。具有不同封装模式的多个 `<style>` 标签可以在同一个组件中混合使用。
 
-- 默认情况下内容将会使用 `style-loader` 提取并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md).
+- 默认情况下，将会使用 `style-loader` 提取内容，并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md).
 
 ### 自定义块
 
@@ -105,7 +105,7 @@ export default {
 ### 语法高亮
 
 
-目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 等)。 对其他编辑器/IDEs 的贡献将会非常感谢！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作HTML对待。
+目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 等)。 非常感谢其他编辑器/IDEs 所作的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
 
 ### 注释
 
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
index 339fd11a7..97c57f02b 100644
--- a/docs/zh-cn/workflow/linting.md
+++ b/docs/zh-cn/workflow/linting.md
@@ -40,7 +40,7 @@ module.exports = {
 
 注意 Webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
 
-我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 linting 配置到 Webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order)中：
+我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 linting 配置到 Webpack 的  [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
 
 ``` js
 // webpack.config.js
diff --git a/docs/zh-cn/workflow/production.md b/docs/zh-cn/workflow/production.md
index 665c2f9bc..83995287a 100644
--- a/docs/zh-cn/workflow/production.md
+++ b/docs/zh-cn/workflow/production.md
@@ -2,10 +2,10 @@
 
 生产环境打包要做两件事：
 
-1. 缩小软件代码；
+1. 压缩应用代码；
 2. 使用 [Vue.js 指南 - 删除警告](https://cn.vuejs.org/v2/guide/deployment.html#删除警告) 去除 Vue.js 中的警告。
 
-下面是例子：
+下面是配置示例：
 
 ``` js
 // webpack.config.js
@@ -30,7 +30,7 @@ module.exports = {
 }
 ```
 
-显然我们不会想在开发时使用这些配置，有几种方式来实现：
+显然，我们不想在开发过程中使用这些配置，所以有几种方法可以解决这个问题：
 
 1. 使用环境变量动态构建；
 
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
index b1a17838f..baebcbd32 100644
--- a/docs/zh-cn/workflow/testing-with-mocks.md
+++ b/docs/zh-cn/workflow/testing-with-mocks.md
@@ -1,10 +1,10 @@
-# Testing with Mocks
+# 使用 Mock 测试
 
-In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
+在真实世界的应用中，我们的组件很有可能具有外部依赖。在为组件编写单元测试时，理想的状态是我们可以模拟这些外部依赖关系，这样我们的测试只依赖被测组件的行为。
 
-`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
+`vue-loader` 提供了一个可以使用 [inject-loader](https://github.com/plasticine/inject-loader) 将任意依赖项注入到 `*.vue` 组件的特性。 大体思路是：我们使用 `inject-loader` 为该模块创建一个 “模块工厂” 功能，而不是直接导入组件模块。当使用 mock 对象调用此函数时，它会返回模块的实例，并注入到 mock 中。
 
-Suppose we have a component like this:
+假设我们有一个这样的组件：
 
 ``` html
 <!-- example.vue -->
@@ -26,9 +26,9 @@ export default {
 </script>
 ```
 
-Here's how to import it with mocks:
+以下是使用 mock 导入的方法：
 
-> Note: inject-loader@3.x is currently unstable.
+> 注意: inject-loader@3.x 当前是不稳定的。
 
 ``` bash
 npm install inject-loader@^2.0.0 --save-dev
@@ -39,12 +39,12 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
+请注意 crazy require string - 我们在这里使用一些内联 [webpack loader requests](https://webpack.github.io/docs/loaders.html)。 简要解释：
 
-- `!!` at the start means "disable all loaders from the global config";
-- `vue?inject!` means "use the `vue` loader, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
+- 以 `!!` 打头意味着 “禁用全局配置中的所有 loader”;
+- `vue?inject!`意思是 “使用 `vue` loader，并传入 `?inject` 查询”。这告诉 `vue-loader` 在依赖注入模式下编译组件。
 
-The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
+返回的 `ExampleInjector` 是一个工厂函数，可以调用它来创建 `example.vue` 模块的实例：
 
 ``` js
 const ExampleWithMocks = ExampleInjector({
@@ -55,7 +55,7 @@ const ExampleWithMocks = ExampleInjector({
 })
 ```
 
-Finally, we can test the component like usual:
+最后，我们可以像往常一样测试组件：
 
 ``` js
 it('should render', () => {
diff --git a/docs/zh-cn/workflow/testing.md b/docs/zh-cn/workflow/testing.md
index 03c0a64c5..53e9c7cdd 100644
--- a/docs/zh-cn/workflow/testing.md
+++ b/docs/zh-cn/workflow/testing.md
@@ -1,10 +1,10 @@
-# Testing
+# 测试
 
-> The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
+> [webpack vue-cli 模板](https://github.com/vuejs-templates/webpack) 为你提供预配置的单元测试和 e2e 测试设置。
 
-When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+当测试 `*.vue` 文件时，我们不能使用基于 CommonJS 的简单测试运行器，因为它不知道如何处理 `*.vue` 文件。而是应该使用 Webpack + vue-loader 打包我们的测试文件。推荐的设置是使用 [Karma](http://karma-runner.github.io/0.13/index.html) 和  [karma-webpack](https://github.com/webpack/karma-webpack)。
 
-Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:
+Karma 是一个启动浏览器并为你运行测试的测试运行器。你可以选择要测试的浏览器以及你要使用的测试框架（例如，Mocha 或  Jasmine）。以下是一个在 [PhantomJS](http://phantomjs.org/) 中使用[Jasmine](http://jasmine.github.io/edge/introduction.html) 测试框架运行测试的 Karma 配置示例：
 
 ``` bash
 npm install\
@@ -15,9 +15,8 @@ npm install\
 ```
 
 ``` js
-// we can just use the exact same webpack config by requiring it
-// however, remember to delete the original entry since we don't
-// need it during tests
+// 我们只需要使用完全相同的 webpack 配置即可
+// 但是，请记得删除原来的 entry，因为我们在测试期间不需要它
 var webpackConfig = require('./webpack.config.js')
 delete webpackConfig.entry
 
@@ -26,13 +25,13 @@ module.exports = function (config) {
   config.set({
     browsers: ['PhantomJS'],
     frameworks: ['jasmine'],
-    // this is the entry file for all our tests.
+    // 这是所有测试的入口文件。
     files: ['test/index.js'],
-    // we will pass the entry file to webpack for bundling.
+    // 把入口文件传给 webpack 以进行打包。
     preprocessors: {
       'test/index.js': ['webpack']
     },
-    // use the webpack config
+    // 使用 webpack 配置
     webpack: webpackConfig,
     // avoid walls of useless text
     webpackMiddleware: {
@@ -43,7 +42,7 @@ module.exports = function (config) {
 }
 ```
 
-And for the entry `test/index.js` file:
+`test/index.js` 文件如下：
 
 ``` js
 // test/index.js
@@ -53,7 +52,7 @@ var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
 ```
 
-This entry file simply requires all other files that ends in `.spec.js` in the same folder. Now we can actually write some tests:
+此入口文件只需要在同一文件夹中的 `.spec.js` 结尾引入其他所有文件。 现在我们可以写一些测试：
 
 ``` js
 // test/component-a.spec.js
@@ -62,12 +61,12 @@ var ComponentA = require('../../src/components/a.vue')
 
 describe('a.vue', function () {
 
-  // asserting JavaScript options
+  // JavaScript 选项断言
   it('should have correct message', function () {
     expect(ComponentA.data().msg).toBe('Hello from Component A!')
   })
 
-  // asserting rendered result by actually rendering the component
+  // 组件实际渲染的渲染结果断言
   it('should render correct message', function () {
     var vm = new Vue({
       template: '<div><test></test></div>',
@@ -80,7 +79,7 @@ describe('a.vue', function () {
 })
 ```
 
-To run the tests, add the following NPM script:
+添加以下 NPM 脚本以运行测试：
 
 ``` js
 // package.json
@@ -92,10 +91,10 @@ To run the tests, add the following NPM script:
 ...
 ```
 
-Finally, run:
+最后运行：
 
 ``` bash
 npm test
 ```
 
-Again, [webpack vue-cli template](https://github.com/vuejs-templates/webpack) contains a fully working example with tests.
+此外，[webpack vue-cli 模板](https://github.com/vuejs-templates/webpack) 包含一个完整的测试用例。

From 7cb64a4cd148c7c2ea3ec4241393223a9a163754 Mon Sep 17 00:00:00 2001
From: Blake Newman <blakenoodles@gmail.com>
Date: Tue, 2 May 2017 11:36:51 +0100
Subject: [PATCH 617/877] [Fix] functional SFC style injection support (#797)

* [Fix] functional SFC style injection support

* improvements for handling functional components with styles
---
 lib/component-normalizer.js        | 26 +++++++++++----
 package.json                       |  6 ++--
 test/fixtures/functional-style.vue | 12 +++++++
 test/fixtures/ssr-style.js         |  4 ++-
 test/fixtures/ssr-style.vue        |  7 +++-
 test/test.js                       | 53 +++++++++++++++++++++---------
 yarn.lock                          | 48 +++++++++++++++++----------
 7 files changed, 113 insertions(+), 43 deletions(-)
 create mode 100644 test/fixtures/functional-style.vue

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 9a97239dd..12f2db170 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -40,7 +40,10 @@ module.exports = function normalizeComponent (
   if (moduleIdentifier) { // server build
     hook = function (context) {
       // 2.3 injection
-      context = context || (this.$vnode && this.$vnode.ssrContext)
+      context =
+        context || // cached call
+        (this.$vnode && this.$vnode.ssrContext) || // stateful
+        (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
       // 2.2 with runInNewContext: true
       if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
         context = __VUE_SSR_CONTEXT__
@@ -62,11 +65,22 @@ module.exports = function normalizeComponent (
   }
 
   if (hook) {
-    // inject component registration as beforeCreate hook
-    var existing = options.beforeCreate
-    options.beforeCreate = existing
-      ? [].concat(existing, hook)
-      : [hook]
+    var functional = options.functional
+    var existing = functional
+      ? options.render
+      : options.beforeCreate
+    if (!functional) {
+      // inject component registration as beforeCreate hook
+      options.beforeCreate = existing
+        ? [].concat(existing, hook)
+        : [hook]
+    } else {
+      // register for functioal component in vue file
+      options.render = function renderWithStyleInjection (h, context) {
+        hook.call(context)
+        return existing(h, context)
+      }
+    }
   }
 
   return {
diff --git a/package.json b/package.json
index 3070c1760..7a4723a80 100644
--- a/package.json
+++ b/package.json
@@ -78,9 +78,9 @@
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
     "url-loader": "^0.5.7",
-    "vue": "^2.3.0-beta.1",
-    "vue-server-renderer": "^2.3.0-beta.1",
-    "vue-template-compiler": "^2.3.0-beta.1",
+    "vue": "^2.3.2",
+    "vue-server-renderer": "^2.3.2",
+    "vue-template-compiler": "^2.3.2",
     "webpack": "^2.2.0"
   }
 }
diff --git a/test/fixtures/functional-style.vue b/test/fixtures/functional-style.vue
new file mode 100644
index 000000000..70f575f43
--- /dev/null
+++ b/test/fixtures/functional-style.vue
@@ -0,0 +1,12 @@
+<script>
+export default {
+  functional: true,
+  render (h) {
+    return h('div', { class: 'foo' }, ['functional'])
+  }
+}
+</script>
+
+<style>
+.foo { color: red; }
+</style>
diff --git a/test/fixtures/ssr-style.js b/test/fixtures/ssr-style.js
index 35f445ce3..38dc1d7f8 100644
--- a/test/fixtures/ssr-style.js
+++ b/test/fixtures/ssr-style.js
@@ -1,4 +1,6 @@
 var Vue = require('vue')
 var App = require('./ssr-style.vue')
 
-module.exports = new Vue(App)
+module.exports = () => new Vue({
+  render: h => h(App)
+})
diff --git a/test/fixtures/ssr-style.vue b/test/fixtures/ssr-style.vue
index 059d4bf6d..55d15f674 100644
--- a/test/fixtures/ssr-style.vue
+++ b/test/fixtures/ssr-style.vue
@@ -2,14 +2,19 @@
   <div>
     <h1>Hello</h1>
     <basic/>
+    <functional-style/>
   </div>
 </template>
 
 <script>
 import Basic from './basic.vue'
+import FunctionalStyle from './functional-style.vue'
 
 export default {
-  components: { Basic }
+  components: {
+    Basic,
+    FunctionalStyle
+  }
 }
 </script>
 
diff --git a/test/test.js b/test/test.js
index 9ca17de66..5b9989995 100644
--- a/test/test.js
+++ b/test/test.js
@@ -84,29 +84,30 @@ function test (options, assert) {
 }
 
 function mockRender (options, data) {
+  function h (tag, data, children) {
+    if (Array.isArray(data)) {
+      children = data
+      data = null
+    }
+    return {
+      tag: tag,
+      data: data,
+      children: children
+    }
+  }
   return options.render.call(Object.assign({
     _v (val) {
       return val
     },
     _self: {},
-    $createElement (tag, data, children) {
-      if (Array.isArray(data)) {
-        children = data
-        data = null
-      }
-      return {
-        tag: tag,
-        data: data,
-        children: children
-      }
-    },
+    $createElement: h,
     _m (index) {
       return options.staticRenderFns[index].call(this)
     },
     _s (str) {
       return String(str)
     }
-  }, data))
+  }, data), h)
 }
 
 function interopDefault (module) {
@@ -611,24 +612,28 @@ describe('vue-loader', function () {
       }
     }, code => {
       const renderer = SSR.createBundleRenderer(code, {
-        basedir: __dirname
+        basedir: __dirname,
+        runInNewContext: 'once'
       })
       const context = {
         _registeredComponents: new Set()
       }
       renderer.renderToString(context, (err, res) => {
         if (err) return done(err)
-        expect(res).to.contain('server-rendered')
+        expect(res).to.contain('data-server-rendered')
         expect(res).to.contain('<h1>Hello</h1>')
         expect(res).to.contain('Hello from Component A!')
+        expect(res).to.contain('<div class="foo">functional</div>')
         // from main component
         expect(context.styles).to.contain('h1 { color: green;')
         // from imported child component
         expect(context.styles).to.contain('comp-a h2 {\n  color: #f00;')
         // from imported css file
         expect(context.styles).to.contain('h1 { color: red;')
+        // from imported functional component
+        expect(context.styles).to.contain('.foo { color: red;')
         // collect component identifiers during render
-        expect(Array.from(context._registeredComponents).length).to.equal(2)
+        expect(Array.from(context._registeredComponents).length).to.equal(3)
         done()
       })
     })
@@ -834,4 +839,22 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('functional component with styles', done => {
+    test({
+      entry: './test/fixtures/functional-style.vue'
+    }, (window, module, rawModule) => {
+      expect(module.functional).to.equal(true)
+      var vnode = mockRender(module)
+      // <div class="foo">hi</div>
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.data.class).to.equal('foo')
+      expect(vnode.children[0]).to.equal('functional')
+
+      var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('.foo { color: red;\n}')
+      done()
+    })
+  })
 })
diff --git a/yarn.lock b/yarn.lock
index 42144c822..7d191b3fa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2497,6 +2497,10 @@ lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
 
+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -2533,6 +2537,19 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
+lodash.template@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -4137,21 +4154,18 @@ vue-hot-reload-api@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
-vue-server-renderer@^2.3.0:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.2.6.tgz#0a20535544b6948bca076380d058e19bb1304eef"
+vue-server-renderer@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.2.tgz#01bfde9c524ef041873f1e2d18f9356c620b4f8c"
   dependencies:
-    de-indent "^1.0.2"
+    chalk "^1.1.3"
+    hash-sum "^1.0.2"
     he "^1.1.0"
+    lodash.template "^4.4.0"
+    lodash.uniq "^4.5.0"
     resolve "^1.2.0"
-    source-map "0.5.6"
-    vue-ssr-html-stream "^2.1.0"
-
-vue-ssr-html-stream@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vue-ssr-html-stream/-/vue-ssr-html-stream-2.2.0.tgz#56d78b96c9c172b43749a324c156e888aca96d92"
-  dependencies:
     serialize-javascript "^1.3.0"
+    source-map "0.5.6"
 
 vue-style-loader@^3.0.0:
   version "3.0.1"
@@ -4160,9 +4174,9 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.3.0:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.2.6.tgz#2e2928daf0cd0feca9dfc35a9729adeae173ec68"
+vue-template-compiler@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.2.tgz#d48a7f53df5f497033827182ceb4f0d340803017"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -4171,9 +4185,9 @@ vue-template-es2015-compiler@^1.2.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
 
-vue@^2.3.0:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed"
+vue@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.2.tgz#9e52aae3593480be235ff227557837e69f98203a"
 
 watchpack@^1.3.1:
   version "1.3.1"

From 99a2b7af46753608ec5b0c17a7f2ec08117c1e2d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 2 May 2017 18:37:26 +0800
Subject: [PATCH 618/877] 12.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7a4723a80..1b1809711 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.0.2",
+  "version": "12.0.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 7db1b256c20764ab137844cf953c79a68b08578d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ChangJoo=20Park=28=EB=B0=95=EC=B0=BD=EC=A3=BC=29?=
 <pcjpcj2@gmail.com>
Date: Wed, 3 May 2017 01:23:57 +0900
Subject: [PATCH 619/877] [Korean Docs] Update docs for v12.x (#803)

* [Korean] Update docs

* [Korean] Update advanced

* [Korean] update spec.md

* [Korean] update scoped-css.md

* [Korean] update postcss.md

* [Korean] update extract-css.md

* [Korean] update custom-blocks.md

* [Korean] Update options.md

* [Korean] Update vue component spec

* [Korean] update advanced

* [Korean] Update postcss.md

* [Korean] Update extract-css.md

* [Korean] Update custom-blocks.md

* [Korean] Update Summary.md

* [Korean] Fix sentences
---
 docs/kr/SUMMARY.md                      |   1 +
 docs/kr/configurations/advanced.md      |  83 +++++++++-----
 docs/kr/configurations/custom-blocks.md | 133 ++++++++++++++++++++++
 docs/kr/configurations/extract-css.md   |  78 +++++++++----
 docs/kr/features/postcss.md             |  39 ++++---
 docs/kr/features/scoped-css.md          |   4 +-
 docs/kr/options.md                      | 142 +++++++++++++++++++-----
 docs/kr/start/spec.md                   |  68 ++++++++----
 8 files changed, 433 insertions(+), 115 deletions(-)
 create mode 100644 docs/kr/configurations/custom-blocks.md

diff --git a/docs/kr/SUMMARY.md b/docs/kr/SUMMARY.md
index 7b5d0fc85..e26233394 100644
--- a/docs/kr/SUMMARY.md
+++ b/docs/kr/SUMMARY.md
@@ -13,6 +13,7 @@
   - [Asset URL 핸들링](configurations/asset-url.md)
   - [고급 로더 설정](configurations/advanced.md)
   - [CSS 단일 파일로 추출하기](configurations/extract-css.md)
+  - [사용자 정의 블록](configurations/custom-blocks.md)
 - 개발 환경
   - [배포용 빌드](workflow/production.md)
   - [Linting](workflow/linting.md)
diff --git a/docs/kr/configurations/advanced.md b/docs/kr/configurations/advanced.md
index 41f9a5a0b..fb509d539 100644
--- a/docs/kr/configurations/advanced.md
+++ b/docs/kr/configurations/advanced.md
@@ -1,56 +1,81 @@
 # 고급 로더 설정
 
-때로는 `vue-loader`가 그것을 추론하는 대신 언어에 사용자 정의 로더 문자열을 적용하기를 원할 수도 있습니다. 또는 기본 언어에서 기본적으로 제공되는 로더 설정을 덮어쓰고 싶을 수도 있습니다. 이를 위해서 Webpack 설정 파일에 `vue` 블럭을 추가하고 `loaders` 옵션을 지정할 수 있습니다.
+아래와 같은 요구사항이 있을 수 있습니다.
 
-### Webpack 1.x
+1. `vue-loader`가 추측하는 대신 언어에 맞는 사용자 정의 로더를 사용해야합니다.
+
+2. 기본 언어에 대한 로더를 덮어써야합니다.
+
+3. 특정 language block을 위한 사용자 정의 프리 또는 포스트 프로세스를 해야합니다.
+
+이를 위해 `vue-loader`에 `loaders` 옵션을 지정해야합니다.
+
+> 참고: `preLoaders`와 `postLoaders`는 10.3.0 버전 이상에서만 지원합니다.
+
+### Webpack 2.x
 
 ``` js
-// webpack.config.js
 module.exports = {
-  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
+  // 기타 옵션들...
   module: {
-    loaders: [
+    // module.rules은 1.x버전의 module.loaders과 같습니다
+    rules: [
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue-loader',
+        options: {
+          // `loaders`는 기본 로더를 덮어씁니다.
+          // 다음 설정은 "lang" 속성이 없는 
+          // 모든 <script> 태그가 coffee 로더와 함께 로드되도록 합니다
+          loaders: {
+            js: 'coffee-loader'
+          },
+
+          // `preLoaders`는 기본 로더 앞에 붙습니다.
+          // 이를 이용해 language block을 프리 프로세스할 수 있습니다.
+          // 일반적으로 빌드타임에 다국어 처리를 할 수 있습니다.
+          preLoaders: {
+            js: '/path/to/custom/loader'
+          },
+
+          // `postLoaders`는 기본 로더 뒤에 붙습니다.
+          // - `html`의 경우, 기본 로더의 결과는 컴파일 된 JavaScript 렌더링 함수 코드가 됩니다.
+
+          //  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고 
+          // 대부분의 경우 별로 사용할 일은 없습니다. postcss 플러그인을 사용하는 것이 더 좋습니다.
+          postLoaders: {
+            html: 'babel-loader'
+          },
+          
+          // `excludedPreLoaders`는 반드시 정규표현식을 사용합니다
+          excludedPreLoaders: /(eslint-loader)/
+        }
       }
     ]
-  },
-  // vue-loader 설정
-  vue: {
-    // 이 부분엔 다른 Vue 옵션도 들어 갈 수 있습니다.
-    loaders: {
-      // coffee-loader에 "lang" 속성이 없는 모든 <script>를 로드하세요.
-      js: 'coffee',
-      // <template>을 HTML 문자열로 직접 로드하면
-      // vue-html-loader를 통해 파이핑하지 않아도 됩니다.
-      html: 'raw'
-    }
   }
 }
 ```
 
-### Webpack 2.x (^2.1.0-beta.25)
+### Webpack 1.x
 
 ``` js
+// webpack.config.js
 module.exports = {
-  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
+  // 기타 옵션들...
   module: {
-    // module.rules는 1.x의 module.loaders와 동일합니다.
-    rules: [
+    loaders: [
       {
         test: /\.vue$/,
-        loader: 'vue',
-        // vue-loader 옵션은 이곳에 옵니다.
-        options: {
-          loaders: {
-            // ...
-          }
-        }
+        loader: 'vue'
       }
     ]
+  },
+  // vue-loader 설정
+  vue: {
+    loaders: {
+      // 위와 동일한 설정 규칙입니다
+    }
   }
 }
 ```
-
 고급 로더 설정을 보다 실용적으로 사용하면 [컴포넌트 내부의 CSS를 단일 파일로 추출할 수 있습니다](./extract-css.md).
diff --git a/docs/kr/configurations/custom-blocks.md b/docs/kr/configurations/custom-blocks.md
new file mode 100644
index 000000000..3837e4bed
--- /dev/null
+++ b/docs/kr/configurations/custom-blocks.md
@@ -0,0 +1,133 @@
+# 사용자 정의 블록
+
+> 10.2.0 버전 이상에서 지원
+
+`*.vue` 파일 안에 사용자 정의 language block을 정의할 수 있습니다. 사용자 정의 블록안의 내용은 `vue-loader` 옵션의 `loaders` 객체에 지정된 로더에서 처리된 다음 컴포넌트 모듈에서 요구됩니다. 설정은 [고급 로더 설정](../configurations/advanced.md)에서 설명한 내용과 유사합니다. 단, 일치하는 경우 `lang` 속성 대신 태그 이름을 사용합니다.
+
+사용자 정의 블록에 일치하는 로더가 발견되면 처리합니다. 그렇지 않으면 무시합니다. 또한 발견된 로더가 함수를 반환하면 해당 함수는 `*.vue`파일의 컴포넌트를 매개변수로 사용하여 호출합니다.
+
+## 단일 문서 파일 예제
+
+다음은 모든 `<docs>` 사용자 정의 블록을 하나의 문서 파일로 추출하는 예 입니다.
+
+#### component.vue
+
+``` html
+<docs>
+## This is an Example component.
+</docs>
+
+<template>
+  <h2 class="red">{{msg}}</h2>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
+
+<style>
+comp-a h2 {
+  color: #f00;
+}
+</style>
+```
+
+#### webpack.config.js
+
+``` js
+// Webpack 2.x
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            // 모든 <docs>의 내용을 원문 그대로 추출합니다
+            'docs': ExtractTextPlugin.extract('raw-loader'),
+          }
+        }
+      }
+    ]
+  },
+  plugins: [
+    // 모든 docs를 하나의 파일로 추출합니다
+    new ExtractTextPlugin('docs.md')
+  ]
+}
+```
+
+## 런타임에서 사용할 수 있는 문서
+
+다음은 `<docs>` 사용자 정의 블록을 컴포넌트에 넣어 런타임에서 사용할 수 있는 예제입니다.
+
+#### docs-loader.js
+
+사용자 정의 블록 콘텐트를 삽입하려면 사용자 정의 로더가 필요합니다.
+
+``` js
+module.exports = function (source, map) {
+  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+    JSON.stringify(source) +
+    '}', map)
+}
+```
+
+#### webpack.config.js
+
+webpack이 `<docs>` 사용자 정의 블록을 위한 로더를 사용하도록 설정합니다.
+
+``` js
+const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            'docs': docsLoader
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+#### component.vue
+
+이제 `<docs>` 블록의 내용을 런타임 중에 컴포넌트에서 사용할 수 있습니다.
+
+``` html
+<template>
+  <div>
+    <component-b />
+    <p>{{ docs }}</p>
+  </div>
+</template>
+
+<script>
+import componentB from 'componentB';
+
+export default = {
+  data () {
+    return {
+      docs: componentB.__docs
+    }
+  },
+  components: {componentB}
+}
+</script>
+```
diff --git a/docs/kr/configurations/extract-css.md b/docs/kr/configurations/extract-css.md
index 9ace5208f..e6aede8f4 100644
--- a/docs/kr/configurations/extract-css.md
+++ b/docs/kr/configurations/extract-css.md
@@ -1,62 +1,63 @@
 # CSS 단일 파일로 추출하기
 
-다음 예제 설정을 사용하여 모든 Vue 컴포넌트의 처리된 CSS를 단일 CSS 파일로 추출할 수 있습니다.
-
-### Webpack 1.x
-
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
 ```
 
+## 쉬운 방법
+
+> vue-loader@^12.0.0와 webpack@^2.0.0 필요
+
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
-  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
+  // other options...
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.vue$/,
-        loader: 'vue'
-      },
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
     ]
   },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // 당신은 <style lang="less"> 또는 다른 언어도 포함할 수 있습니다.
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
   plugins: [
     new ExtractTextPlugin("style.css")
   ]
 }
 ```
 
-### Webpack 2.x (^2.1.0-beta.25)
+위 코드는 `*.vue` 파일 내부에서 `<style>`에 대한 추출을 자동으로 처리하며, 대부분의 프리프로세서와 함께 사용할 수 있습니다.
+
+ `*.vue`만 추출합니다. JavaScript에서 가져온 CSS는 별도로 설정해야합니다.
+ 
+## 수동 설정
+
+설정을 사용하여 모든 Vue 컴포넌트에서 처리된 CSS를 단일 CSS 파일로 추출하는 예제 입니다.
+
+### Webpack 2.x
 
-``` bash
-npm install extract-text-webpack-plugin --save-dev
-```
 
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
-  // 이 부분엔 다른 옵션도 들어 갈 수 있습니다.
+  // 기타 옵션...
   module: {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             css: ExtractTextPlugin.extract({
               use: 'css-loader',
-              fallback: 'vue-style-loader' // <- 이것은 vue-loader의 의존성이므로, npm3를 사용하는 경우에는 명시적으로 설치할 필요가 없습니다.
+              fallback: 'vue-style-loader' // <- vue-loader의 의존성입니다. 그래서 npm3를 사용하면 명시적으로 설치할 필요는 없습니다.
             })
           }
         }
@@ -68,3 +69,36 @@ module.exports = {
   ]
 }
 ```
+
+### Webpack 1.x
+
+``` bash
+npm install extract-text-webpack-plugin --save-dev
+```
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // 기타 옵션...
+  module: {
+    loaders: [
+      {
+        test: /\.vue$/,
+        loader: 'vue'
+      },
+    ]
+  },
+  vue: {
+    loaders: {
+      css: ExtractTextPlugin.extract("css"),
+      // <style lang="less"> 또는 다른 언어를 포함할 수 있습니다.
+      less: ExtractTextPlugin.extract("css!less")
+    }
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
\ No newline at end of file
diff --git a/docs/kr/features/postcss.md b/docs/kr/features/postcss.md
index 0c54b4eb0..51368a238 100644
--- a/docs/kr/features/postcss.md
+++ b/docs/kr/features/postcss.md
@@ -2,36 +2,49 @@
 
 `vue-loader`에 의해서 처리된 모든 CSS 출력은 범위가 지정된 CSS의 재 작성을 위해 [PostCSS](https://github.com/postcss/postcss)를 통해 파이프됩니다. 당신은 프로세스에 [autoprefixer](https://github.com/postcss/autoprefixer) 또는 [CSSNext](http://cssnext.io/)와 같은 사용자 정의 PostCSS 플러그인을 추가할 수 있습니다.
 
-Webpack 1.x의 예제입니다.
+## 설정 파일 사용하기
+
+11.0버전 부터 `vue-loader`는 [`postcss-loader`](https://github.com/postcss/postcss-loader#usage)가 지원하는 동일한 PostCSS 파일을 자동으로 불러옵니다.
+
+- `postcss.config.js`
+- `.postcssrc`
+- `package.json`의 `postcss` 필드
+
+설정 파일을 사용하면 `postcss-loader`가 처리한 일반적인 CSS파일과 `*.vue` 파일의 CSS에 같은 설정을 공유할 수 있습니다.
+
+## 인라인 옵션
+
+또는 `vue-loader`에 `postcss` 옵션을 사용해 `*.vue`파일을 위해 postcss 설정을 지정할 수 있습니다.
+
+Webpack 1버전 예제:
 
 ``` js
 // webpack.config.js
 module.exports = {
-  // 여기에 다른 옵션이 올 수 있습니다.
+  // 기타 설정...
   vue: {
-    // 커스텀 PostCSS 플러그인을 사용하세요.
+    // 사용자 정의 postcss 플러그인 사용
     postcss: [require('postcss-cssnext')()]
   }
 }
 ```
 
-Webpack 2.x의 예제입니다.
+Webpack 2버전 예제:
 
 ``` js
 // webpack.config.js
 module.exports = {
-  // 여기에 다른 옵션이 올 수 있습니다.
+  // 기타 설정...
   module: {
-    // module.rules는 1.x의 module,loaders와 같습니다.
+    // module.rules는 1.x의 module.loaders와 동일
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
-        // vue-loader 옵션은 이곳에 옵니다.
+        loader: 'vue-loader',
+        // vue-loader 옵션은 여기에 지정합니다
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
-          }
         }
       }
     ]
@@ -39,15 +52,15 @@ module.exports = {
 }
 ```
 
-`postcss` 옵션은 플러그인의 배열을 제공하는 것 외에도 다음 옵션을 사용할 수 있습니다.
+`postcss` 옵션은 플러그인 배열을 제공하는 것 이외에 아래의 내용을 허용합니다.
 
-- 플러그인 배열을 반환하는 함수.
+- 플러그인 배열을 반환하는 함수
 
-- PostCSS 프로세서에 전달할 옵션을 포함하는 객체. 이것은 사용자 정의 파서/문자열 변환기에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
+- PostCSS 프로세서에 전달할 옵션을 포함하는 객체입니다. 이것은 사용자 정의 파서/stingifier에 의존하는 PostCSS 프로젝트를 사용할 때 유용합니다.
 
   ``` js
   postcss: {
-    plugins: [...], // 플러그인의 리스트
+    plugins: [...], // 플러그인 목록
     options: {
       parser: sugarss // sugarss 파서 사용
     }
diff --git a/docs/kr/features/scoped-css.md b/docs/kr/features/scoped-css.md
index fa0661efe..9714b8a04 100644
--- a/docs/kr/features/scoped-css.md
+++ b/docs/kr/features/scoped-css.md
@@ -18,13 +18,13 @@
 
 ``` html
 <style>
-.example[_v-f3f3eg9] {
+.example[data-v-f3f3eg9] {
   color: red;
 }
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>안녕</div>
+  <div class="example" data-v-f3f3eg9>안녕</div>
 </template>
 ```
 
diff --git a/docs/kr/options.md b/docs/kr/options.md
index ba2219835..3c7572fa0 100644
--- a/docs/kr/options.md
+++ b/docs/kr/options.md
@@ -2,18 +2,7 @@
 
 ## Webpack 1 & 2 사용 방법의 차이점
 
-Webpack 1.x의 경우 Webpack 설정에 루트 `vue` 블럭을 추가합니다.
-
-``` js
-module.exports = {
-  // ...
-  vue: {
-    // vue-loader 옵션
-  }
-}
-```
-
-Webpack 2 (^2.1.0-beta.25)는 다음과 같습니다.
+Webpack 2 : 직접 loader 규칙에 전달합니다
 
 ``` js
 module.exports = {
@@ -32,9 +21,20 @@ module.exports = {
 }
 ```
 
+Webpack 1.x의 경우 Webpack 설정에 루트 `vue` 블럭을 추가합니다.
+
+``` js
+module.exports = {
+  // ...
+  vue: {
+    // vue-loader 옵션
+  }
+}
+```
+
 ### 로더
 
-- 타입: `Object`
+- 타입: `{ [lang: string]: string }`
 
   `*.vue` 파일의 언어 블럭에 사용할 Webpack 로더를 지정하는 객체입니다. 이 키는 특별히 지정된 경우 language block에 대한 `lang` 속성에 해당합니다. 각 타입에 대한 기본적인 `lang`은 다음과 같습니다.
 
@@ -45,16 +45,46 @@ module.exports = {
   예를 들어, `babel-loader`와 `eslint-loader`를 사용하여 모든 `<script>` 블럭을 처리하려면 다음과 같이 사용합니다.
 
   ``` js
-  // ...
-  vue: {
-    loaders: {
-      js: 'babel!eslint'
+  // Webpack 2.x config
+module: {
+  rules: [
+    {
+      test: /\.vue$/,
+      loader: 'vue-loader',
+      options: {
+        loaders: {
+          js: 'babel-loader!eslint-loader'
+        }
+      }
     }
-  }
-  ```
+  ]
+}
+```
+
+### preLoaders
+
+- 타입: `{ [lang: string]: string }`
+- only supported in >=10.3.0
+- 10.3.0 버전 이후 지원 
+
+  `loaders` 설정의 포맷과 동일하지만, `preLoaders`는 기본 로더보다 우선하여 language block에 적용됩니다. 이를 사용하면 language block을 미리 처리할 수 있습니다. (일반적인 사용 사례는 빌드 타임에 국제화를 적용하는 경우입니다.)
+
+### postLoaders
+
+- 타입: `{ [lang: string]: string }`
+- 10.3.0 버전 이후 지원 
+
+`loaders` 설정의 포맷과 동일하지만, `preLoaders`는 기본 로더보다 나중에 적용됩니다. 이를 사용하면 language block에 대한 사후 처리를 할 수 있습니다. 약간 복잡합니다.
+
+  - `html`의 경우, 기본 로더의 결과는 컴파일 된 JavaScript 렌더링 함수 코드가 됩니다.
+
+  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고 대부분의 경우 별로 사용할 일은 없습니다. postcss 플러그인을 사용하는 것이 더 좋습니다.
+
 
 ### postcss
 
+> 참고: 11.0.0 이후 PostCSS 설정파일을 사용할 것을 권장합니다. [`postcss-loader` 사용법](https://github.com/postcss/postcss-loader#usage).
+
 - 타입: `Array` 또는 `Function`, `Object`
 - `Object` 타입은 오직 ^8.5.0에서 지원됩니다.
 
@@ -108,7 +138,8 @@ module.exports = {
 ### transformToRequire
 
 - 타입: `{ [tag: string]: string | Array<string> }`
-- 디폴트: `{ img: 'src' }`
+- 디폴트: `{ img: 'src', image: 'xlink:href' }`
+
 
   템플릿 컴파일 중에 컴파일러는 `src` URL과 같은 특정 속성을 `require` 호출로 변환하여 대상 Asset을 Webpack에서 처리할 수 있습니다. 기본 설정은 `<img>` 태그에 `src` 속성을 변환합니다.
 
@@ -129,11 +160,11 @@ module.exports = {
   // webpack 1
   vue: {
     buble: {
-      // Object spread 연산자를 허용합니다.
-      // 참고: 직접 Object.assign polyfill을 제공해야합니다!
+      // object spread 연산자 사용
+      // 참고: Object.assign 에 관한 폴리필을 직접 해야합니다!
       objectAssign: 'Object.assign',
 
-      // `with` 제거 옵션을 끄십시오.
+      // `with` 제거를 끕니다.
       transforms: {
         stripWith: false
       }
@@ -145,13 +176,74 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           buble: {
-            // 같은 옵션입니다.
+            // same options
           }
         }
       }
     ]
   }
   ```
+
+### extractCSS
+
+> 12.0.0에서 추가되었습니다
+
+`extract-text-webpack-plugin`를 사용해 자동으로 CSS를 추출합니다. 대부분의 프리 프로세서를 사용할 수 있으며 프로덕션 모드에서 최소화를 합니다.
+
+전달된 값은 `true`이거나 플러그인의 인스턴스일 수 있습니다. (추출된 여러 파일에 플러그인의 인스턴스를 사용할 수 있습니다)
+
+프로덕션 환경에서만 사용되고, 개발 중에는 핫 리로드가 작동합니다.
+
+예제:
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+또는 플러그인 인스턴스를 전달합니다.
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var plugin = new ExtractTextPlugin("style.css")
+
+module.exports = {
+  // other options...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: plugin
+        }
+      }
+    ]
+  },
+  plugins: [
+    plugin
+  ]
+}
+```
diff --git a/docs/kr/start/spec.md b/docs/kr/start/spec.md
index fa13f0c6b..f819bd36f 100644
--- a/docs/kr/start/spec.md
+++ b/docs/kr/start/spec.md
@@ -1,6 +1,6 @@
 # Vue 컴포넌트 스펙
 
-`*.vue` 파일은 HTML과 유사한 문법을 사용하여 Vue 컴포넌트를 작성하는 사용자 정의 파일입니다. 각 `*.vue` 파일은 `<template>`와 `<script>`, `<style>` 세 가지 유형의 최상위 언어 블럭으로 구성됩니다.
+`*.vue` 파일은 HTML과 같은 문법을 사용하여 Vue 컴포넌트를 작성합니다. 각각의 `*.vue` 파일은 3가지 유형의 최상위 language block인 `<template>`, `<script>`와 `<style>`로 이루어집니다.
 
 ``` html
 <template>
@@ -22,53 +22,65 @@ export default {
   color: red;
 }
 </style>
+
+<custom1>
+  예: 컴포넌트에 대한 설명서
+</custom1>
 ```
 
-`vue-loader`는 파일을 파싱하고 각 언어 블럭을 추출한 다음 필요한 경우 다른 로더를 통해 파이프를 구성하고 `module.exports`가 Vue.js 옵션 객체인 CommonJS 모듈로 다시 합쳐줍니다.
+`vue-loader`는 파일을 파싱하고 각 language block을 추출하며 필요한 경우 다른 로더를 통해 파이프 처리한 후 마지막으로 Module.exports가 Vue.js 컴포넌트 엘리먼트 옵션 객체인 CommonJS 모듈로 다시 조합합니다.
 
-`vue-loader`는 언어 블럭에 `lang` 속성을 지정하여 CSS 전처리기 혹은 HTML 컴파일 언어를 사용할 수 있습니다. 예를 들어, 다음과 같이 컴포넌트에 SASS를 사용할 수 있습니다.
+`vue-loader`는 language block에 `lang` 속성을 지정하여 CSS 전처리기나 HTML에서 템플릿을 컴파일 하는 것과 같은 기본 언어가 아닌 것을 사용할 수 있게 합니다. 예를 들어 컴포넌트 스타일에 SASS를 사용할 수 있습니다.
 
 ``` html
 <style lang="sass">
-  /* SASS를 사용하세요! */
+  /* write SASS! */
 </style>
 ```
 
-자세한 내용은 [전처리기 사용하기](../configurations/pre-processors.md)에서 확인할 수 있습니다.
+[Pre-Processors 사용방법](../configurations/pre-processors.md)을 확인하세요.
 
-### 언어 블록
+### Language Blocks
 
 #### `<template>`
 
-- 기본 언어: `html`.
-
-- 각 `*.vue` 파일은 하나의 `<template>` 블럭을 포함 할 수 있습니다.
+- 기본 언어 : `html`.
 
-- 내용은 문자열로 출력되어 컴파일된 Vue 컴포넌트의 `template` 옵션에 사용됩니다.
+- 각 `*.vue` 파일은 한번에 최대 하나의 `<template>` 블록을 포함할 수 있습니다.
+ 
+- 내용은 문자열로 추출되어 컴파일 된 Vue 컴포넌트의 `template` 옵션으로 사용합니다.
 
 #### `<script>`
 
-- 기본 언어: `js` (만약 `babel-loader` 또는 `buble-loader`를 사용한다면 ES2015를 자동으로 지원합니다).
+- 기본 언어 : `js` (ES2015는`babel-loader` 또는`bubble-loader`가 감지되면 자동으로 지원됩니다).
 
-- 각 `*.vue` 파일은 하나의 `<script>` 블럭을 포함 할 수 있습니다.
+- 각 `*.vue` 파일은 한번에 최대 하나의 `<script>` 블록을 포함할 수 있습니다.
 
-- 이 스크립트는 CommonJS와 같은 환경(Webpack을 통해 번들로 제공되는 `.js` 모듈처럼)에서 실행되기 때문에 다른 파일을 `require()` 할 수 있습니다. 또한 ES2015을 지원하면 `import`와 `export`를 사용할 수 있습니다.
+- 스크립트는 CommonJS와 같은 (Webpack을 통해 번들된 일반적인 `.js` 모듈같은)환경 에서  실행됩니다. 다른 의존성을 `require()`할 수 있습니다. 또한 ES2015를 지원하여 `import`와 `export`를 사용할 수 있습니다.
 
-- 스크립트는 Vue.js 컴포넌트 옵션 객체를 내보내야 합니다. `Vue.extend()`에 의해 만들어진 확장 생성자를 내보내는 것도 가능하지만, 일반 객체를 선호합니다.
+- 스크립트는 Vue.js 컴포넌트 옵션 객체를 내보내야합니다. `Vue.extend()`에 의해 생성된 확장 생성자를 export하는 것도 지원되지만 평범한 객체를 추천합니다.
 
 #### `<style>`
 
-- 기본 언어: `css`.
+- 기본 언어 : `css`.
+
+- 한개의 `*.vue`에서 여러개의 `<style>`태그를 지원합니다.
+
+- `<style>`태그는 `scoped` 또는 `module` 속성을 가질 수 있습니다. ([Scoped CSS](../features/scoped-css.md)와 [CSS Modules](../features/css-modules.md)를 확인하세요) 현재 컴포넌트에 스타일을 캡슐화 하는데 도움을 줍니다. 캡슐화 모드는 다른 여러개의 `<style>` 태그를 동일한 컴포넌트에 사용할 수 있습니다.
+
+- 기본적으로, 내용이 추출되어 `style-loader`를 사용해 실제로 `<style>` 태그로 문서의 `<head>`에 동적으로 삽입됩니다. [모든 컴포넌트의 모든 스타일이 하나의 CSS 파일로 추출되도록  Webpack을 설정](../configurations/extract-css.md)할 수 있습니다.
+- 
+### 사용자 정의 블록
 
-- 여러 개의 `<style>` 태그가 하나의 `*.vue` 파일에 포함될 수 있습니다.
+> 10.2.0 이상에서 지원합니다.
 
-- `<style>` 태그는 컴포넌트에 스타일을 캡슐화 할 수 있도록 `scoped` 또는 `module` 속성을 사용할 수 있습니다. ([범위를 가지는 CSS](../features/scoped-css.md)와 [CSS 모듈](../features/css-modules.md)을 참고하세요)  여러 개의 `<style>` 태그로 동일한 컴포넌트에 캡슐화 모드를 혼합하여 사용 할 수 있습니다.
+사용자 정의 블록은 `<docs>` 블록과 같이 프로젝트에 한정되는 요구에 따라 추가적으로 사용할 수 있습니다. `vue-loader`는 태그 이름을 사용해 섹션의 내용에 적용할 Webpack 로더를 찾습니다. 로더는 `vue-loader` 옵션의 `loaders` 섹션에 지정되어야 합니다.
 
-- 기본적으로 컨텐츠는 추출되고 `style-loader`를 사용하여 문서의 `<head>`에서 `<style>`태그로 동적으로 삽입됩니다. 또한 모든 [컴포넌트의 스타일이 단일 CSS 파일로 추출되도록](../configurations/extract-css.md) Webpack을 구성할 수 있습니다.
+[사용자 정의 블록](../configurations/custom-blocks.md)에서 자세히 다룹니다.
 
-### Src로 가져오기
+### Src Imports
 
-`*.vue` 컴포넌트를 여러 파일로 분할하려 할 경우 `src` 속성을 사용하여 언어 블럭에 대한 외부 파일을 가져올 수 있습니다.
+`*.vue` 컴포넌트를 여러개로 나누고 싶으면 `src` 속성을 사용해 language block을 위한 외부 파일을 가져올 수 있습니다.
 
 ``` html
 <template src="./template.html"></template>
@@ -76,17 +88,25 @@ export default {
 <script src="./script.js"></script>
 ```
 
-`src`로 가져오기가 CommonJS `require()` 호출과 동일한 경로 확인 규칙을 따르기 때문에 주의해야 합니다. 즉, `./`로 시작해야하는 상대 경로를 의미하며 설치된 NPM 패키지에서 직접 리소스를 가져올 수 있습니다.
+`src` import는 CommonJS의 `require()` 호출과 동일한 경로 규칙을 사용하므로 `./`로 시작하는 상대 경로를 이용해 NPM 패키지를 직접 가져올 수 있습니다.
 
 ``` html
-<!-- 설치된 NPM 패키지 "todomvc-app-css"에서 파일을 불러옵니다 -->
+<!-- "todomvc-app-css" npm package에서 파일을 가져옵니다. -->
 <style src="todomvc-app-css/index.css">
 ```
 
+`src`는 사용자 정의 블록에서도 사용 가능합니다.
+
+``` html
+<unit-test src="./unit-test.js">
+</unit-test>
+```
+
 ### 구문 강조
 
-현재 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm 등)에 구문강조 기능이 있습니다. 다른 에디터/IDE에 대한 컨트리뷰션은 매우 환영합니다! 만약 에디터/IDE에서 구문 강조를 지원하지 않고, Vue 컴포넌트에서 전처리기를 사용하지 않는 경우 에디터에서 `*.vue` 파일을 HTML 형태로 보는 것을 추천합니다.
+현재 구문강조는 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), 와 [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 등)을 지원합니다. 다른 편집기/IDE에 대한 기여를 원합니다! Vue 컴포넌트에서 프리 프로세서를 사용하지 않는 경우 `*.vue`파일을 HTML로 인식하여 사용할 수도 있습니다.
+
 
 ### 주석
 
-각 블럭 안에는 사용되는 언어의 주석 처리 방법을 사용해야 합니다. 최상위 수준의 주석은 HTML 주석 처리 방법을 사용해주세요. `<!-- 주석 내용을 여기에 적어주세요 -->`
+각 블록안에서 사용하는 언어(HTML, CSS, JavaScript, Jade, etc)의 주석 문법을 사용해야합니다. 최상위 수준의 주석은 HTML 구문을 사용합니다. `<!-- comment contents here -->`

From c73a71902d6588d8189a79ed9eb1720ffc03ec0f Mon Sep 17 00:00:00 2001
From: angellicacardozo <angellica.c.a@gmail.com>
Date: Wed, 3 May 2017 18:13:21 -0300
Subject: [PATCH 620/877] Improving PT BR translation for some sentences (#804)

---
 docs/pt_BR/README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/pt_BR/README.md b/docs/pt_BR/README.md
index 83829dedb..65d746569 100644
--- a/docs/pt_BR/README.md
+++ b/docs/pt_BR/README.md
@@ -2,11 +2,11 @@
 
 ### O que é `vue-loader`?
 
-`vue-loader` é um carregador para Webpack que pode transformar componentes Vue no seguinte formato em um módulo JavaScript simples:
+`vue-loader` é um carregador para Webpack capaz de transformar componentes Vue, como o exemplo abaixo, em um módulo JavaScript sem formatação:
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
-Existem muitos recursos interessantes fornecidos por `vue-loader`:
+O `vue-loader` fornece muitos recursos interessantes:
 
 - ES2015 habilitado por padrão;
 - Permite usar outros carregadores Webpack para cada parte de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
@@ -15,24 +15,24 @@ Existem muitos recursos interessantes fornecidos por `vue-loader`:
 - Pode simular escopo CSS para cada componente;
 - Suporta componente hot-reloading durante desenvolvimento;
 
-Em poucas palavras, a combinação de Webpack e `vue-loader` oferece um moderno, flexível e extremamente poderoso fluxo de trabalho front-end para criação de aplicações Vue.js.
+Em poucas palavras, a combinação de Webpack e `vue-loader` oferece um fluxo de trabalho front-end moderno, flexível e extremamente poderoso para criação de aplicações Vue.js.
 
 ### O que é Webpack?
 
-Se você já está familiarizado com Webpack, sinta-se livre para pular está explicação. Mas para aqueles de vocês que são novos com Webpack, aqui está uma pequena introdução:
+Se você já esta familiarizado com o Webpack, fique à vontade para pular esta seção. Para aqueles que não conhecem o Webpack, aqui segue uma rápida introdução:
 
 [Webpack](http://webpack.github.io/) é um empacotador de módulo. Ele pega um grupo de arquivos, trata cada um como um módulo, descobre as dependências entre eles e empacota em ativos estáticos prontos para implantação.
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
-Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. Eles não podem rodar diretamente dentro do navegador, então precisamos empacotá-los dentro de um único arquivo que pode ser incluído através de uma tag `<script>`. Webpack pode seguir as dependências das chamadas  `require()` e fazer isso para nós.
+Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. Eles não podem rodar diretamente dentro do navegador, então precisamos empacotá-los dentro de um único arquivo que pode ser incluído através de uma tag `<script>`. Webpack é capaz de mapear as dependências injetadas pelas chamadas `require()` e empacotá-las para nós.
 
-Mas Webpack pode fazer mais do que isso. Com "loaders", podemos ensinar Webpack a transformar todos os tipos de arquivos dá maneira que quisermos antes da saída final do pacote. Alguns exemplos incluem:
+Mais do que isso, com o uso dos "loaders" o Webpack é capaz de transformar todos os tipos de arquivos da maneira como quisermos, antes do término da geração do pacote. Alguns exemplos incluem:
 
 - Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
-- Opcionalmente você pode canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
-- Transpilar modelos Jade em HTML simples em seguida colocá-lo como uma sequência de string JavaScript;
-- Traspilar arquivos SASS em CSS simples, em seguida os converter em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
-- Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5; 
+- Você pode escolher se quer canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
+- Transpilar modelos Jade em HTML sem formatação e em seguida colocá-lo como uma sequência de string JavaScript;
+- Traspilar arquivos SASS em CSS sem formatação, em seguida os converter em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
+- Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5;
 
-Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `vue-loader`.
\ No newline at end of file
+Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `vue-loader`.

From 6a93a037172c6bb9501b30ef5ecf3b591f8a136f Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Thu, 4 May 2017 06:23:05 +0900
Subject: [PATCH 621/877] fix documentation URL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8212349e5..44b999183 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ npm run dev
 
 This will setup a basic Webpack + `vue-loader` project for you, with `*.vue` files and hot-reloading working out of the box!
 
-For advanced `vue-loader` configuration, checkout the [documentation](http://vuejs.github.io/vue-loader/index.html).
+For advanced `vue-loader` configuration, checkout the [documentation](https://vue-loader.vuejs.org).

From 501cf3e379d58099d09a11c1cd77f024b0e008a9 Mon Sep 17 00:00:00 2001
From: Brian Zelip <brian.zelip@gmail.com>
Date: Sat, 6 May 2017 00:19:36 -0400
Subject: [PATCH 622/877] minor typo edit (#806)

encapsulating -> encapsulate
---
 docs/en/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index b271616a5..125ad60b6 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -66,7 +66,7 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - Multiple `<style>` tags are supported in a single `*.vue` file.
 
-- A `<style>` tag can have `scoped` or `module` attributes (see [Scoped CSS](../features/scoped-css.md) and [CSS Modules](../features/css-modules.md)) to help encapsulating the styles to the current component. Multiple `<style>` tags with different encapsulation modes can be mixed in the same component.
+- A `<style>` tag can have `scoped` or `module` attributes (see [Scoped CSS](../features/scoped-css.md) and [CSS Modules](../features/css-modules.md)) to help encapsulate the styles to the current component. Multiple `<style>` tags with different encapsulation modes can be mixed in the same component.
 
 - By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
 

From 26a5c93ad54e21765d188429ad68b91915987bef Mon Sep 17 00:00:00 2001
From: Herrington Darkholme <HerringtonDarkholme@users.noreply.github.com>
Date: Sat, 13 May 2017 16:20:23 +0800
Subject: [PATCH 623/877] fix: extractCSS should only be applied to styles
 (#811)

---
 lib/loader.js |  2 +-
 test/test.js  | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index e584c2291..72339c7d0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -213,7 +213,7 @@ module.exports = function (content) {
       }
     }
 
-    var loader = options.extractCSS
+    var loader = options.extractCSS && type === 'styles'
       ? loaders[lang] || getCSSExtractLoader(lang)
       : loaders[lang]
 
diff --git a/test/test.js b/test/test.js
index 5b9989995..2854fa694 100644
--- a/test/test.js
+++ b/test/test.js
@@ -166,6 +166,32 @@ describe('vue-loader', function () {
     })
   })
 
+  it('pre-processors with extract css', done => {
+    test({
+      entry: './test/fixtures/pre.vue',
+      vue: {
+        extractCSS: true
+      },
+      plugins: [
+        new ExtractTextPlugin('test.output.css')
+      ]
+    }, (window, module) => {
+      var vnode = mockRender(module)
+
+      expect(vnode.children[0].tag).to.equal('h1')
+      expect(vnode.children[1].tag).to.equal('comp-a')
+      expect(vnode.children[2].tag).to.equal('comp-b')
+
+      expect(module.data().msg).to.contain('Hello from coffee!')
+
+      var css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
+
+      done()
+    })
+  })
+
   it('scoped style', done => {
     test({
       entry: './test/fixtures/scoped-css.vue',

From 25aabe48492c89ffc5b87d29b3ac861410baf939 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 13 May 2017 16:20:49 +0800
Subject: [PATCH 624/877] 12.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1b1809711..6605c2464 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 635e96c85367d781b0107464ebc85dbd4dbb5a05 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Tue, 16 May 2017 23:36:27 +0900
Subject: [PATCH 625/877] update ja docs and other (#812)

* update scoped use data attribute

* update other langulages

* update extract css section

NOTE:
  pick up from https://github.com/vuejs/vue-loader/commit/5c9b80cd7742f57a2ea0e2364ac3d2ffd8848182

* translate previous commit

* fix miss-translation
---
 docs/ja/configurations/extract-css.md | 41 ++++++++++++++++++++++++---
 docs/ja/features/scoped-css.md        |  4 +--
 docs/pt_BR/features/scoped-css.md     | 10 +++----
 docs/zh-cn/features/scoped-css.md     |  4 +--
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/docs/ja/configurations/extract-css.md b/docs/ja/configurations/extract-css.md
index 63956ba34..e166a56a8 100644
--- a/docs/ja/configurations/extract-css.md
+++ b/docs/ja/configurations/extract-css.md
@@ -1,13 +1,46 @@
 # CSS を単一のファイルに抽出する
 
-すべての Vue コンポーネントで処理されたすべての CSS を 1 つの CSS ファイルに抽出する例:
-
-### Webpack 2.x
-
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
 ```
 
+## 簡単な方法
+
+> vue-loader@^12.0.0 と webpack@^2.0.0 必須
+
+``` js
+// webpack.config.js
+var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+module.exports = {
+  // 他のオプション...
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          extractCSS: true
+        }
+      }
+    ]
+  },
+  plugins: [
+    new ExtractTextPlugin("style.css")
+  ]
+}
+```
+
+上記は、`*.vue` ファイル内部の `<style>` のための抽出を自動的に処理し、ほとんどのプリプロセッサでそのまま使えます。
+
+これは、`*.vue` ファイルだけを抽出することに注意してください。JavaScript でインポートされた CSS は、別途設定する必要があります。
+
+## 手動設定
+
+すべての Vue コンポーネントで処理されたすべての CSS を 1 つの CSS ファイルに抽出する例:
+
+### Webpack 2.x
+
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
diff --git a/docs/ja/features/scoped-css.md b/docs/ja/features/scoped-css.md
index f58728e47..207d00a1d 100644
--- a/docs/ja/features/scoped-css.md
+++ b/docs/ja/features/scoped-css.md
@@ -18,13 +18,13 @@
 
 ``` html
 <style>
-.example[_v-f3f3eg9] {
+.example[data-v-f3f3eg9] {
   color: red;
 }
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>hi</div>
+  <div class="example" data-v-f3f3eg9>hi</div>
 </template>
 ```
 
diff --git a/docs/pt_BR/features/scoped-css.md b/docs/pt_BR/features/scoped-css.md
index 700cfc9af..ce104cb7f 100644
--- a/docs/pt_BR/features/scoped-css.md
+++ b/docs/pt_BR/features/scoped-css.md
@@ -18,13 +18,13 @@ Para o seguinte:
 
 ```html
 <style>
-  .example[_v-f3f3eg9] {
-    color: red;
-  }
+.example[data-v-f3f3eg9] {
+   color: red;
+ }
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>hi</div>
+  <div class="example" data-v-f3f3eg9>hi</div>
 </template>
 ```
 
@@ -48,4 +48,4 @@ Para o seguinte:
 
 4. **Os estilos com escopo não eliminam a necessidade de classes**. Devido a forma como navegadores processam vários seletores CSS, `p { color: red }` irá ser muitas vezes mais lento quando com escopo \(exemplo: quando combinado com um seletor de atributo\). Se você usa classes ou ids ao invés, como em `.example { color: red }`, então você elimina praticamente esse desempenho atingido. [Aqui está um playground](http://stevesouders.com/efws/css-selectors/csscreate.php) onde você pode testar as diferenças você mesmo.
 
-5. **Tenha cuidado com seletores descendentes em componentes recursivos!** Para uma regra CSS com o seletor `.a .b`, se o elemento que coincide com `.a` contém um componente filho recursivo, então todos os `.b` nesse componente filho serão correspondidos pela regra.
\ No newline at end of file
+5. **Tenha cuidado com seletores descendentes em componentes recursivos!** Para uma regra CSS com o seletor `.a .b`, se o elemento que coincide com `.a` contém um componente filho recursivo, então todos os `.b` nesse componente filho serão correspondidos pela regra.
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
index 7f533f7d3..237e0321e 100644
--- a/docs/zh-cn/features/scoped-css.md
+++ b/docs/zh-cn/features/scoped-css.md
@@ -18,13 +18,13 @@
 
 ``` html
 <style>
-.example[_v-f3f3eg9] {
+.example[data-v-f3f3eg9] {
   color: red;
 }
 </style>
 
 <template>
-  <div class="example" _v-f3f3eg9>hi</div>
+  <div class="example" data-v-f3f3eg9>hi</div>
 </template>
 ```
 

From 705f78ff6629bc1bcd108e633a1022fb39d21d11 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 18 May 2017 16:37:52 +0800
Subject: [PATCH 626/877] support 2.4 ssr optimization

---
 lib/template-compiler/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index e3b3092cc..bfc7a1465 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -22,10 +22,15 @@ module.exports = function (html) {
 
   var compilerOptions = {
     preserveWhitespace: options.preserveWhitespace,
-    modules: defaultModules.concat(userModules || [])
+    modules: defaultModules.concat(userModules || []),
+    scopedId: options.id
   }
 
-  var compiled = compiler.compile(html, compilerOptions)
+  var compile = isServer && compiler.ssrCompile
+    ? compiler.ssrCompile
+    : compiler.compile
+
+  var compiled = compile(html, compilerOptions)
 
   // tips
   if (compiled.tips && compiled.tips.length) {

From 5c6cca67c159ad5fa7780059725396ad24c42582 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 18 May 2017 17:25:17 +0800
Subject: [PATCH 627/877] 12.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6605c2464..144d77d17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.0.4",
+  "version": "12.1.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 15734036cfc818624a745766a5ed2de17125b682 Mon Sep 17 00:00:00 2001
From: An Yan <xiaoyanjinx@gmail.com>
Date: Thu, 25 May 2017 22:55:08 +0800
Subject: [PATCH 628/877] fix incorrect regexp (#819)

* fix incorrect regexp

* fix incorrect regexp
---
 docs/en/workflow/linting.md    | 10 +++++-----
 docs/ja/workflow/linting.md    | 10 +++++-----
 docs/kr/workflow/linting.md    | 10 +++++-----
 docs/pt_BR/workflow/linting.md | 10 +++++-----
 docs/ru/workflow/linting.md    | 10 +++++-----
 docs/zh-cn/workflow/linting.md | 10 +++++-----
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index 2971c1232..0c077255e 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -31,7 +31,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue!eslint'
       }
     ]
@@ -51,7 +51,7 @@ module.exports = {
     // only lint local *.vue files
     preLoaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       }
@@ -59,7 +59,7 @@ module.exports = {
     // but use vue-loader for all *.vue files
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue'
       }
     ]
@@ -78,13 +78,13 @@ module.exports = {
       // only lint local *.vue files
       {
         enforce: 'pre',
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
       },
       // but use vue-loader for all *.vue files
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue-loader'
       }
     ]
diff --git a/docs/ja/workflow/linting.md b/docs/ja/workflow/linting.md
index 8f6e475e9..2612abc41 100644
--- a/docs/ja/workflow/linting.md
+++ b/docs/ja/workflow/linting.md
@@ -31,7 +31,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue!eslint'
       }
     ]
@@ -50,7 +50,7 @@ module.exports = {
     // リント対象はローカルの *.vue ファイルのみ
     preLoaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       }
@@ -58,7 +58,7 @@ module.exports = {
     // しかし全ての *.vue ファイルで vue-loader を使用します
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue'
       }
     ]
@@ -77,13 +77,13 @@ module.exports = {
       // *.vue のみを検査します
       {
         enforce: 'pre',
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
       },
       // しかし全ての *.vue ファイルで vue-loader は使用します
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue-loader'
       }
     ]
diff --git a/docs/kr/workflow/linting.md b/docs/kr/workflow/linting.md
index 7ffe68d46..b23667a13 100644
--- a/docs/kr/workflow/linting.md
+++ b/docs/kr/workflow/linting.md
@@ -31,7 +31,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue!eslint'
       }
     ]
@@ -51,7 +51,7 @@ module.exports = {
     // 오직 로컬 *.vue 파일만 lint합니다.
     preLoaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       }
@@ -59,7 +59,7 @@ module.exports = {
     // 하지만 모든 *.vue 파일에 대해 vue-loader를 사용하세요.
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue'
       }
     ]
@@ -78,13 +78,13 @@ module.exports = {
       // 오직 로컬 *.vue 파일만 lint합니다.
       {
         enforce: 'pre',
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       },
       // 하지만 모든 *.vue 파일에 대해 vue-loader를 사용하세요.
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue'
       }
     ]
diff --git a/docs/pt_BR/workflow/linting.md b/docs/pt_BR/workflow/linting.md
index 647c7299e..731d7bae6 100644
--- a/docs/pt_BR/workflow/linting.md
+++ b/docs/pt_BR/workflow/linting.md
@@ -31,7 +31,7 @@ module.exports = {
     module: {
         loaders: [
             {
-                test: /.vue$/,
+                test: /\.vue$/,
                 loader: 'vue!eslint'
             }
         ]
@@ -51,7 +51,7 @@ module.exports = {
         // lint apenas em arquivos *.vue locais
         preLoaders: [
             {
-                test: /.vue$/,
+                test: /\.vue$/,
                 loader: 'eslint',
                 exclude: /node_modules/
             }
@@ -59,7 +59,7 @@ module.exports = {
         // mas usa vue-loader para todos arquivos *.vue
         loaders: [
             {
-                test: /.vue$/,
+                test: /\.vue$/,
                 loader: 'vue'
             }
         ]
@@ -78,13 +78,13 @@ module.exports = {
             // lint apenas em arquivos *.vue locais
             {
                 enforce: 'pre',
-                test: /.vue$/,
+                test: /\.vue$/,
                 loader: 'eslint-loader',
                 exclude: /node_modules/
             },
             // mas usa vue-loader para todos arquivos *.vue
             {
-                test: /.vue$/,
+                test: /\.vue$/,
                 loader: 'vue-loader'
             }
         ]
diff --git a/docs/ru/workflow/linting.md b/docs/ru/workflow/linting.md
index e55a1171b..028a117ff 100644
--- a/docs/ru/workflow/linting.md
+++ b/docs/ru/workflow/linting.md
@@ -31,7 +31,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue!eslint'
       }
     ]
@@ -51,7 +51,7 @@ module.exports = {
     // анализировать только локальные *.vue файлы
     preLoaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       }
@@ -59,7 +59,7 @@ module.exports = {
     // но использовать vue-loader для всех *.vue файлов
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue'
       }
     ]
@@ -78,13 +78,13 @@ module.exports = {
       // анализировать только локальные *.vue файлы
       {
         enforce: 'pre',
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
       },
       // но использовать vue-loader для всех *.vue файлов
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue-loader'
       }
     ]
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
index 97c57f02b..b5524aa16 100644
--- a/docs/zh-cn/workflow/linting.md
+++ b/docs/zh-cn/workflow/linting.md
@@ -30,7 +30,7 @@ module.exports = {
   module: {
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue!eslint'
       }
     ]
@@ -50,7 +50,7 @@ module.exports = {
     // only lint local *.vue files
     preLoaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint',
         exclude: /node_modules/
       }
@@ -58,7 +58,7 @@ module.exports = {
     // but use vue-loader for all *.vue files
     loaders: [
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue'
       }
     ]
@@ -77,13 +77,13 @@ module.exports = {
       // only lint local *.vue files
       {
         enforce: 'pre',
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
       },
       // but use vue-loader for all *.vue files
       {
-        test: /.vue$/,
+        test: /\.vue$/,
         loader: 'vue-loader'
       }
     ]

From bd525fdcb90bc9f157bc14f5968f306cfb94f9eb Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 May 2017 10:08:45 +0800
Subject: [PATCH 629/877] avoid multiple webpack runs complaining about unknown
 option (fix #824)

---
 lib/loader.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 72339c7d0..58c149038 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -49,9 +49,15 @@ module.exports = function (content) {
 
   var loaderContext = this
   var query = loaderUtils.getOptions(this) || {}
-  var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
-  var rawRequest = getRawRequest(this, options.excludedPreLoaders)
+  var options = Object.assign({}, this.options.vue, this.vue, query)
+  // #824 avoid multiple webpack runs complaining about unknown option
+  Object.defineProperty(this.options, '__vueOptions__', {
+    value: options,
+    enumerable: false,
+    configurable: true
+  })
 
+  var rawRequest = getRawRequest(this, options.excludedPreLoaders)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
 

From c8cf57d422675bd67d7f64a92fbc871fa7426f19 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 May 2017 16:07:09 +0800
Subject: [PATCH 630/877] simplify template preprocessor

---
 lib/loader.js                         |  2 +-
 lib/template-compiler/preprocessor.js | 25 +------------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 58c149038..e861cf593 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -254,7 +254,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templatePreprocessorPath + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templatePreprocessorPath + '?engine=' + lang + '!'
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
           return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index 860b099e2..1904b98e9 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -2,35 +2,12 @@
 
 var cons = require('consolidate')
 var loaderUtils = require('loader-utils')
-var extname = require('path').extname
 
 module.exports = function (content) {
   this.cacheable && this.cacheable()
   var callback = this.async()
   var opt = loaderUtils.getOptions(this) || {}
 
-  // this is never documented and should be deprecated
-  // but we'll keep it so we don't break stuff
-  var vue = this.options.__vueOptions__
-  if (vue && vue.template) {
-    for (var key in vue.template) {
-      opt[key] = vue.template[key]
-    }
-  }
-
-  function exportContent (content) {
-    if (opt.raw) {
-      callback(null, content)
-    } else {
-      callback(null, 'module.exports = ' + JSON.stringify(content))
-    }
-  }
-
-  // with no engine given, use the file extension as engine
-  if (!opt.engine) {
-    opt.engine = extname(this.request).substr(1).toLowerCase()
-  }
-
   if (!cons[opt.engine]) {
     return callback(new Error(
       'Template engine \'' + opt.engine + '\' ' +
@@ -45,6 +22,6 @@ module.exports = function (content) {
     if (err) {
       return callback(err)
     }
-    exportContent(html)
+    callback(null, html)
   })
 }

From f615dd6b8e31ae82103b10feb6a8aa8a396ab5ec Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 May 2017 16:39:03 +0800
Subject: [PATCH 631/877] add optimizeSSR option + improve option docs in
 sidebar

---
 docs/en/SUMMARY.md             | 11 +++++++++++
 docs/en/options.md             | 20 ++++++++++++++++----
 lib/template-compiler/index.js |  2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 5aecdfcf5..22001aabd 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -19,3 +19,14 @@
   - [Testing](workflow/testing.md)
   - [Testing with Mocks](workflow/testing-with-mocks.md)
 - [Options Reference](options.md)
+  - [loaders](options.md#loaders)
+  - [preLoaders](options.md#preloaders)
+  - [postLoaders](options.md#postloaders)
+  - [postcss](options.md#postcss)
+  - [cssSourceMap](options.md#csssourcemap)
+  - [esModule](options.md#esmodule)
+  - [preserveWhitespace](options.md#preservewhitespace)
+  - [transformToRequire](options.md#transformtorequire)
+  - [buble](options.md#buble)
+  - [extractCSS](options.md#extractcss)
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/en/options.md b/docs/en/options.md
index 06cba5169..dcb2ad3dd 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -114,7 +114,7 @@ module.exports = {
 
 ### cssSourceMap
 
-- type: `Boolean`
+- type: `boolean`
 - default: `true`
 
   Whether to enable source maps for CSS. Disabling this can avoid some relative path related bugs in `css-loader` and make the build a bit faster.
@@ -123,14 +123,14 @@ module.exports = {
 
 ### esModule
 
-- type: `Boolean`
-- default: `undefined`
+- type: `boolean`
+- default: `false`
 
   Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
 
 ### preserveWhitespace
 
-- type: `Boolean`
+- type: `boolean`
 - default: `true`
 
   If set to `false`, the whitespaces between HTML tags in templates will be ignored.
@@ -190,6 +190,9 @@ module.exports = {
 
 > New in 12.0.0
 
+- type: `boolean`
+- default: `false`
+
 Automatically extracts the CSS using `extract-text-webpack-plugin`. Works for most pre-processors out of the box, and handles minification in production as well.
 
 The value passed in can be `true`, or an instance of the plugin (so that you can use multiple instances of the extract plugin for multiple extracted files).
@@ -246,3 +249,12 @@ module.exports = {
   ]
 }
 ```
+
+### optimizeSSR
+
+> New in 12.1.1
+
+- type: `boolean`
+- default: `true` when the webpack config has `target: 'node'` and `vue-template-compiler` is at version 2.4.0 or above.
+
+Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees returned by render functions into plain strings, which improves SSR performance. In some cases you might want to explicitly turn it off because the resulting render functions can only be used for SSR and cannot be used for client-side rendering or testing.
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index bfc7a1465..7917a5a26 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -26,7 +26,7 @@ module.exports = function (html) {
     scopedId: options.id
   }
 
-  var compile = isServer && compiler.ssrCompile
+  var compile = isServer && compiler.ssrCompile && vueOptions.optimizeSSR !== false
     ? compiler.ssrCompile
     : compiler.compile
 

From e7341f6f900965632d3fe12cc11c5bbed3e924ad Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 May 2017 16:39:19 +0800
Subject: [PATCH 632/877] 12.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 144d77d17..592f2ad1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.1.0",
+  "version": "12.1.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From b9c4894e671d1a8c6823f08c2ea298520e6ee971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Sat, 27 May 2017 07:26:03 +0200
Subject: [PATCH 633/877] Update webpack url (#830)

The link now points to webpack 2 instead of webpack 1
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 44b999183..8f6966d43 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![Windows Build status](https://ci.appveyor.com/api/projects/status/8cdonrkbg6m4k1tm/branch/master?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-loader/branch/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg?maxAge=2592000)](https://www.npmjs.com/package/vue-loader)
 
-> Vue.js component loader for [Webpack](http://webpack.github.io).
+> Vue.js component loader for [Webpack](https://webpack.js.org/).
 
 **NOTE: the master branch (9.0+) only works with Vue 2.x. For usage with Vue 1.x, see the [8.x branch](https://github.com/vuejs/vue-loader/tree/8.x).**
 

From 8948f1cacb4966d0361c9377a912c89f2a6d7056 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 27 Apr 2017 13:54:53 +0800
Subject: [PATCH 634/877] make keyframes scoped (properly)

---
 lib/style-compiler/plugins/scope-id.js | 42 ++++++++++++++++++++++++--
 test/fixtures/scoped-css.vue           | 11 +++++++
 test/test.js                           | 10 ++++--
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index dbcad9fd6..8e64630b9 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -3,11 +3,18 @@ var selectorParser = require('postcss-selector-parser')
 
 module.exports = postcss.plugin('add-id', function (opts) {
   return function (root) {
+    var keyframes = Object.create(null)
+
     root.each(function rewriteSelector (node) {
       if (!node.selector) {
         // handle media queries
-        if (node.type === 'atrule' && node.name === 'media') {
-          node.each(rewriteSelector)
+        if (node.type === 'atrule') {
+          if (node.name === 'media') {
+            node.each(rewriteSelector)
+          } else if (node.name === 'keyframes') {
+            // register keyframes
+            keyframes[node.params] = node.params = node.params + '-' + opts.id
+          }
         }
         return
       }
@@ -23,5 +30,36 @@ module.exports = postcss.plugin('add-id', function (opts) {
         })
       }).process(node.selector).result
     })
+
+    // If keyframes are found in this <style>, find and rewrite animation names
+    // in declarations
+    //
+    // TODO: the keyframes tracking needs to be across multiple <style> tags
+    // that belongs to the same component...
+    if (Object.keys(keyframes).length) {
+      root.walkDecls(decl => {
+        // individual animation-name declaration
+        if (/-?animation-name$/.test(decl.prop)) {
+          decl.value = decl.value.split(',')
+            .map(v => keyframes[v.trim()])
+            .filter(v => v)
+            .join(',')
+        }
+        // shorthand
+        if (/-?animation$/.test(decl.prop)) {
+          decl.value = decl.value.split(',')
+            .map(v => {
+              var vals = v.split(/\s+/)
+              var name = vals[0]
+              if (keyframes[name]) {
+                return [keyframes[name]].concat(vals.slice(1)).join(' ')
+              } else {
+                return v
+              }
+            })
+            .join(',')
+        }
+      })
+    }
   }
 })
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index ce28b06bd..057749c11 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -8,6 +8,17 @@
 h1 {
   color: green;
 }
+.anim {
+  animation: color 5s infinite, other 5s;
+}
+.anim-2 {
+  animation-name: color;
+  animation-duration: 5s;
+}
+@keyframes color {
+  from { color: red; }
+  to { color: green; }
+}
 </style>
 
 <template>
diff --git a/test/test.js b/test/test.js
index 2854fa694..7653ef903 100644
--- a/test/test.js
+++ b/test/test.js
@@ -220,9 +220,13 @@ describe('vue-loader', function () {
 
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
-      expect(style).to.contain('.test[' + id + '] {\n  color: yellow;\n}')
-      expect(style).to.contain('.test[' + id + ']:after {\n  content: \'bye!\';\n}')
-      expect(style).to.contain('h1[' + id + '] {\n  color: green;\n}')
+      expect(style).to.contain(`.test[${id}] {\n  color: yellow;\n}`)
+      expect(style).to.contain(`.test[${id}]:after {\n  content: \'bye!\';\n}`)
+      expect(style).to.contain(`h1[${id}] {\n  color: green;\n}`)
+      // scoped keyframes
+      expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id} 5s infinite, other 5s;`)
+      expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
+      expect(style).to.contain(`@keyframes color-${id} {`)
       done()
     })
   })

From e07ac33245074f1194c049037dbd3421bf1f0fef Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 27 May 2017 16:43:00 +0800
Subject: [PATCH 635/877] fix single animation name

---
 lib/style-compiler/plugins/scope-id.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index 8e64630b9..7f93d7d11 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -32,17 +32,15 @@ module.exports = postcss.plugin('add-id', function (opts) {
     })
 
     // If keyframes are found in this <style>, find and rewrite animation names
-    // in declarations
-    //
-    // TODO: the keyframes tracking needs to be across multiple <style> tags
-    // that belongs to the same component...
+    // in declarations.
+    // Caveat: this only works for keyframes and animation rules in the same
+    // <style> element.
     if (Object.keys(keyframes).length) {
       root.walkDecls(decl => {
         // individual animation-name declaration
         if (/-?animation-name$/.test(decl.prop)) {
           decl.value = decl.value.split(',')
-            .map(v => keyframes[v.trim()])
-            .filter(v => v)
+            .map(v => keyframes[v.trim()] || v.trim())
             .join(',')
         }
         // shorthand

From 9087f9ff8a3db3cd4fce1519e2499657b331c7b1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 27 May 2017 18:39:58 +0800
Subject: [PATCH 636/877] support >>> combinator

---
 lib/style-compiler/plugins/scope-id.js | 6 ++++++
 test/fixtures/scoped-css.vue           | 3 +++
 test/test.js                           | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index 7f93d7d11..e7f604e4f 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -22,6 +22,12 @@ module.exports = postcss.plugin('add-id', function (opts) {
         selectors.each(function (selector) {
           var node = null
           selector.each(function (n) {
+            // "deep" combinator
+            if (n.type === 'combinator' && n.value === '>>>') {
+              n.value = ' '
+              n.spaces.before = n.spaces.after = ''
+              return false
+            }
             if (n.type !== 'pseudo') node = n
           })
           selector.insertAfter(node, selectorParser.attribute({
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 057749c11..1b5aa0214 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -19,6 +19,9 @@ h1 {
   from { color: red; }
   to { color: green; }
 }
+.foo p >>> .bar {
+  color: red;
+}
 </style>
 
 <template>
diff --git a/test/test.js b/test/test.js
index 7653ef903..369b69906 100644
--- a/test/test.js
+++ b/test/test.js
@@ -227,6 +227,8 @@ describe('vue-loader', function () {
       expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id} 5s infinite, other 5s;`)
       expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
       expect(style).to.contain(`@keyframes color-${id} {`)
+      // >>> combinator
+      expect(style).to.contain(`.foo p[${id}] .bar {\n  color: red;\n}`)
       done()
     })
   })

From 98ceb66dd32e9531251be2373284e3022c1e4bab Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 27 May 2017 18:42:30 +0800
Subject: [PATCH 637/877] 12.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 592f2ad1d..b6852c392 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.1.1",
+  "version": "12.2.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 98751d8c34f88f37995daa70344187248f84803e Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 28 May 2017 22:51:51 +0900
Subject: [PATCH 638/877] update ja docs (#831)

* add options

* translate options

* add toc of options

* improve translation fo review comments
---
 docs/ja/SUMMARY.md | 11 +++++++
 docs/ja/options.md | 82 +++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
index 30141944d..b35c8a221 100644
--- a/docs/ja/SUMMARY.md
+++ b/docs/ja/SUMMARY.md
@@ -19,3 +19,14 @@
   - [テスト](workflow/testing.md)
   - [モックを使用したテスト](workflow/testing-with-mocks.md)
 - [オプションリファレンス](options.md)
+  - [loaders](options.md#loaders)
+  - [preLoaders](options.md#preloaders)
+  - [postLoaders](options.md#postloaders)
+  - [postcss](options.md#postcss)
+  - [cssSourceMap](options.md#csssourcemap)
+  - [esModule](options.md#esmodule)
+  - [preserveWhitespace](options.md#preservewhitespace)
+  - [transformToRequire](options.md#transformtorequire)
+  - [buble](options.md#buble)
+  - [extractCSS](options.md#extractcss)
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/ja/options.md b/docs/ja/options.md
index d9ade93c1..722ce1bd0 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -113,7 +113,7 @@ module.exports = {
 
 ### cssSourceMap
 
-- 型: `Boolean`
+- 型: `boolean`
 - デフォルト: `true`
 
   CSS のソースマップを有効にするかどうか。これを無効にすると、`css-loader` の相対パス関連のバグを避けることができ、ビルドを少し早くすることができます。
@@ -122,14 +122,14 @@ module.exports = {
 
 ### esModule
 
-- 型: `Boolean`
-- デフォルト: `undefined`
+- 型: `boolean`
+- デフォルト: `false`
 
   esModule 互換コードを発行するかどうか。デフォルトの vue-loader のデフォルトの出力は `module.exports = ....` のような commonjs 形式で発行します。 `esModule` が true にセットされているとき、デフォルトの出力は `exports.__esModule = true; exports = ...` にトランスパイルされます。TypeScript のような Babel 以外の transpiler との相互運用に役立ちます。
 
 ### preserveWhitespace
 
-- 型: `Boolean`
+- 型: `boolean`
 - デフォルトx: `true`
 
   もし `false` に設定されていたら、テンプレート内の HTML タグ間の空白は無視されます。
@@ -184,3 +184,77 @@ module.exports = {
     ]
   }
   ```
+
+### extractCSS
+  
+  > 12.0.0 で追加
+  
+  - 型: `boolean`
+  - デフォルト: `false`
+
+  自動的に `extract-text-webpack-plugin` を使用して CSS を抽出します。ほとんどのプリプロセッサに対してすぐに動作し、本番環境においても同様に圧縮 (minify) 処理します。
+  
+  `true` またはプラグインのインスタンス (複数の抽出されたファイルに対して `extract-text-webpack-plugin` の複数のインスタンスを使用できるように) を値として渡すことができます。
+ 
+  これは、開発中にはホットリロードが動作するため本番環境でのみ使用する必要があります。
+  
+  例:
+  
+  ``` js
+  // webpack.config.js
+  var ExtractTextPlugin = require("extract-text-webpack-plugin")
+  
+  module.exports = {
+    // 他のオプション ...
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader',
+          options: {
+            extractCSS: true
+          }
+        }
+      ]
+    },
+    plugins: [
+      new ExtractTextPlugin("style.css")
+    ]
+  }
+  ```
+  
+  または、プラグインのインスタンスを渡します:
+  
+  ``` js
+  // webpack.config.js
+  var ExtractTextPlugin = require("extract-text-webpack-plugin")
+  var plugin = new ExtractTextPlugin("style.css")
+  
+  module.exports = {
+    // 他のオプション ...
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader',
+          options: {
+            extractCSS: plugin
+          }
+        }
+      ]
+    },
+    plugins: [
+      plugin
+    ]
+  }
+  ```
+
+### optimizeSSR
+
+> 12.1.1 で追加
+
+- 型: `boolean`
+- デフォルト: webpack 設定が `target: 'node'` でかつ `vue-template-compiler` が バージョン 2.4.0 以上であれば、`true`
+
+描画 (render) 関数によって返された vdom ツリーの一部をプレーンな文字列にコンパイルする、Vue 2.4 SSR (サーバサイドレンダリング) のコンパイル最適化を有効にして、SSR のパフォーマンスを改善します。
+描画関数の結果が SSR のみを対象としたものになり、クライアントサイドレンダリングまたはテストには使用できなくなるため、あるケースによっては、明示的にオフにしたくなる場合があります。

From 9018b18cb2fc6010a6f6e4c66058c2718c1a7f78 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 May 2017 21:20:17 +0800
Subject: [PATCH 639/877] support /deep/ alias

---
 lib/style-compiler/plugins/scope-id.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index e7f604e4f..e6cbc3db5 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -22,13 +22,24 @@ module.exports = postcss.plugin('add-id', function (opts) {
         selectors.each(function (selector) {
           var node = null
           selector.each(function (n) {
-            // "deep" combinator
+            // ">>>" combinator
             if (n.type === 'combinator' && n.value === '>>>') {
               n.value = ' '
               n.spaces.before = n.spaces.after = ''
               return false
             }
-            if (n.type !== 'pseudo') node = n
+            // /deep/ alias for >>>, since >>> doesn't work in SASS
+            if (n.type === 'tag' && n.value === '/deep/') {
+              var next = n.next()
+              if (next.type === 'combinator' && next.value === ' ') {
+                next.remove()
+              }
+              n.remove()
+              return false
+            }
+            if (n.type !== 'pseudo' && n.type !== 'combinator') {
+              node = n
+            }
           })
           selector.insertAfter(node, selectorParser.attribute({
             attribute: opts.id
@@ -67,3 +78,9 @@ module.exports = postcss.plugin('add-id', function (opts) {
     }
   }
 })
+
+function tryRemove (node) {
+  if (node.value === ' ') {
+
+  }
+}

From 7f8a62b9b341b1f990840c8d67cda9ec4f2b10b9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 May 2017 21:43:24 +0800
Subject: [PATCH 640/877] bring back template option (close #832)

---
 lib/template-compiler/preprocessor.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index 1904b98e9..dd87e858c 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -15,6 +15,11 @@ module.exports = function (content) {
     ))
   }
 
+  // allow passing options to the template preprocessor via `template` option
+  if (this.options.__vueOptions__) {
+    Object.assign(opt, this.options.__vueOptions__.template)
+  }
+
   // for relative includes
   opt.filename = this.resourcePath
 

From 8f9524ae2996cb38c49698a645c26b860ed844e0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 May 2017 21:43:49 +0800
Subject: [PATCH 641/877] remove unused fn

---
 lib/style-compiler/plugins/scope-id.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index e6cbc3db5..d0be6c101 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -78,9 +78,3 @@ module.exports = postcss.plugin('add-id', function (opts) {
     }
   }
 })
-
-function tryRemove (node) {
-  if (node.value === ' ') {
-
-  }
-}

From ec4260fd2308fdc039eb2a1116d4369b8cfbdf1a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 29 May 2017 21:44:25 +0800
Subject: [PATCH 642/877] 12.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b6852c392..daf42911d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.2.0",
+  "version": "12.2.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 1ff9a828b252ce0d8d5af670b6e783865a6674d3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 May 2017 15:19:45 +0800
Subject: [PATCH 643/877] use shorter file path in debug trace

---
 lib/loader.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index e861cf593..97f0869fa 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -63,6 +63,7 @@ module.exports = function (content) {
 
   var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
   var moduleId = 'data-v-' + genId(filePath, context, options.hashKey)
+  var shortFilePath = path.relative(context, filePath).replace(/^(\.\.\/)+/, '')
 
   var cssLoaderOptions = ''
   if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
@@ -470,7 +471,7 @@ module.exports = function (content) {
   // development-only code
   if (!isProduction) {
     // add filename in dev
-    output += 'Component.options.__file = ' + JSON.stringify(filePath) + '\n'
+    output += 'Component.options.__file = ' + JSON.stringify(shortFilePath) + '\n'
     // check named exports
     output +=
       'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +

From 90788a201a7a58733d2a3db86b082422ecfe76ec Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 May 2017 16:18:40 +0800
Subject: [PATCH 644/877] fix test

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 369b69906..35050fbe9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -141,7 +141,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue'
     }, (window, module, rawModule) => {
-      expect(module.__file).to.equal(path.resolve(__dirname, './fixtures/basic.vue'))
+      expect(module.__file).to.equal('test/fixtures/basic.vue')
       done()
     })
   })

From 410de830ff4406f20c7e17d9a1e3d05507ca0e8f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Jun 2017 17:22:56 +0800
Subject: [PATCH 645/877] update eslint config

---
 .eslintrc    |  3 +-
 package.json |  3 +-
 yarn.lock    | 93 +++-------------------------------------------------
 3 files changed, 7 insertions(+), 92 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index d0dd64cbb..5fb8d8499 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,4 +1,5 @@
 {
   "root": true,
-  "extends": "vue"
+  "plugins": ["vue-libs"],
+  "extends": ["plugin:vue-libs/recommended"]
 }
diff --git a/package.json b/package.json
index daf42911d..02c6a3389 100644
--- a/package.json
+++ b/package.json
@@ -56,8 +56,7 @@
     "coffee-script": "^1.10.0",
     "css-loader": "^0.26.0",
     "eslint": "^3.14.1",
-    "eslint-config-vue": "^2.0.2",
-    "eslint-plugin-vue": "^2.0.0",
+    "eslint-plugin-vue-libs": "^1.0.0",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^2.0.0-rc.0",
     "file-loader": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index 7d191b3fa..8204f3d70 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -131,13 +131,6 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
-array.prototype.find@^2.0.1:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
 arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -1246,13 +1239,6 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1302,13 +1288,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^1.2.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
@@ -1412,23 +1391,6 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.0"
-    is-callable "^1.1.3"
-    is-regex "^1.0.3"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
   version "0.10.15"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
@@ -1505,32 +1467,17 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-vue@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-config-vue/-/eslint-config-vue-2.0.2.tgz#a3ab1004899e49327a94c63e24d47a396b2f4848"
-
 eslint-plugin-html@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.1.tgz#3a829510e82522f1e2e44d55d7661a176121fce1"
   dependencies:
     htmlparser2 "^3.8.2"
 
-eslint-plugin-react@^6.9.0:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
-  dependencies:
-    array.prototype.find "^2.0.1"
-    doctrine "^1.2.2"
-    has "^1.0.1"
-    jsx-ast-utils "^1.3.4"
-    object.assign "^4.0.4"
-
-eslint-plugin-vue@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-2.0.1.tgz#814aa24b5a892d1a95a9d65d980a11202e597e3b"
+eslint-plugin-vue-libs@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.1.0.tgz#f4d4ae44fa074a5035221687ba7b72b1c9c2d7a8"
   dependencies:
     eslint-plugin-html "^2.0.0"
-    eslint-plugin-react "^6.9.0"
 
 eslint@^3.14.1:
   version "3.19.0"
@@ -1756,10 +1703,6 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -1800,7 +1743,7 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2, function-bind@^1.1.0:
+function-bind@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
@@ -2118,14 +2061,6 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
@@ -2253,10 +2188,6 @@ is-svg@^2.0.0:
   dependencies:
     html-comment-regex "^1.1.0"
 
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -2416,10 +2347,6 @@ jstransformer@1.0.0:
     is-promise "^2.0.0"
     promise "^7.0.1"
 
-jsx-ast-utils@^1.3.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
-
 kind-of@^3.0.2:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
@@ -2823,18 +2750,6 @@ object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-object-keys@^1.0.10, object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
-
-object.assign@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.0"
-    object-keys "^1.0.10"
-
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"

From e2d998a07edb5dcb9daf0af5b8ae3d2fc99e361e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 2 Jun 2017 11:38:29 +0800
Subject: [PATCH 646/877] update eslint config

---
 .eslintrc    | 1 -
 package.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 5fb8d8499..15241dd62 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,4 @@
 {
   "root": true,
-  "plugins": ["vue-libs"],
   "extends": ["plugin:vue-libs/recommended"]
 }
diff --git a/package.json b/package.json
index 02c6a3389..b51315911 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "coffee-script": "^1.10.0",
     "css-loader": "^0.26.0",
     "eslint": "^3.14.1",
-    "eslint-plugin-vue-libs": "^1.0.0",
+    "eslint-plugin-vue-libs": "^1.2.0",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^2.0.0-rc.0",
     "file-loader": "^0.10.0",

From 29ddd4915df4cc7d4a5a22903d4d68607d9c7c1f Mon Sep 17 00:00:00 2001
From: fnlctrl <fnlctrl@gmail.com>
Date: Tue, 27 Jun 2017 20:28:48 +0800
Subject: [PATCH 647/877] Support webpack 3 module concatenation by using
 `import`s instead of `require`s

---
 lib/loader.js | 76 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 23 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index e861cf593..aa019be9d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -107,6 +107,10 @@ module.exports = function (content) {
     ')'
   }
 
+  function getImport (type, part, index, scoped) {
+    return 'import __vue_' + type + '__ from ' + getRequireString(type, part, index, scoped)
+  }
+
   function getRequireString (type, part, index, scoped) {
     return loaderUtils.stringifyRequest(loaderContext,
       // disable all configuration loaders
@@ -126,6 +130,10 @@ module.exports = function (content) {
     ')'
   }
 
+  function getImportForImport (type, impt, scoped) {
+    return 'import __vue_' + type + '__ from ' + getRequireForImportString(type, impt, scoped)
+  }
+
   function getRequireForImportString (type, impt, scoped) {
     return loaderUtils.stringifyRequest(loaderContext,
       '!!' +
@@ -420,52 +428,74 @@ module.exports = function (content) {
   //   scopeId,
   //   moduleIdentifier (server only)
   // )
-  output += 'var Component = require(' +
-    loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-  ')(\n'
+  if (options.esModule) {
+    output += 'import normalizeComponent from ' +
+      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
+    '\n'
+  } else {
+    output += 'var normalizeComponent = require(' +
+      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
+    ')\n'
+  }
 
   // <script>
-  output += '  /* script */\n  '
+  output += '/* script */\n'
   var script = parts.script
   if (script) {
-    output += script.src
-      ? getRequireForImport('script', script)
-      : getRequire('script', script)
+    if (options.esModule) {
+      output += script.src
+        ? getImportForImport('script', script)
+        : getImport('script', script) + '\n'
+    } else {
+      output += 'var __vue_script__ = ' + (script.src
+        ? getRequireForImport('script', script)
+        : getRequire('script', script)) + '\n'
+    }
     // inject loader interop
     if (query.inject) {
-      output += '(injections)'
+      output += '__vue_script__ = __vue_script__(injections)\n'
     }
   } else {
-    output += 'null'
+    output += 'var __vue_script__ = null\n'
   }
-  output += ',\n'
 
   // <template>
-  output += '  /* template */\n  '
+  output += '/* template */\n'
   var template = parts.template
   if (template) {
-    output += template.src
-      ? getRequireForImport('template', template)
-      : getRequire('template', template)
+    if (options.esModule) {
+      output += (template.src
+        ? getImportForImport('template', template)
+        : getImport('template', template)) + '\n'
+    } else {
+      output += 'var __vue_template__ = ' + (template.src
+        ? getRequireForImport('template', template)
+        : getRequire('template', template)) + '\n'
+    }
   } else {
-    output += 'null'
+    output += 'var __vue_template__ = null\n'
   }
-  output += ',\n'
 
   // style
-  output += '  /* styles */\n  '
-  output += (parts.styles.length ? 'injectStyle' : 'null') + ',\n'
+  output += '/* styles */\n'
+  output += 'var __vue_styles__ = ' + (parts.styles.length ? 'injectStyle' : 'null') + '\n'
 
   // scopeId
-  output += '  /* scopeId */\n  '
-  output += (hasScoped ? JSON.stringify(moduleId) : 'null') + ',\n'
+  output += '/* scopeId */\n'
+  output += 'var __vue_scopeId__ = ' + (hasScoped ? JSON.stringify(moduleId) : 'null') + '\n'
 
   // moduleIdentifier (server only)
-  output += '  /* moduleIdentifier (server only) */\n  '
-  output += (isServer ? JSON.stringify(hash(this.request)) : 'null') + '\n'
+  output += '/* moduleIdentifier (server only) */\n'
+  output += 'var __vue_module_identifier__ = ' + (isServer ? JSON.stringify(hash(this.request)) : 'null') + '\n'
 
   // close normalizeComponent call
-  output += ')\n'
+  output += 'var Component = normalizeComponent(\n' +
+    '  __vue_script__,\n' +
+    '  __vue_template__,\n' +
+    '  __vue_styles__,\n' +
+    '  __vue_scopeId__,\n' +
+    '  __vue_module_identifier__\n' +
+    ')\n'
 
   // development-only code
   if (!isProduction) {

From 4ef5e3b7020dd5479d045662b0a29827d7f80b63 Mon Sep 17 00:00:00 2001
From: fnlctrl <fnlctrl@gmail.com>
Date: Tue, 27 Jun 2017 21:26:04 +0800
Subject: [PATCH 648/877] minor fix

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index aa019be9d..5d1a71bbf 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -581,7 +581,7 @@ module.exports = function (content) {
     }
     // final export
     if (options.esModule) {
-      output += '\nexports.__esModule = true;\nexports["default"] = Component.exports\n'
+      output += '\nexport default Component.exports\n'
     } else {
       output += '\nmodule.exports = Component.exports\n'
     }

From 38da44e16a55d0502361d275792bb773fcfb6a52 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 29 Jun 2017 07:39:39 +0800
Subject: [PATCH 649/877] test: fix CI on windows

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 35050fbe9..e2349b47b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -141,7 +141,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/basic.vue'
     }, (window, module, rawModule) => {
-      expect(module.__file).to.equal('test/fixtures/basic.vue')
+      expect(module.__file).to.equal(path.normalize('test/fixtures/basic.vue'))
       done()
     })
   })

From 0b4fe907820bf648b7ebf0a1f8cc419442b4a58f Mon Sep 17 00:00:00 2001
From: Franco Victorio <victorio.franco@gmail.com>
Date: Thu, 29 Jun 2017 01:40:57 +0200
Subject: [PATCH 650/877] Use `vue-loader` explictly when creating injector
 (#837)

I recently updated a Vue app to Webpack 2 and the injector stopped working. It was difficult to diagnose the problem, until I realized that I had left the injector like in the example from the docs. Using `vue-loader` explicitly in the example works for Webpack 2 and should still (I think) work for Webpack 1.
---
 docs/en/workflow/testing-with-mocks.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
index b1a17838f..645d81aa5 100644
--- a/docs/en/workflow/testing-with-mocks.md
+++ b/docs/en/workflow/testing-with-mocks.md
@@ -36,13 +36,13 @@ npm install inject-loader@^2.0.0 --save-dev
 
 ``` js
 // example.spec.js
-const ExampleInjector = require('!!vue?inject!./example.vue')
+const ExampleInjector = require('!!vue-loader?inject!./example.vue')
 ```
 
 Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
 
 - `!!` at the start means "disable all loaders from the global config";
-- `vue?inject!` means "use the `vue` loader, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
+- `vue-loader?inject!` means "use `vue-loader`, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
 
 The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
 

From 7afe1c49a7962949b57eae649b72f87034453523 Mon Sep 17 00:00:00 2001
From: Lucas Mendelowski <lukasz.mendelowski@ironin.pl>
Date: Thu, 29 Jun 2017 01:41:24 +0200
Subject: [PATCH 651/877] docs: pdate scoped-css.md with info about deep
 selectors (#841)

In 12.1 release deep selectors (`>>>` and `/deep/`) have been introduced but there is no info about that in the documentation.
---
 docs/en/features/scoped-css.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/en/features/scoped-css.md b/docs/en/features/scoped-css.md
index 4bcf398ff..765793666 100644
--- a/docs/en/features/scoped-css.md
+++ b/docs/en/features/scoped-css.md
@@ -49,3 +49,19 @@ Into the following:
 4. **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
 
 5. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
+
+6. If you need nested selectors in `scoped` styles, you will have to use `>>>` operator for CSS and `/deep/` for `scss`:
+
+    ``` html
+    <style scoped>
+    .a >>> .b {
+    
+    }
+    </style>
+    
+    <style lang="scss" scoped>
+    .a /deep/ .b {
+    
+    }
+    </style>
+    ```

From f83e4e3231bb44241d2825881d859b29618b697c Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Thu, 29 Jun 2017 02:43:02 +0300
Subject: [PATCH 652/877] Upgrade PostCSS to 6.0.1 (#834)

---
 package.json |  2 +-
 yarn.lock    | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index b51315911..1c7ac4979 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "js-beautify": "^1.6.3",
     "loader-utils": "^1.1.0",
     "lru-cache": "^4.0.1",
-    "postcss": "^5.0.21",
+    "postcss": "^6.0.1",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "resolve": "^1.3.3",
diff --git a/yarn.lock b/yarn.lock
index 8204f3d70..70ba4d514 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3152,7 +3152,15 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.4:
+postcss@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  dependencies:
+    chalk "^1.1.3"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.4:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -3829,7 +3837,7 @@ sugarss@^0.2.0:
   dependencies:
     postcss "^5.2.4"
 
-supports-color@3.1.2:
+supports-color@3.1.2, supports-color@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -3839,7 +3847,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.2.3:
+supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:

From b5825fca7e665865b308cae8a965952dba5c5c90 Mon Sep 17 00:00:00 2001
From: Grigoriy Beziuk <me@gbezyuk.ru>
Date: Thu, 29 Jun 2017 02:43:27 +0300
Subject: [PATCH 653/877] docs: Russian Translation Update (#833)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция
---
 docs/ru/SUMMARY.md | 11 +++++++++++
 docs/ru/options.md | 22 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index c2735607a..c4468f738 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -19,3 +19,14 @@
   - [Тестирование](workflow/testing.md)
   - [Тестирование с моками](workflow/testing-with-mocks.md)
 - [Перечень настроек](options.md)
+  - [loaders](options.md#loaders)
+  - [preLoaders](options.md#preloaders)
+  - [postLoaders](options.md#postloaders)
+  - [postcss](options.md#postcss)
+  - [cssSourceMap](options.md#csssourcemap)
+  - [esModule](options.md#esmodule)
+  - [preserveWhitespace](options.md#preservewhitespace)
+  - [transformToRequire](options.md#transformtorequire)
+  - [buble](options.md#buble)
+  - [extractCSS](options.md#extractcss)
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/ru/options.md b/docs/ru/options.md
index d99b5a143..0e2d361b8 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -114,7 +114,7 @@ module.exports = {
 
 ### cssSourceMap
 
-- Тип: `Boolean`
+- Тип: `boolean`
 - По умолчанию: `true`
 
   Использование source maps для CSS. Отключение этой опции может позволить избежать некоторых багов с относительными путями в `css-loader` и сделать сборку немного быстрее.
@@ -123,14 +123,14 @@ module.exports = {
 
 ### esModule
 
-- Тип: `Boolean`
-- По умолчанию: `undefined`
+- Тип: `boolean`
+- По умолчанию: `false`
 
   Генерация esModule совместимого кода. По умолчанию vue-loader генерирует модули в формате commonjs `module.exports = ....`. Когда опция `esModule` установлена в true, экспорт по умолчанию (default export) будет преобразован в `exports.__esModule = true; exports = ...`. Это может быть полезным для настройки взаимодействия с транспиляторами, отличными от  Babel, как например TypeScript.
 
 ### preserveWhitespace
 
-- Тип: `Boolean`
+- Тип: `boolean`
 - По умолчанию: `true`
 
   При установке в `false` пробельные символы между HTML тегами в шаблонах будут проигнорированы.
@@ -190,6 +190,9 @@ module.exports = {
 
 > Добавлено в версии 12.0.0
 
+- Тип: `boolean`
+- По умолчанию: `false`
+
 Автоматически извлекает CSS с помощью `extract-text-webpack-plugin`. Работает для большинства пре-процессоров из коробки и минифицирует при сборке в production.
 
 Передаваемое значение может быть `true`, или экземпляром плагина (так что вы можете использовать несколько экземпляров extract plugin для разных извлекаемых файлов).
@@ -245,4 +248,13 @@ module.exports = {
     plugin
   ]
 }
-```
\ No newline at end of file
+```
+
+### optimizeSSR
+
+> Добавлено в версии 12.1.1
+
+- Тип: `boolean`
+- По умолчанию: `true` когда конфигурация Webpack имеет `target: 'node'` и версия `vue-template-compiler` 2.4.0 или выше.
+
+Включает оптимизацию компиляции в Vue 2.4 SSR, которая компилирует в простые строки часть деревьев vdom возвращаемых render-функциями, что улучшает производительность SSR. В некоторых случаях вам может потребоваться явно отключить оптимизацию, поскольку результирующие render-функции могут быть использованы только для SSR и не могут использоваться для рендеринга на стороне клиента или тестирования.
\ No newline at end of file

From 2f100a80e8a33b867f7218114358a9d7b862f915 Mon Sep 17 00:00:00 2001
From: Anish Karandikar <anishkny@gmail.com>
Date: Wed, 28 Jun 2017 19:48:43 -0400
Subject: [PATCH 654/877] docs: use phantomjs-prebuilt (#859)

---
 docs/en/workflow/testing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/testing.md b/docs/en/workflow/testing.md
index 03c0a64c5..514b9964c 100644
--- a/docs/en/workflow/testing.md
+++ b/docs/en/workflow/testing.md
@@ -10,7 +10,7 @@ Karma is a test runner that launches browsers and runs your tests for you. You c
 npm install\
   karma karma-webpack\
   karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs\
+  karma-phantomjs-launcher phantomjs-prebuilt\
   --save-dev
 ```
 

From 04600bfbc69570cd53125fad5c83ade3674200ec Mon Sep 17 00:00:00 2001
From: Andrew Westwick <westwick@users.noreply.github.com>
Date: Wed, 28 Jun 2017 18:53:04 -0500
Subject: [PATCH 655/877] docs: add guide for global scss loading (#861)

* update docs for global scss loading

per this comment thread: https://github.com/vuejs/vue-loader/issues/328#issuecomment-311579950

* be more generic about webpack rule

* update text
---
 docs/en/configurations/pre-processors.md | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index 49b80b140..ba24a9b47 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -37,6 +37,40 @@ Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangeld
 
 See the [Advanced Loader Configuration](./advanced.md) Section for further information about how to configure vue-loader.
 
+#### Loading a global settings file
+
+A common request is to be able to load a settings file in each component without the need to explicity import it each time, e.g. to use scss variables globally throughout all components. To accomplish this:
+
+``` bash
+npm install sass-resources-loader --save-dev
+```
+
+Then add the following webpack rule:
+
+``` js
+{
+  loader: 'sass-resources-loader',
+  options: {
+    resources: path.resolve(__dirname, '../src/style/_variables.scss')
+  }
+}
+```
+
+As an example, if you are using [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack), modify `build/util.js` like so:
+
+``` js
+scss: generateLoaders('sass').concat(
+  {
+    loader: 'sass-resources-loader',
+    options: {
+      resources: path.resolve(__dirname, '../src/style/_variables.scss')
+    }
+  }
+),
+```
+
+It is recommended to only include variables, mixins, etc. in this file, to prevent duplicated css in your final, compiled files. 
+
 ### JavaScript
 
 All JavaScript inside Vue components are processed by `babel-loader` by default. But you can of course change it:

From 6ec67b3f70435310374014ade2a334731cd8aee3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 29 Jun 2017 09:35:46 +0800
Subject: [PATCH 656/877] feat: update internals to take advantage of webpack 3
 module concatenation

BREAKING CHANGE: This is enabled by default and makes `*.vue` files export an
ES module by default, so require('foo.vue') will no longer work. Can be turned
off by using `esModule: false` in vue-loader options.
---
 .babelrc                       |   4 +-
 lib/loader.js                  |   4 +-
 lib/template-compiler/index.js |  21 +-
 package.json                   |  12 +-
 test/fixtures/inject.vue       |   4 +-
 test/fixtures/ssr-style.js     |   2 +-
 test/test.js                   |  16 +-
 yarn.lock                      | 359 +++++++++++++++++++++++----------
 8 files changed, 295 insertions(+), 127 deletions(-)

diff --git a/.babelrc b/.babelrc
index c13c5f627..dc52269c8 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,5 @@
 {
-  "presets": ["es2015"]
+  "presets": [
+    ["env", { "targets": { "node": 7 }, "modules": false }]
+  ]
 }
diff --git a/lib/loader.js b/lib/loader.js
index e62bc593c..99233e7c5 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -49,7 +49,9 @@ module.exports = function (content) {
 
   var loaderContext = this
   var query = loaderUtils.getOptions(this) || {}
-  var options = Object.assign({}, this.options.vue, this.vue, query)
+  var options = Object.assign({
+    esModule: !query.inject
+  }, this.options.vue, this.vue, query)
   // #824 avoid multiple webpack runs complaining about unknown option
   Object.defineProperty(this.options, '__vueOptions__', {
     value: options,
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 7917a5a26..6cfe80d17 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -45,21 +45,28 @@ module.exports = function (html) {
       `\n  Error compiling template:\n${pad(html)}\n` +
       compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
     )
-    code = 'module.exports={render:function(){},staticRenderFns:[]}'
+    code = vueOptions.esModule
+      ? `export function render () {}\nexport var staticRenderFns = []`
+      : 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
     var bubleOptions = options.buble
-    code = transpile('module.exports={' +
-      'render:' + toFunction(compiled.render) + ',' +
-      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-    '}', bubleOptions)
+    code = transpile(
+      'var render = ' + toFunction(compiled.render) + '\n' +
+      'var staticRenderFns = [' + compiled.staticRenderFns.map(toFunction).join(',') + ']',
+      bubleOptions
+    ) + '\n'
     // mark with stripped (this enables Vue to use correct runtime proxy detection)
     if (!isProduction && (
       !bubleOptions ||
       !bubleOptions.transforms ||
       bubleOptions.transforms.stripWith !== false
     )) {
-      code += `\nmodule.exports.render._withStripped = true`
+      code += `render._withStripped = true\n`
     }
+    var exports = `{ render: render, staticRenderFns: staticRenderFns }`
+    code += vueOptions.esModule
+      ? `export default ${exports}`
+      : `module.exports = ${exports}`
   }
   // hot-reload
   if (!isServer && !isProduction) {
@@ -76,7 +83,7 @@ module.exports = function (html) {
 }
 
 function toFunction (code) {
-  return 'function (){' + beautify(code, {
+  return 'function () {' + beautify(code, {
     indent_size: 2 // eslint-disable-line camelcase
   }) + '}'
 }
diff --git a/package.json b/package.json
index 1c7ac4979..8794bc41a 100644
--- a/package.json
+++ b/package.json
@@ -41,16 +41,16 @@
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.1.0",
     "vue-style-loader": "^3.0.0",
-    "vue-template-es2015-compiler": "^1.2.2"
+    "vue-template-es2015-compiler": "^1.5.3"
   },
   "peerDependencies": {
     "css-loader": "*",
     "vue-template-compiler": "^2.0.0"
   },
   "devDependencies": {
-    "babel-core": "^6.8.0",
-    "babel-loader": "^6.2.4",
-    "babel-preset-es2015": "^6.6.0",
+    "babel-core": "^6.25.0",
+    "babel-loader": "^7.0.0",
+    "babel-preset-env": "^1.5.2",
     "chai": "^3.0.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
@@ -58,7 +58,7 @@
     "eslint": "^3.14.1",
     "eslint-plugin-vue-libs": "^1.2.0",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^2.0.0-rc.0",
+    "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.10.0",
     "inject-loader": "^2.0.0",
     "js-yaml": "^3.8.2",
@@ -80,6 +80,6 @@
     "vue": "^2.3.2",
     "vue-server-renderer": "^2.3.2",
     "vue-template-compiler": "^2.3.2",
-    "webpack": "^2.2.0"
+    "webpack": "^3.0.0"
   }
 }
diff --git a/test/fixtures/inject.vue b/test/fixtures/inject.vue
index 6485a5c89..eae6e98b2 100644
--- a/test/fixtures/inject.vue
+++ b/test/fixtures/inject.vue
@@ -3,9 +3,9 @@
 </template>
 
 <script>
-import SomeService from './service'
+const SomeService = require('./service')
 
-export default {
+module.exports = {
   data () {
     return {
       msg: SomeService.msg
diff --git a/test/fixtures/ssr-style.js b/test/fixtures/ssr-style.js
index 38dc1d7f8..eda0771bf 100644
--- a/test/fixtures/ssr-style.js
+++ b/test/fixtures/ssr-style.js
@@ -1,5 +1,5 @@
 var Vue = require('vue')
-var App = require('./ssr-style.vue')
+var App = require('./ssr-style.vue').default
 
 module.exports = () => new Vue({
   render: h => h(App)
diff --git a/test/test.js b/test/test.js
index e2349b47b..65c74887f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -28,7 +28,10 @@ var globalConfig = {
         loader: loaderPath
       }
     ]
-  }
+  },
+  plugins: [
+    new webpack.optimize.ModuleConcatenationPlugin()
+  ]
 }
 
 function bundle (options, cb) {
@@ -321,7 +324,8 @@ describe('vue-loader', function () {
     }, (code, warnings) => {
       var css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
-      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+      expect(css).to.contain('h1 {\n  color: #f00;\n}')
+      expect(css).to.contain('h2 {\n  color: green;\n}')
       done()
     })
   })
@@ -338,7 +342,8 @@ describe('vue-loader', function () {
     }, (code, warnings) => {
       var css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
-      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+      expect(css).to.contain('h1 {\n  color: #f00;\n}')
+      expect(css).to.contain('h2 {\n  color: green;\n}')
       done()
     })
   })
@@ -356,7 +361,8 @@ describe('vue-loader', function () {
     }, (code, warnings) => {
       var css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
-      expect(css).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+      expect(css).to.contain('h1 {\n  color: #f00;\n}')
+      expect(css).to.contain('h2 {\n  color: green;\n}')
       done()
     })
   })
@@ -584,7 +590,7 @@ describe('vue-loader', function () {
         return m.exports;
       }
 
-      var output = requireFromString(code, './test.build.js')
+      var output = interopDefault(requireFromString(code, './test.build.js'))
       var mockInstance = {}
 
       output.beforeCreate.forEach(hook => hook.call(mockInstance))
diff --git a/yarn.lock b/yarn.lock
index 70ba4d514..cfc813f6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,17 +40,30 @@ acorn@^5.0.0, acorn@^5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
-ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
+ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
+ajv-keywords@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+
+ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.7"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
+ajv@^5.0.0, ajv@^5.1.5:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^0.1.0"
+    json-schema-traverse "^0.3.0"
+    json-stable-stringify "^1.0.1"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -247,6 +260,14 @@ babel-generator@^6.24.1:
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
 babel-helper-call-delegate@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
@@ -265,6 +286,14 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
@@ -304,6 +333,16 @@ babel-helper-regex@^6.24.1:
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
@@ -322,14 +361,13 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^6.2.4:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+babel-loader@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
   dependencies:
-    find-cache-dir "^0.1.1"
-    loader-utils "^0.2.16"
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
     mkdirp "^0.5.1"
-    object-assign "^4.0.1"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -343,6 +381,26 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
@@ -355,7 +413,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
   dependencies:
@@ -365,7 +423,7 @@ babel-plugin-transform-es2015-block-scoping@^6.24.1:
     babel-types "^6.24.1"
     lodash "^4.2.0"
 
-babel-plugin-transform-es2015-classes@^6.24.1:
+babel-plugin-transform-es2015-classes@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
   dependencies:
@@ -379,33 +437,33 @@ babel-plugin-transform-es2015-classes@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-computed-properties@^6.24.1:
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@^6.22.0:
+babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-for-of@^6.22.0:
+babel-plugin-transform-es2015-for-of@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-function-name@^6.24.1:
+babel-plugin-transform-es2015-function-name@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
   dependencies:
@@ -419,7 +477,7 @@ babel-plugin-transform-es2015-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.24.1:
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
   dependencies:
@@ -427,7 +485,7 @@ babel-plugin-transform-es2015-modules-amd@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
   dependencies:
@@ -436,7 +494,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
     babel-template "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
   dependencies:
@@ -444,7 +502,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-umd@^6.24.1:
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
   dependencies:
@@ -452,14 +510,14 @@ babel-plugin-transform-es2015-modules-umd@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-object-super@^6.24.1:
+babel-plugin-transform-es2015-object-super@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
   dependencies:
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.24.1:
+babel-plugin-transform-es2015-parameters@^6.23.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   dependencies:
@@ -470,7 +528,7 @@ babel-plugin-transform-es2015-parameters@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
   dependencies:
@@ -483,7 +541,7 @@ babel-plugin-transform-es2015-spread@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
   dependencies:
@@ -497,13 +555,13 @@ babel-plugin-transform-es2015-template-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
   dependencies:
@@ -511,7 +569,15 @@ babel-plugin-transform-es2015-unicode-regex@^6.24.1:
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-regenerator@^6.24.1:
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
   dependencies:
@@ -524,34 +590,40 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-preset-es2015@^6.6.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+babel-preset-env@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
     babel-plugin-transform-es2015-arrow-functions "^6.22.0"
     babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.24.1"
-    babel-plugin-transform-es2015-classes "^6.24.1"
-    babel-plugin-transform-es2015-computed-properties "^6.24.1"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.24.1"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
     babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-umd "^6.24.1"
-    babel-plugin-transform-es2015-object-super "^6.24.1"
-    babel-plugin-transform-es2015-parameters "^6.24.1"
-    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
     babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
     babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
-    babel-plugin-transform-regenerator "^6.24.1"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^2.1.2"
+    invariant "^2.2.2"
+    semver "^5.3.0"
 
 babel-register@^6.24.1:
   version "6.24.1"
@@ -732,6 +804,13 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
+browserslist@^2.1.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
+  dependencies:
+    caniuse-lite "^1.0.30000684"
+    electron-to-chromium "^1.3.14"
+
 buffer-shims@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
@@ -787,6 +866,10 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000662"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000662.tgz#616b17a525b52fec14611f88af3d5a9b5438c050"
 
+caniuse-lite@^1.0.30000684:
+  version "1.0.30000696"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz#30f2695d2a01a0dfd779a26ab83f4d134b3da5cc"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1346,9 +1429,9 @@ editorconfig@^0.13.2:
     lru-cache "^3.2.0"
     sigmund "^1.0.1"
 
-electron-to-chromium@^1.2.7:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.8.tgz#b2c8a2c79bb89fbbfd3724d9555e15095b5f5fb6"
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
+  version "1.3.14"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -1473,9 +1556,9 @@ eslint-plugin-html@^2.0.0:
   dependencies:
     htmlparser2 "^3.8.2"
 
-eslint-plugin-vue-libs@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.1.0.tgz#f4d4ae44fa074a5035221687ba7b72b1c9c2d7a8"
+eslint-plugin-vue-libs@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.2.0.tgz#eff85ecd66e8f1c9538d668205fa8d65136f1eac"
   dependencies:
     eslint-plugin-html "^2.0.0"
 
@@ -1610,19 +1693,23 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^2.0.0-rc.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+extract-text-webpack-plugin@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
   dependencies:
-    ajv "^4.11.2"
     async "^2.1.2"
     loader-utils "^1.0.2"
-    webpack-sources "^0.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
 
 extsprintf@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
+fast-deep-equal@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
+
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -1665,13 +1752,13 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-find-cache-dir@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
   dependencies:
     commondir "^1.0.1"
-    mkdirp "^0.5.1"
-    pkg-dir "^1.0.0"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
 
 find-up@^1.0.0:
   version "1.1.2"
@@ -1680,6 +1767,12 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
+find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
 flat-cache@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
@@ -1863,6 +1956,10 @@ has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -2027,7 +2124,7 @@ interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
-invariant@^2.2.0:
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -2301,6 +2398,10 @@ json-parse-helpfulerror@^1.0.3:
   dependencies:
     jju "^1.1.0"
 
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -2401,6 +2502,13 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -2512,6 +2620,12 @@ macaddress@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
 
+make-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
+  dependencies:
+    pify "^2.3.0"
+
 marked@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
@@ -2803,6 +2917,16 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+p-limit@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
 pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
@@ -2846,6 +2970,10 @@ path-exists@^2.0.0:
   dependencies:
     pinkie-promise "^2.0.0"
 
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -2876,7 +3004,7 @@ performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
-pify@^2.0.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -2890,11 +3018,11 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pkg-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
   dependencies:
-    find-up "^1.0.0"
+    find-up "^2.1.0"
 
 pluralize@^1.2.1:
   version "1.2.1"
@@ -3152,14 +3280,6 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
-  dependencies:
-    chalk "^1.1.3"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.4:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
@@ -3169,6 +3289,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
+postcss@^6.0.1:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.3.tgz#b7f565b3d956fbb8565ca7c1e239d0506e427d8b"
+  dependencies:
+    chalk "^1.1.3"
+    source-map "^0.5.6"
+    supports-color "^4.0.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -3605,6 +3733,12 @@ sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -3673,13 +3807,13 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^0.1.7, source-list-map@~0.1.7:
+source-list-map@^0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
-source-list-map@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4"
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
 source-map-support@^0.4.2:
   version "0.4.14"
@@ -3853,6 +3987,12 @@ supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.0.0.tgz#33a7c680aa512c9d03ef929cacbb974d203d2790"
+  dependencies:
+    has-flag "^2.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -3981,7 +4121,7 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@^2.6.1, uglify-js@^2.8.5:
+uglify-js@^2.6.1:
   version "2.8.22"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
   dependencies:
@@ -3990,10 +4130,27 @@ uglify-js@^2.6.1, uglify-js@^2.8.5:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifyjs-webpack-plugin@^0.4.4:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -4104,9 +4261,9 @@ vue-template-compiler@^2.3.2:
     de-indent "^1.0.2"
     he "^1.1.0"
 
-vue-template-es2015-compiler@^1.2.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.2.tgz#a0a6c50c941d2a4abda963f2f42c337ac450ee95"
+vue-template-es2015-compiler@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
 vue@^2.3.2:
   version "2.3.2"
@@ -4128,44 +4285,38 @@ webidl-conversions@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
-webpack-sources@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.5.3"
-
-webpack-sources@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
+webpack-sources@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
   dependencies:
-    source-list-map "^1.1.1"
+    source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"
+webpack@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
-    ajv "^4.7.0"
-    ajv-keywords "^1.1.1"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
     async "^2.1.2"
     enhanced-resolve "^3.0.0"
+    escope "^3.6.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
     json5 "^0.5.1"
     loader-runner "^2.3.0"
-    loader-utils "^0.2.16"
+    loader-utils "^1.1.0"
     memory-fs "~0.4.1"
     mkdirp "~0.5.0"
     node-libs-browser "^2.0.0"
     source-map "^0.5.3"
     supports-color "^3.1.0"
     tapable "~0.2.5"
-    uglify-js "^2.8.5"
+    uglifyjs-webpack-plugin "^0.4.4"
     watchpack "^1.3.1"
-    webpack-sources "^0.2.3"
+    webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
 whatwg-encoding@^1.0.1:

From 7f2fe87a1ad00dfaf776be99c863b2f4c09e76d6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 29 Jun 2017 09:45:14 +0800
Subject: [PATCH 657/877] make sure esModule is always true in inject mode

---
 lib/loader.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 99233e7c5..ae5d9cbea 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -50,8 +50,15 @@ module.exports = function (content) {
   var loaderContext = this
   var query = loaderUtils.getOptions(this) || {}
   var options = Object.assign({
-    esModule: !query.inject
+    esModule: true
   }, this.options.vue, this.vue, query)
+
+  // disable esModule in inject mode
+  // because import/export must be top-level
+  if (query.inject) {
+    options.esModule = false
+  }
+
   // #824 avoid multiple webpack runs complaining about unknown option
   Object.defineProperty(this.options, '__vueOptions__', {
     value: options,

From ead854df098ae1f8e59157cd77c3ebc6b8fc8d94 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 29 Jun 2017 10:57:13 +0800
Subject: [PATCH 658/877] always use require for compoentNormalizer since it
 cannot be concatenated

---
 lib/loader.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index ae5d9cbea..762842597 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -438,15 +438,9 @@ module.exports = function (content) {
   //   scopeId,
   //   moduleIdentifier (server only)
   // )
-  if (options.esModule) {
-    output += 'import normalizeComponent from ' +
-      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-    '\n'
-  } else {
-    output += 'var normalizeComponent = require(' +
-      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-    ')\n'
-  }
+  output += 'var normalizeComponent = require(' +
+    loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
+  ')\n'
 
   // <script>
   output += '/* script */\n'

From ad43eaf4c283ec928acabb8996240df9dff14ad9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 29 Jun 2017 10:58:09 +0800
Subject: [PATCH 659/877] 13.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8794bc41a..4c36163d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "12.2.1",
+  "version": "13.0.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 9b358e358c312dd586e25c4c757d720cbbb32e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Sat, 1 Jul 2017 11:04:12 -0300
Subject: [PATCH 660/877] Use `vue-loader` explictly when creating injector
 (#868)

---
 docs/pt_BR/workflow/testing-with-mocks.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/pt_BR/workflow/testing-with-mocks.md b/docs/pt_BR/workflow/testing-with-mocks.md
index 0b9193b45..a81b175d1 100644
--- a/docs/pt_BR/workflow/testing-with-mocks.md
+++ b/docs/pt_BR/workflow/testing-with-mocks.md
@@ -36,13 +36,13 @@ npm install inject-loader@^2.0.0 --save-dev
 
 ```js
 // exemplo.spec.js
-const ExemploInjecao = require('!!vue?inject!./exemplo.vue')
+const ExemploInjecao = require('!!vue-loader?inject!./exemplo.vue')
 ```
 
 Observe que ele requer uma sequência de caracteres - nós estamos usando algumas [requisições de carregador webpack](https://webpack.github.io/docs/loaders.html) em linha aqui. Uma explicação rápida:
 
 - `!!` no início significa "desative todos os carregadores da configuração global";
-- `vue?inject!` significa "use o carregador de `vue`, e passe o `?inject` na consulta". Isso informa ao `vue-loader` para compilar o componente no modo injeção de dependência.
+- `vue-loader?inject!` significa "use `vue-loader`, e passe o `?inject` na consulta". Isso informa ao `vue-loader` para compilar o componente no modo injeção de dependência.
 
 O retorno de `ExemploInjecao` é uma função de fábrica que pode ser chamada para criar instâncias do módulo `exemplo.vue`.
 
@@ -67,4 +67,4 @@ it('Deve renderizar', () => {
   }).$mount()
   expect(vm.$el.querySelector('.msg').textContent).toBe('Olá de uma simulação de serviço!')
 })
-```
\ No newline at end of file
+```

From 3f803b0f1c13fd4b148cdb1691207dd580b8ba35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=A9rio=20Vieira?= <anteriovieira@gmail.com>
Date: Sat, 1 Jul 2017 11:04:59 -0300
Subject: [PATCH 661/877] Added info about deep selectors (#867)

---
 docs/pt_BR/features/scoped-css.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/pt_BR/features/scoped-css.md b/docs/pt_BR/features/scoped-css.md
index ce104cb7f..e5034e1d4 100644
--- a/docs/pt_BR/features/scoped-css.md
+++ b/docs/pt_BR/features/scoped-css.md
@@ -49,3 +49,19 @@ Para o seguinte:
 4. **Os estilos com escopo não eliminam a necessidade de classes**. Devido a forma como navegadores processam vários seletores CSS, `p { color: red }` irá ser muitas vezes mais lento quando com escopo \(exemplo: quando combinado com um seletor de atributo\). Se você usa classes ou ids ao invés, como em `.example { color: red }`, então você elimina praticamente esse desempenho atingido. [Aqui está um playground](http://stevesouders.com/efws/css-selectors/csscreate.php) onde você pode testar as diferenças você mesmo.
 
 5. **Tenha cuidado com seletores descendentes em componentes recursivos!** Para uma regra CSS com o seletor `.a .b`, se o elemento que coincide com `.a` contém um componente filho recursivo, então todos os `.b` nesse componente filho serão correspondidos pela regra.
+
+6. Se você precisa de seletores aninhados em estilos `scoped`, você terá que usar o operador `>>>` para CSS e `/deep/` para `scss`:
+
+``` html
+<style scoped>
+.a >>> .b {
+
+}
+</style>
+     
+<style lang="scss" scoped>
+ .a /deep/ .b {
+
+}
+</style>
+ ```

From 024a14e0f000b5a567986b9193a5957df2b5889e Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Mon, 3 Jul 2017 10:25:12 +0900
Subject: [PATCH 662/877] update ja docs (#870)

* update injector explanation

NOTE:
  pick up from https://github.com/vuejs/vue-loader/commit/0b4fe907820bf648b7ebf0a1f8cc419442b4a58f

* bring from en docs

* translate previous commit

* use phantomjs-prebuilt

* add guide for global scss loading

* translate previous commit

* fix translation of review comments
---
 docs/ja/configurations/pre-processors.md | 34 ++++++++++++++++++++++++
 docs/ja/features/scoped-css.md           | 16 +++++++++++
 docs/ja/workflow/testing-with-mocks.md   |  4 +--
 docs/ja/workflow/testing.md              |  2 +-
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
index 1b72c8358..5b6c76b25 100644
--- a/docs/ja/configurations/pre-processors.md
+++ b/docs/ja/configurations/pre-processors.md
@@ -37,6 +37,40 @@ npm install sass-loader node-sass --save-dev
 
 vue-loader を構成する方法の詳細については、[高度な loader の設定](./advanced.md)セクションを参照してください。
 
+#### グローバル設定ファイルの読み込み
+
+一般的な要求は、毎回明示的にインポートする必要なく、各コンポーネントに設定ファイルを読み込み可能であることです。例としてすべてのコンポーネントで scss 変数をグローバルに使用することです。これを成し遂げるためには:
+
+``` bash
+npm install sass-resources-loader --save-dev
+```
+
+のように `sass-resources-loader` をインストールし、以下の webpack のルールを追加します:
+
+``` js
+{
+  loader: 'sass-resources-loader',
+  options: {
+    resources: path.resolve(__dirname, '../src/style/_variables.scss')
+  }
+}
+```
+
+例として、[vuejs-templates/webpack](https://github.com/vuejs-templates/webpack) を使用している場合、 `build/util.js` を以下のように変更してください:
+
+``` js
+scss: generateLoaders('sass').concat(
+  {
+    loader: 'sass-resources-loader',
+    options: {
+      resources: path.resolve(__dirname, '../src/style/_variables.scss')
+    }
+  }
+),
+```
+
+最終的にコンパイルされたファイルに CSS が重複しないように、変数、ミックスインなどのみをこのファイルに含めることをお勧めします。
+
 ### JavaScript
 
 全ての Vue コンポーネントの JavaScript はデフォルトで `babel-loader` によって処理されます。しかしもちろんそれは変更することが可能です:
diff --git a/docs/ja/features/scoped-css.md b/docs/ja/features/scoped-css.md
index 207d00a1d..f10f899b9 100644
--- a/docs/ja/features/scoped-css.md
+++ b/docs/ja/features/scoped-css.md
@@ -49,3 +49,19 @@
 4. **スコープされたスタイルは class の必要性を排除しません**。ブラウザが様々な CSS セレクタをレンダリングするため、`p { color: red }` はスコープされているとき何倍も遅くなります（すなわち属性セレクタと組み合わせた場合）。もし `.example { color: red }` のように class か id を使用するなら、パフォーマンスヒットは事実上なくなります。[この例](http://stevesouders.com/efws/css-selectors/csscreate.php)で違いをテストすることが出来ます。
 
 5. **再帰されたコンポーネントの子孫セレクタには気をつけてください！** セレクタ `.a .b` を持つ CSS ルールの場合、`.a` にマッチする要素に再帰的な子コンポーネントが含まれている場合、その子コンポーネントのすべての `.b` はルールにマッチします。
+
+6. `scoped` スタイルで入れ子のセレクタが必要なら、CSS に対して `>>>` オペレータを、そして `scss` に対しては `/deep/` を使用する必要があります:
+
+    ``` html
+    <style scoped>
+    .a >>> .b {
+    
+    }
+    </style>
+    
+    <style lang="scss" scoped>
+    .a /deep/ .b {
+    
+    }
+    </style>
+    ```
diff --git a/docs/ja/workflow/testing-with-mocks.md b/docs/ja/workflow/testing-with-mocks.md
index b14df1881..91de6e1e4 100644
--- a/docs/ja/workflow/testing-with-mocks.md
+++ b/docs/ja/workflow/testing-with-mocks.md
@@ -36,13 +36,13 @@ npm install inject-loader@^2.0.0 --save-dev
 
 ``` js
 // example.spec.js
-const ExampleInjector = require('!!vue?inject!./example.vue')
+const ExampleInjector = require('!!vue-loader?inject!./example.vue')
 ```
 
 注意。狂気じみた文字列を必要とします - ここではいくつかのインライン [webpack loader](https://webpack.github.io/docs/loaders.html) を使用しています。簡単な説明としては:
 
 - `!!`は "グローバル設定からすべてのローダを無効にする"ことを意味します；
-- `vue？inject！` は  "`vue` loader を使い、`？inject` クエリを渡す"ことを意味します。 これは `vue-loader` に、依存性注入モードでコンポーネントをコンパイルするように指示します。
+- `vue-loader？inject！` は  `vue-loader` を使い、`？inject` クエリを渡す"ことを意味します。 これは `vue-loader` に、依存性注入モードでコンポーネントをコンパイルするように指示します。
 
 返される `ExampleInjector` は、`example.vue` モジュールのインスタンスを生成するために呼び出すことができるファクトリ関数です:
 
diff --git a/docs/ja/workflow/testing.md b/docs/ja/workflow/testing.md
index ccdc16da4..bcec7624f 100644
--- a/docs/ja/workflow/testing.md
+++ b/docs/ja/workflow/testing.md
@@ -10,7 +10,7 @@ Karma はブラウザを起動してテストを実行するテストランナ
 npm install\
   karma karma-webpack\
   karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs\
+  karma-phantomjs-launcher phantomjs--prebuilt\
   --save-dev
 ```
 

From 39fdf35a25daf82c25e09747669d4d1e9d4f9f6c Mon Sep 17 00:00:00 2001
From: Dave Honneffer <pearofducks@gmail.com>
Date: Sat, 8 Jul 2017 13:21:23 +0200
Subject: [PATCH 663/877] Improve the documentation site's title area (#875)

---
 docs/book.json                  |   1 +
 docs/gitbook/images/favicon.ico | Bin 0 -> 15086 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 docs/gitbook/images/favicon.ico

diff --git a/docs/book.json b/docs/book.json
index 76d487115..4cdd37699 100644
--- a/docs/book.json
+++ b/docs/book.json
@@ -1,4 +1,5 @@
 {
+  "title": "vue-loader",
   "gitbook": ">3.0.0",
   "plugins": ["edit-link", "theme-vuejs@git+https://github.com/pearofducks/gitbook-plugin-theme-vuejs.git", "-fontsettings", "github"],
   "pluginsConfig": {
diff --git a/docs/gitbook/images/favicon.ico b/docs/gitbook/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e481e5dda71327b885d4797cac93939d8030d0d6
GIT binary patch
literal 15086
zcmeI2eQZ@{9mk)p&@xv73ES+pKU&Nj`(tm3yDbc8dlLg#kyS!60xPsw=$J()2(q=%
z7I4!)=9Vqd$jpq6Z5S8ljJg)1>7of@jEQy$(Jb1SAc>OL1f~QT$ItiNb8gQ)J?A;+
z-WIq^xXHKA+wbN3yqu@!`JKm@3R7twddQI0o8zA}rok9fU+<OY8}nD{=98-ZiCM-x
zgTTGWpkg|J>fPVnx#Y&*8zb;h7=gpX*+s%ffoqr}ysN=657puJaxcSs4LI*%O}X<8
z@`LjN@GIbWP<}yBrkwL|?E#lP?&^c`J>|^V=LXNa!D--+y`QSCtp5YS?<VkE1b4p=
zYP-qrYq_OxTL%7V;jgx3<;Gil;B^al)56`K1IgS{Zhe5$dhnkV{3Wx#ocP117W_5^
zcYh8fTU#!DfXjYxr3n6#-Cqv;;c*}MTM^v-IgrkM*Rv1!pAEiU0(ZX;(w%+1`hf2h
z;NR2WFWnW_gFk-ffp@0C-Jb*5n0KxFfX^;)$;SWC&$EtTlkseHT}%G>tOI|v@*2rH
z`(9Y?;xKuuY|d8QwdeypD!>sdANUTu+2U+{ywQd7Df%Fr6<50t_{e}WR{p$u?iyU`
zZ2C;bh4M-Ap3ThF<d2Uz;Fy&QW8eS%W@pQ~24~YM_ygrtmtqcNd(PGB1Gd|M&V;e!
zdFW?Zr)T#gIqu&0s}HJEn@!iV-F7wjWBXR{uFe0E6Io~fx0X8{YZ!Z<yO*j?ZIZFs
z@O<1l(|y41P7pj37V==-4E?yp>E61yaP0klFb8UrOu{;nkDW8gAA9$JKZ8Qf!7}{6
z{Pktdrq<ju8y<hROxqr068Ou9eBCn>eZWp7cmY_sAN)bH)3u>7dh7#pAQ{P~=!1M#
zPPY%(XafJT@_#4m?Cc9Yvp(l=$~uzlVRWoEb3U7<!yo%K;4P~k)=l3lO-|=pZ@&!l
z4VU3BS?Q#h1Np8gwGZfS1pl@1KlIbA^W=^tPWwvBx)1e1veJ>R&9>)zV=4U6y%YS-
zYM-&+_u_JA^Xl~6{pVUb(oHc3;&5lNeL$xV#GeV_KKP>+XIp2?ei<5bpLafG9Z6R<
z68azxeZ}xc{sAx!;^!CsyN^u1<K%fI@eZ}iMgo6v5SIti^Z_}Y310?Q?gw6LcE0eK
zeZSoN*~}k=*uF6bvLRb3`XEk;XH8^Qfe9;r&LlhbCG3~2nG3u#v<duAyI||Xj=k)s
z$>$t#T4kF9+UJ828+X0GJax3m>3Gz>U-Epu(Y3yDj-b4azii27igzP%<4a}qkG5`L
zJrfT7q{Z3(#A5q?*_t`q`DjC<??rj$;A~tUw4chRY}>}p<JRrl4W_g$1Y=fxp4q+6
zEpu4YQ{FFw+%~Uncy`ah<@vLe@~R8Ug!8f~+bNy{aa<VUt~24YN!$m1$eFM`@tGa#
z{Cq=w(7y7jgX373cfQQCEZg#tq7UMlA0P6K;H;HD`_Zle_DlTaeTMcz>MwPCu3=l4
zyI)qDWMcKPEgwldJg)BgB>yq+npKB&)BnA|nQ$s^w@-}k$d+}DvCo&<BxB?6o;C56
zVh+Sv+_!)WHvW1~`Qol6_OWlxOt4p4_czUhWO$Y*Y<-Zg6z@jjEbcD>?MuUv7|9Oz
zeYa`2qpe|>wKI(0D4bwihuA9<zw=5)ve-EhX$v3nC7;YeG^ZR_aTfP#P!)$GzsOeY
z>|a{7vH9UD#;ppUkzia?pEV>KXGcEdOFrd0j+a-TI9~p<cO$(zBjC6{W8%{*1CFD1
zKfT<XEBooix?Fi;UST?3oh$q4Xl1VKr-K!_vTO%%#h3w={q(Xi%_?6srY@LH7&A|0
zKOHxwT4g^SHKtPKLGC{VQ^QYXFU1WGjqy|5;m{b|;ZSMCpwbDYM9C*i<*3qerL125
zkX1U5CSwpnRB0Wmt`XOi<Noj)N_9`G9<+e`J+0Us9HAS(qDO$e=2Jq^iZh^qUwzkp
z+ru^gZjIj!;G%~OGti~fCh&O&2*wbUzazDQX$s=&X%LJ7DF5^{&8AYv&;20k46nNT
zQyD2y2>UvN9|dvmqH3F6qWMHMY_9~iGql=PCK@V10K182U}Q8d*0X2{u3Z)EZUdJ*
zA93Taddb9|HA?Z1y?XE`Q0SNQL(KcUWa~@u71qIy&XCVU`R+f~><BR&q?13(h3%#-
zW1|85BkbReul6i)o&+&x0_o^Vb;&>U^<D4vuy4gfzVcEoKB{=9@-Z<I>6ZN64&Ak&
z@C?SB7sNL?n_A+P(p_810HAjp_%)ca=5~LT?>V8fs_J6afo$AXEC+OY!G{I@>HC4#
zBjSsUfg3NRErNq=^cLeE`9<I_1->;7d>e_455hrhG2c&QYf%~w$mzS(i(%hxeD7uA
zdu=iCJ^ZWfDP&^SqHHFf1(9h1=feKo_}q5;_Y61QhD=PnO*UI>V?evU3+bI|%9`8z
z4W74z_?p(FWF#B04rEidW54^*)(-SeHR+!<=iZr!ijTEs&TuY1Q}8S>4{p3G`fi16
zw?~Zu^>=~a7x?ygxbdyf^M=pM>^)x+lrP|btR-G0A9sa0P<H?X->KX&EV#1};IO$h
z^KNHb!vaD10{@JG<!*y~90>ZS{2=%{m>hTV?wy0)$oSHE;-+oB4dwBFKFpy9-I%)x
z^7WwfNfl@LPT04eq5a>CzB9lYJ4VbczppE=x&r@<74a0;M$GdlpYr_}D14{V9{(2K
z{JSE)VX@wbS5CRlqPnQHC>ydB@jS?<d>;j;z)2tQJ;@!Xll18%eG1|fb$hpOT{7ja
zwCdD`{HdUhY{-^u`u4q4KIMC^2R-{ajAUz=yPC&8{csJof|$!($G+dH4f(l29ogvV
zeWZr|PukD<asB#h=z68OxPkXqp%_6S7~x`_<0$+hj1zVd6lPI~B@kv&NJUUcMd1`d
z;S*uJVz62mtsJc!tQ>VqYH_@u;uH!?)PsDSVituWe$1QR5lep8Ls$QET8eO)7e!C!
zf?s-2SBm<f*A4#Xp}QDmbo6cLJ>c(K$}db~138V^*8;k}4b>%%B{GY_S?LeG-Qq%d
zuWqr812Q**<DR_JJG9h=U-sH=j<Z4gI`Dz^l>S$9-!I(#p1ilud?1-9ed=!qzX9$Y
z(4O7i{?7jl<pcLZC3Ab&26cPDhwlCyy3^(Ex083d^xn58s89J`@V+=|%ye(cyPu)&
zxEGXn?^4m`_2Yf%$Oh>wpt!u-R&b}OHS;`s@AKGj?>VW>)7N}RN4l%QIn^ILUT~-A
zH2=dtA)tR+-?7}gM96qH&Uw18kiJLV81prToW8k@@xOPg-$&(Dr#8t**3}u#O1D;E
zd~5liP}{yDQ;Y1!*`KTO`s7uoHpxiV*Yjh!R}@nPmz#;95<e9t6hBq$l(?xds(2|Y
OcxZ@N?Wkg-#{3^#(U@ca

literal 0
HcmV?d00001


From be927d50a79eba7303838724ef5250737ece261b Mon Sep 17 00:00:00 2001
From: EGOIST <0x142857@gmail.com>
Date: Mon, 10 Jul 2017 22:45:04 +0800
Subject: [PATCH 664/877] Fix template hmr, fix #863 (#874)

* fix template hmr

* oops

* reset yarn.lock
---
 lib/template-compiler/index.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 6cfe80d17..01ea244b7 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -46,7 +46,7 @@ module.exports = function (html) {
       compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
     )
     code = vueOptions.esModule
-      ? `export function render () {}\nexport var staticRenderFns = []`
+      ? `var esExports = {render:function(){},staticRenderFns: []}\nexport default esExports`
       : 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
     var bubleOptions = options.buble
@@ -65,16 +65,17 @@ module.exports = function (html) {
     }
     var exports = `{ render: render, staticRenderFns: staticRenderFns }`
     code += vueOptions.esModule
-      ? `export default ${exports}`
+      ? `var esExports = ${exports}\nexport default esExports`
       : `module.exports = ${exports}`
   }
   // hot-reload
   if (!isServer && !isProduction) {
+    var exportsName = vueOptions.esModule ? 'esExports' : 'module.exports'
     code +=
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", ' + exportsName + ')\n' +
       '  }\n' +
       '}'
   }

From c81fd73bee41fae54893050451255f2e34ab58e0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 10 Jul 2017 22:45:29 +0800
Subject: [PATCH 665/877] 13.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4c36163d1..c1b96b593 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.0",
+  "version": "13.0.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From e5d248bdaf9295ba61a1e59fecb795ac10edcc87 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Jul 2017 23:13:39 +0800
Subject: [PATCH 666/877] fix scoped CSS with 2.4 ssr optimization

---
 lib/loader.js                  | 462 +++++++++++++++++----------------
 lib/template-compiler/index.js |   2 +-
 package.json                   |   6 +-
 yarn.lock                      |  76 +++---
 4 files changed, 275 insertions(+), 271 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 762842597..cc574b8eb 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -86,8 +86,13 @@ module.exports = function (content) {
     ? '?' + JSON.stringify(options.buble)
     : ''
 
+  var output = ''
+  var parts = parse(content, fileName, this.sourceMap)
+  var hasScoped = parts.styles.some(function (s) { return s.scoped })
+
   var templateCompilerOptions = '?' + JSON.stringify({
     id: moduleId,
+    hasScoped: hasScoped,
     transformToRequire: options.transformToRequire,
     preserveWhitespace: options.preserveWhitespace,
     buble: options.buble,
@@ -111,235 +116,6 @@ module.exports = function (content) {
   var preLoaders = options.preLoaders || {}
   var postLoaders = options.postLoaders || {}
 
-  function getRequire (type, part, index, scoped) {
-    return 'require(' +
-      getRequireString(type, part, index, scoped) +
-    ')'
-  }
-
-  function getImport (type, part, index, scoped) {
-    return 'import __vue_' + type + '__ from ' + getRequireString(type, part, index, scoped)
-  }
-
-  function getRequireString (type, part, index, scoped) {
-    return loaderUtils.stringifyRequest(loaderContext,
-      // disable all configuration loaders
-      '!!' +
-      // get loader string for pre-processors
-      getLoaderString(type, part, index, scoped) +
-      // select the corresponding part from the vue file
-      getSelectorString(type, index || 0) +
-      // the url to the actual vue file, including remaining requests
-      rawRequest
-    )
-  }
-
-  function getRequireForImport (type, impt, scoped) {
-    return 'require(' +
-      getRequireForImportString(type, impt, scoped) +
-    ')'
-  }
-
-  function getImportForImport (type, impt, scoped) {
-    return 'import __vue_' + type + '__ from ' + getRequireForImportString(type, impt, scoped)
-  }
-
-  function getRequireForImportString (type, impt, scoped) {
-    return loaderUtils.stringifyRequest(loaderContext,
-      '!!' +
-      getLoaderString(type, impt, -1, scoped) +
-      impt.src
-    )
-  }
-
-  function addCssModulesToLoader (loader, part, index) {
-    if (!part.module) return loader
-    var option = options.cssModules || {}
-    var DEFAULT_OPTIONS = {
-      modules: true,
-      importLoaders: true
-    }
-    var OPTIONS = {
-      localIdentName: '[hash:base64]'
-    }
-    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
-      // $1: !css-loader
-      // $2: ?a=b
-      var query = loaderUtils.parseQuery($2 || '?')
-      Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
-      if (index !== -1) {
-        // Note:
-        //   Class name is generated according to its filename.
-        //   Different <style> tags in the same .vue file may generate same names.
-        //   Append `_[index]` to class name to avoid this.
-        query.localIdentName += '_' + index
-      }
-      return $1 + '?' + JSON.stringify(query)
-    })
-  }
-
-  function buildCustomBlockLoaderString (attrs) {
-    var noSrcAttrs = Object.assign({}, attrs)
-    delete noSrcAttrs.src
-    var qs = querystring.stringify(noSrcAttrs)
-    return qs ? '?' + qs : qs
-  }
-
-  // stringify an Array of loader objects
-  function stringifyLoaders (loaders) {
-    return loaders.map(function (obj) {
-      return obj && typeof obj === 'object' && typeof obj.loader === 'string'
-        ? obj.loader + (obj.options ? '?' + JSON.stringify(obj.options) : '')
-        : obj
-    }).join('!')
-  }
-
-  function getLoaderString (type, part, index, scoped) {
-    var loader = getRawLoaderString(type, part, index, scoped)
-    var lang = getLangString(type, part)
-    if (preLoaders[lang]) {
-      loader = loader + ensureBang(preLoaders[lang])
-    }
-    if (postLoaders[lang]) {
-      loader = ensureBang(postLoaders[lang]) + loader
-    }
-    return loader
-  }
-
-  function getLangString (type, part) {
-    if (type === 'script' || type === 'template' || type === 'styles') {
-      return part.lang || defaultLang[type]
-    } else {
-      return type
-    }
-  }
-
-  function getRawLoaderString (type, part, index, scoped) {
-    var lang = part.lang || defaultLang[type]
-
-    var styleCompiler = ''
-    if (type === 'styles') {
-      // style compiler that needs to be applied for all styles
-      styleCompiler = styleCompilerPath + '?' + JSON.stringify({
-        // a marker for vue-style-loader to know that this is an import from a vue file
-        vue: true,
-        id: moduleId,
-        scoped: !!scoped,
-        hasInlineConfig: !!query.postcss
-      }) + '!'
-      // normalize scss/sass if no specific loaders have been provided
-      if (!loaders[lang]) {
-        if (lang === 'sass') {
-          lang = 'sass?indentedSyntax'
-        } else if (lang === 'scss') {
-          lang = 'sass'
-        }
-      }
-    }
-
-    var loader = options.extractCSS && type === 'styles'
-      ? loaders[lang] || getCSSExtractLoader(lang)
-      : loaders[lang]
-
-    var injectString = (type === 'script' && query.inject)
-      ? 'inject-loader!'
-      : ''
-
-    if (loader != null) {
-      if (Array.isArray(loader)) {
-        loader = stringifyLoaders(loader)
-      } else if (typeof loader === 'object') {
-        loader = stringifyLoaders([loader])
-      }
-      if (type === 'styles') {
-        // add css modules
-        loader = addCssModulesToLoader(loader, part, index)
-        // inject rewriter before css loader for extractTextPlugin use cases
-        if (rewriterInjectRE.test(loader)) {
-          loader = loader.replace(rewriterInjectRE, function (m, $1) {
-            return ensureBang($1) + styleCompiler
-          })
-        } else {
-          loader = ensureBang(loader) + styleCompiler
-        }
-      }
-      // if user defines custom loaders for html, add template compiler to it
-      if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
-        loader = defaultLoaders.html + '!' + loader
-      }
-      return injectString + ensureBang(loader)
-    } else {
-      // unknown lang, infer the loader to be used
-      switch (type) {
-        case 'template':
-          return defaultLoaders.html + '!' + templatePreprocessorPath + '?engine=' + lang + '!'
-        case 'styles':
-          loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
-        case 'script':
-          return injectString + ensureBang(ensureLoader(lang))
-        default:
-          loader = loaders[type]
-          if (Array.isArray(loader)) {
-            loader = stringifyLoaders(loader)
-          }
-          return ensureBang(loader + buildCustomBlockLoaderString(part.attrs))
-      }
-    }
-  }
-
-  // sass => sass-loader
-  // sass-loader => sass-loader
-  // sass?indentedSyntax!css => sass-loader?indentedSyntax!css-loader
-  function ensureLoader (lang) {
-    return lang.split('!').map(function (loader) {
-      return loader.replace(/^([\w-]+)(\?.*)?/, function (_, name, query) {
-        return (/-loader$/.test(name) ? name : (name + '-loader')) + (query || '')
-      })
-    }).join('!')
-  }
-
-  function getSelectorString (type, index) {
-    return selectorPath +
-      '?type=' + ((type === 'script' || type === 'template' || type === 'styles') ? type : 'customBlocks') +
-      '&index=' + index + '!'
-  }
-
-  function ensureBang (loader) {
-    if (loader.charAt(loader.length - 1) !== '!') {
-      return loader + '!'
-    } else {
-      return loader
-    }
-  }
-
-  function getCSSExtractLoader (lang) {
-    var extractor
-    var op = options.extractCSS
-    // extractCSS option is an instance of ExtractTextPlugin
-    if (typeof op.extract === 'function') {
-      extractor = op
-    } else {
-      extractor = tryRequire('extract-text-webpack-plugin')
-      if (!extractor) {
-        throw new Error(
-          '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
-          'as a peer dependency.'
-        )
-      }
-    }
-    var langLoader = lang
-      ? ensureBang(ensureLoader(lang))
-      : ''
-    return extractor.extract({
-      use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
-      fallback: 'vue-style-loader'
-    })
-  }
-
-  var output = ''
-  var parts = parse(content, fileName, this.sourceMap)
-  var hasScoped = parts.styles.some(function (s) { return s.scoped })
   var needsHotReload = (
     !isServer &&
     !isProduction &&
@@ -599,4 +375,232 @@ module.exports = function (content) {
 
   // done
   return output
+
+  // --- helpers ---
+
+  function getRequire (type, part, index, scoped) {
+    return 'require(' +
+      getRequireString(type, part, index, scoped) +
+    ')'
+  }
+
+  function getImport (type, part, index, scoped) {
+    return 'import __vue_' + type + '__ from ' + getRequireString(type, part, index, scoped)
+  }
+
+  function getRequireString (type, part, index, scoped) {
+    return loaderUtils.stringifyRequest(loaderContext,
+      // disable all configuration loaders
+      '!!' +
+      // get loader string for pre-processors
+      getLoaderString(type, part, index, scoped) +
+      // select the corresponding part from the vue file
+      getSelectorString(type, index || 0) +
+      // the url to the actual vue file, including remaining requests
+      rawRequest
+    )
+  }
+
+  function getRequireForImport (type, impt, scoped) {
+    return 'require(' +
+      getRequireForImportString(type, impt, scoped) +
+    ')'
+  }
+
+  function getImportForImport (type, impt, scoped) {
+    return 'import __vue_' + type + '__ from ' + getRequireForImportString(type, impt, scoped)
+  }
+
+  function getRequireForImportString (type, impt, scoped) {
+    return loaderUtils.stringifyRequest(loaderContext,
+      '!!' +
+      getLoaderString(type, impt, -1, scoped) +
+      impt.src
+    )
+  }
+
+  function addCssModulesToLoader (loader, part, index) {
+    if (!part.module) return loader
+    var option = options.cssModules || {}
+    var DEFAULT_OPTIONS = {
+      modules: true,
+      importLoaders: true
+    }
+    var OPTIONS = {
+      localIdentName: '[hash:base64]'
+    }
+    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
+      // $1: !css-loader
+      // $2: ?a=b
+      var query = loaderUtils.parseQuery($2 || '?')
+      Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
+      if (index !== -1) {
+        // Note:
+        //   Class name is generated according to its filename.
+        //   Different <style> tags in the same .vue file may generate same names.
+        //   Append `_[index]` to class name to avoid this.
+        query.localIdentName += '_' + index
+      }
+      return $1 + '?' + JSON.stringify(query)
+    })
+  }
+
+  function buildCustomBlockLoaderString (attrs) {
+    var noSrcAttrs = Object.assign({}, attrs)
+    delete noSrcAttrs.src
+    var qs = querystring.stringify(noSrcAttrs)
+    return qs ? '?' + qs : qs
+  }
+
+  // stringify an Array of loader objects
+  function stringifyLoaders (loaders) {
+    return loaders.map(function (obj) {
+      return obj && typeof obj === 'object' && typeof obj.loader === 'string'
+        ? obj.loader + (obj.options ? '?' + JSON.stringify(obj.options) : '')
+        : obj
+    }).join('!')
+  }
+
+  function getLoaderString (type, part, index, scoped) {
+    var loader = getRawLoaderString(type, part, index, scoped)
+    var lang = getLangString(type, part)
+    if (preLoaders[lang]) {
+      loader = loader + ensureBang(preLoaders[lang])
+    }
+    if (postLoaders[lang]) {
+      loader = ensureBang(postLoaders[lang]) + loader
+    }
+    return loader
+  }
+
+  function getLangString (type, part) {
+    if (type === 'script' || type === 'template' || type === 'styles') {
+      return part.lang || defaultLang[type]
+    } else {
+      return type
+    }
+  }
+
+  function getRawLoaderString (type, part, index, scoped) {
+    var lang = part.lang || defaultLang[type]
+
+    var styleCompiler = ''
+    if (type === 'styles') {
+      // style compiler that needs to be applied for all styles
+      styleCompiler = styleCompilerPath + '?' + JSON.stringify({
+        // a marker for vue-style-loader to know that this is an import from a vue file
+        vue: true,
+        id: moduleId,
+        scoped: !!scoped,
+        hasInlineConfig: !!query.postcss
+      }) + '!'
+      // normalize scss/sass if no specific loaders have been provided
+      if (!loaders[lang]) {
+        if (lang === 'sass') {
+          lang = 'sass?indentedSyntax'
+        } else if (lang === 'scss') {
+          lang = 'sass'
+        }
+      }
+    }
+
+    var loader = options.extractCSS && type === 'styles'
+      ? loaders[lang] || getCSSExtractLoader(lang)
+      : loaders[lang]
+
+    var injectString = (type === 'script' && query.inject)
+      ? 'inject-loader!'
+      : ''
+
+    if (loader != null) {
+      if (Array.isArray(loader)) {
+        loader = stringifyLoaders(loader)
+      } else if (typeof loader === 'object') {
+        loader = stringifyLoaders([loader])
+      }
+      if (type === 'styles') {
+        // add css modules
+        loader = addCssModulesToLoader(loader, part, index)
+        // inject rewriter before css loader for extractTextPlugin use cases
+        if (rewriterInjectRE.test(loader)) {
+          loader = loader.replace(rewriterInjectRE, function (m, $1) {
+            return ensureBang($1) + styleCompiler
+          })
+        } else {
+          loader = ensureBang(loader) + styleCompiler
+        }
+      }
+      // if user defines custom loaders for html, add template compiler to it
+      if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
+        loader = defaultLoaders.html + '!' + loader
+      }
+      return injectString + ensureBang(loader)
+    } else {
+      // unknown lang, infer the loader to be used
+      switch (type) {
+        case 'template':
+          return defaultLoaders.html + '!' + templatePreprocessorPath + '?engine=' + lang + '!'
+        case 'styles':
+          loader = addCssModulesToLoader(defaultLoaders.css, part, index)
+          return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
+        case 'script':
+          return injectString + ensureBang(ensureLoader(lang))
+        default:
+          loader = loaders[type]
+          if (Array.isArray(loader)) {
+            loader = stringifyLoaders(loader)
+          }
+          return ensureBang(loader + buildCustomBlockLoaderString(part.attrs))
+      }
+    }
+  }
+
+  // sass => sass-loader
+  // sass-loader => sass-loader
+  // sass?indentedSyntax!css => sass-loader?indentedSyntax!css-loader
+  function ensureLoader (lang) {
+    return lang.split('!').map(function (loader) {
+      return loader.replace(/^([\w-]+)(\?.*)?/, function (_, name, query) {
+        return (/-loader$/.test(name) ? name : (name + '-loader')) + (query || '')
+      })
+    }).join('!')
+  }
+
+  function getSelectorString (type, index) {
+    return selectorPath +
+      '?type=' + ((type === 'script' || type === 'template' || type === 'styles') ? type : 'customBlocks') +
+      '&index=' + index + '!'
+  }
+
+  function ensureBang (loader) {
+    if (loader.charAt(loader.length - 1) !== '!') {
+      return loader + '!'
+    } else {
+      return loader
+    }
+  }
+
+  function getCSSExtractLoader (lang) {
+    var extractor
+    var op = options.extractCSS
+    // extractCSS option is an instance of ExtractTextPlugin
+    if (typeof op.extract === 'function') {
+      extractor = op
+    } else {
+      extractor = tryRequire('extract-text-webpack-plugin')
+      if (!extractor) {
+        throw new Error(
+          '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
+          'as a peer dependency.'
+        )
+      }
+    }
+    var langLoader = lang
+      ? ensureBang(ensureLoader(lang))
+      : ''
+    return extractor.extract({
+      use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
+      fallback: 'vue-style-loader'
+    })
+  }
 }
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 01ea244b7..3d123b3a3 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -23,7 +23,7 @@ module.exports = function (html) {
   var compilerOptions = {
     preserveWhitespace: options.preserveWhitespace,
     modules: defaultModules.concat(userModules || []),
-    scopedId: options.id
+    scopeId: options.hasScoped ? options.id : null
   }
 
   var compile = isServer && compiler.ssrCompile && vueOptions.optimizeSSR !== false
diff --git a/package.json b/package.json
index c1b96b593..b003d7bc3 100644
--- a/package.json
+++ b/package.json
@@ -77,9 +77,9 @@
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.2.0",
     "url-loader": "^0.5.7",
-    "vue": "^2.3.2",
-    "vue-server-renderer": "^2.3.2",
-    "vue-template-compiler": "^2.3.2",
+    "vue": "^2.4.1",
+    "vue-server-renderer": "^2.4.1",
+    "vue-template-compiler": "^2.4.1",
     "webpack": "^3.0.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index cfc813f6d..23b52825d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -223,20 +223,20 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.24.1, babel-core@^6.8.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+babel-core@^6.24.1, babel-core@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
     babel-code-frame "^6.22.0"
-    babel-generator "^6.24.1"
+    babel-generator "^6.25.0"
     babel-helpers "^6.24.1"
     babel-messages "^6.23.0"
     babel-register "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
+    babel-template "^6.25.0"
+    babel-traverse "^6.25.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     convert-source-map "^1.1.0"
     debug "^2.1.1"
     json5 "^0.5.0"
@@ -247,13 +247,13 @@ babel-core@^6.24.1, babel-core@^6.8.0:
     slash "^1.0.0"
     source-map "^0.5.0"
 
-babel-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+babel-generator@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.25.0.tgz#33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    babel-types "^6.25.0"
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.2.0"
@@ -644,42 +644,42 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+babel-template@^6.24.1, babel-template@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    babylon "^6.11.0"
+    babel-traverse "^6.25.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     lodash "^4.2.0"
 
-babel-traverse@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+babel-traverse@^6.24.1, babel-traverse@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
   dependencies:
     babel-code-frame "^6.22.0"
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    babylon "^6.15.0"
+    babel-types "^6.25.0"
+    babylon "^6.17.2"
     debug "^2.2.0"
     globals "^9.0.0"
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.19.0, babel-types@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.25.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
   dependencies:
     babel-runtime "^6.22.0"
     esutils "^2.0.2"
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.11.0, babylon@^6.15.0:
-  version "6.17.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
+babylon@^6.17.2:
+  version "6.17.4"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
 balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
@@ -4234,9 +4234,9 @@ vue-hot-reload-api@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
 
-vue-server-renderer@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.3.2.tgz#01bfde9c524ef041873f1e2d18f9356c620b4f8c"
+vue-server-renderer@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.4.1.tgz#9a1986c459387eaa319c16ca5c0d0f2ebb2c66c5"
   dependencies:
     chalk "^1.1.3"
     hash-sum "^1.0.2"
@@ -4254,9 +4254,9 @@ vue-style-loader@^3.0.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.3.2.tgz#d48a7f53df5f497033827182ceb4f0d340803017"
+vue-template-compiler@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.1.tgz#20115cf8714f222f9be4111ec75b079a1c9b8197"
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -4265,9 +4265,9 @@ vue-template-es2015-compiler@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
-vue@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.3.2.tgz#9e52aae3593480be235ff227557837e69f98203a"
+vue@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.1.tgz#76e0b8eee614613532216b7bfe784e0b5695b160"
 
 watchpack@^1.3.1:
   version "1.3.1"

From 0cb6d4d76db6a638bc10184828ed6c463458fe0a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 13 Jul 2017 23:13:45 +0800
Subject: [PATCH 667/877] 13.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b003d7bc3..f6a91f6d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.1",
+  "version": "13.0.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 04e6b7b468e367994ee3fe1a9a8cc023461da0c8 Mon Sep 17 00:00:00 2001
From: vasttian <tianyiming26@gmail.com>
Date: Wed, 19 Jul 2017 17:30:55 +0800
Subject: [PATCH 668/877] Update spec.md (#876)

---
 docs/zh-cn/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 44f23dee8..e6e8a5ef0 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -74,7 +74,7 @@ export default {
 
 > 只在 vue-loader 10.2.0+ 中支持
 
-可以在 `.vue` 文件中填加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loaders 来应用在对应的块上。webpack loaders 需要在 `vue-loader` 的选项 `loaders` 中指定。
+可以在 `.vue` 文件中添加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loaders 来应用在对应的块上。webpack loaders 需要在 `vue-loader` 的选项 `loaders` 中指定。
 
 更多细节，查看 [自定义块](../configurations/custom-blocks.md)。
 

From 80670901adf584960334c1f88e94fb257b5bad68 Mon Sep 17 00:00:00 2001
From: Roberto Entringer <r.entringer@gmail.com>
Date: Sat, 29 Jul 2017 16:42:12 +0200
Subject: [PATCH 669/877] =?UTF-8?q?Corre=C3=A7=C3=A3o=20texto=20""=20(#909?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correção texto "proto" para uso " por "pronto" para uso na linha 7.
---
 docs/pt_BR/features/hot-reload.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pt_BR/features/hot-reload.md b/docs/pt_BR/features/hot-reload.md
index 67576439a..a5dea564a 100644
--- a/docs/pt_BR/features/hot-reload.md
+++ b/docs/pt_BR/features/hot-reload.md
@@ -4,4 +4,4 @@
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
-Quando o esqueleto do projeto é criado com `vue-cli`, Hot Reload é ativado e proto para o uso.
\ No newline at end of file
+Quando o esqueleto do projeto é criado com `vue-cli`, Hot Reload é ativado e pronto para o uso.

From 746601b0f8a6bd5dea3416fb902575a02bcd23b9 Mon Sep 17 00:00:00 2001
From: Bruno Lesieur <bruno.lesieur@gmail.com>
Date: Sat, 29 Jul 2017 17:13:22 +0200
Subject: [PATCH 670/877] - Change all `>=` to `+` for consistency accross all
 Vue documentation. (#889)

---
 docs/en/configurations/advanced.md | 2 +-
 docs/en/options.md                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 2a4a33b2e..90563308b 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -10,7 +10,7 @@ Sometimes you may want to:
 
 To do that, specify the `loaders` option for `vue-loader`:
 
-> Note that `preLoaders` and `postLoaders` are only supported in >=10.3.0
+> Note that `preLoaders` and `postLoaders` are only supported in 10.3.0+
 
 ### Webpack 2.x
 
diff --git a/docs/en/options.md b/docs/en/options.md
index dcb2ad3dd..346f7fb52 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -64,14 +64,14 @@ module.exports = {
 ### preLoaders
 
 - type: `{ [lang: string]: string }`
-- only supported in >=10.3.0
+- only supported in 10.3.0+
 
   The config format is the same as `loaders`, but `preLoaders` are applied to corresponding language blocks before the default loaders. You can use this to pre-process language blocks - a common use case would be build-time i18n.
 
 ### postLoaders
 
 - type: `{ [lang: string]: string }`
-- only supported in >=10.3.0
+- only supported in 10.3.0+
 
   The config format is the same as `loaders`, but `postLoaders` are applied after the default loaders. You can use this to post-process language blocks. However note that this is a bit more complicated:
 
@@ -81,7 +81,7 @@ module.exports = {
 
 ### postcss
 
-> Note: in >=11.0.0 it is recommended to use a PostCSS config file instead. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+> Note: in 11.0.0+ it is recommended to use a PostCSS config file instead. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
 
 - type: `Array` or `Function` or `Object`
 

From 46fc1e1a7aacfeb1ad9f3bfd1c0378f423058c43 Mon Sep 17 00:00:00 2001
From: Nguyen Quoc Anh <quocanh96@gmail.com>
Date: Sat, 29 Jul 2017 22:33:40 +0700
Subject: [PATCH 671/877] docs(options.md): Change default value of `esModule`
 (#905)

* docs(options.md): Change default value of `esModule`

* Update options.md

* fix: wrong text

* fix: typo

* Update options.md
---
 docs/en/options.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index 346f7fb52..37903ed35 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -124,7 +124,8 @@ module.exports = {
 ### esModule
 
 - type: `boolean`
-- default: `false`
+- default: `true`
+- In v12.x or below, default value is `false`
 
   Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
 

From 62b698c93f82b305eb01f2dfef2c247ac4454153 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 30 Jul 2017 00:57:06 +0900
Subject: [PATCH 672/877] docs(en/options): tweak esModule note

---
 docs/en/options.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index 37903ed35..09e616870 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -124,11 +124,12 @@ module.exports = {
 ### esModule
 
 - type: `boolean`
-- default: `true`
-- In v12.x or below, default value is `false`
+- default: `true` (v13.0+)
 
   Whether to emit esModule compatible code. By default vue-loader will emit default export in commonjs format like `module.exports = ....`. When `esModule` is set to true, default export will be transpiled into `exports.__esModule = true; exports = ...`. Useful for interoperating with transpiler other than Babel, like TypeScript.
 
+  > version note: up to v12.x, default value is `false`.
+
 ### preserveWhitespace
 
 - type: `boolean`

From 14b899ec01adf9e98361d8854d285c1e55175ffd Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sun, 30 Jul 2017 01:01:17 +0900
Subject: [PATCH 673/877] docs(ja): update ja docs

---
 docs/ja/configurations/advanced.md |  2 +-
 docs/ja/options.md                 | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index 13ef1d20b..b4716292f 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -8,7 +8,7 @@
 
 そうするためには、`vue-loader` に `loaders` オプションを指定してください:
 
-> メモ: `preLoaders` と `postLoaders` は 10.3.0 以上でのみサポートされます
+> メモ: `preLoaders` と `postLoaders` は 10.3.0 以降でのみサポートされます
 
 ### Webpack 2.x
 
diff --git a/docs/ja/options.md b/docs/ja/options.md
index 722ce1bd0..d5bc5f3f4 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -64,14 +64,14 @@ module.exports = {
 ### preLoaders
 
 - 型: `{ [lang: string]: string }`
-- 10.3.0 以上でサポートされます。
+- 10.3.0 以降でサポートされます。
 
   config 形式は `loaders` と同じですが、`preLoaders` はデフォルト loader の前に対応する言語ブロックに適用されます。これを使用して言語ブロックを前処理することができます。一般的な使用例としては、i18n のビルド時です。
 
 ### postLoaders
 
 - 型: `{ [lang: string]: string }`
-- 10.3.0 以上でサポートされます。
+- 10.3.0 以降でサポートされます。
 
   config 形式は `loaders` と同じですが、` postLoaders` はデフォルト loader の後に適用されます。これを使用して言語ブロックを後処理することができます。ただしこれは少し複雑になります:
 
@@ -80,7 +80,7 @@ module.exports = {
 
 ### postcss
 
-  > メモ: 11.0.0 以上では代わりに PostCSS の設定ファイル推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
+  > メモ: 11.0.0 以降では代わりに PostCSS の設定ファイル推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
 
 - 型: `Array` もしくは `Function` か `Object`
 
@@ -123,10 +123,12 @@ module.exports = {
 ### esModule
 
 - 型: `boolean`
-- デフォルト: `false`
+- デフォルト: `true` (v13.0以降)
 
   esModule 互換コードを発行するかどうか。デフォルトの vue-loader のデフォルトの出力は `module.exports = ....` のような commonjs 形式で発行します。 `esModule` が true にセットされているとき、デフォルトの出力は `exports.__esModule = true; exports = ...` にトランスパイルされます。TypeScript のような Babel 以外の transpiler との相互運用に役立ちます。
 
+  > バージョンメモ: v12.x までは、デフォルトは `false` です。
+
 ### preserveWhitespace
 
 - 型: `boolean`
@@ -251,7 +253,7 @@ module.exports = {
 
 ### optimizeSSR
 
-> 12.1.1 で追加
+> 12.1.1 で新規追加
 
 - 型: `boolean`
 - デフォルト: webpack 設定が `target: 'node'` でかつ `vue-template-compiler` が バージョン 2.4.0 以上であれば、`true`

From e6d5956f80233a0349bda735485e1a2c66c60c5f Mon Sep 17 00:00:00 2001
From: Allenice <994298628@qq.com>
Date: Sat, 29 Jul 2017 16:00:38 -0400
Subject: [PATCH 674/877] fix css module HMR (#900)

---
 lib/loader.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index cc574b8eb..4f8b38c4b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -182,7 +182,10 @@ module.exports = function (content) {
               invokeStyle(`cssModules["${moduleName}"] = ${requireString}`) +
               `Object.defineProperty(this, "${moduleName}", { get: function () { return cssModules["${moduleName}"] }})\n`
 
-            var requirePath = getRequireString('styles', style, i, style.scoped)
+            var requirePath = style.src
+              ? getRequireForImportString('styles', style, style.scoped)
+              : getRequireString('styles', style, i, style.scoped)
+
             output +=
               `module.hot && module.hot.accept([${requirePath}], function () {\n` +
               // 1. check if style has been injected

From 7253e32a60d4a4bd8a1e7bdb1913a236249f5703 Mon Sep 17 00:00:00 2001
From: Alex Riviere <fimion@users.noreply.github.com>
Date: Sat, 29 Jul 2017 16:02:55 -0400
Subject: [PATCH 675/877] Adds support for scoped selectors in @supports
 queries (#908)

* Adds support for scoped selectors in @supports queries

Added testing for @supports as well

* Update test.js

* Update scope-id.js
---
 lib/style-compiler/plugins/scope-id.js |  2 +-
 test/fixtures/supports-query.vue       |  7 +++++++
 test/test.js                           | 12 ++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/supports-query.vue

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index d0be6c101..20aba44a0 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -9,7 +9,7 @@ module.exports = postcss.plugin('add-id', function (opts) {
       if (!node.selector) {
         // handle media queries
         if (node.type === 'atrule') {
-          if (node.name === 'media') {
+          if (node.name === 'media' || node.name === 'supports') {
             node.each(rewriteSelector)
           } else if (node.name === 'keyframes') {
             // register keyframes
diff --git a/test/fixtures/supports-query.vue b/test/fixtures/supports-query.vue
new file mode 100644
index 000000000..88db49709
--- /dev/null
+++ b/test/fixtures/supports-query.vue
@@ -0,0 +1,7 @@
+<style scoped>
+@supports ( color: #000 ) {
+  .foo {
+    color: #000;
+  }
+}
+</style>
diff --git a/test/test.js b/test/test.js
index 65c74887f..00d3d84c0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -309,6 +309,18 @@ describe('vue-loader', function () {
     })
   })
 
+  it('supports-query', done => {
+    test({
+      entry: './test/fixtures/supports-query.vue'
+    }, (window) => {
+      var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      var id = 'data-v-' + hash('vue-loader/test/fixtures/supports-query.vue')
+      expect(style).to.contain('@supports ( color: #000 ) {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
+      done()
+    })
+  })
+
   it('extract CSS', done => {
     bundle({
       entry: './test/fixtures/extract-css.vue',

From e6abc198c950345c4cf2e25f343025954412e907 Mon Sep 17 00:00:00 2001
From: "wenlu.wang" <805037171@163.com>
Date: Sun, 30 Jul 2017 04:11:18 +0800
Subject: [PATCH 676/877] support comment option in template (#897)

* support comment option in template

* Update loader.js

* Update template-comment.vue
---
 lib/loader.js                      |  2 ++
 lib/template-compiler/index.js     |  3 ++-
 test/fixtures/template-comment.vue | 16 ++++++++++++++++
 test/test.js                       | 25 +++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/template-comment.vue

diff --git a/lib/loader.js b/lib/loader.js
index 4f8b38c4b..49ec3f23f 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -89,10 +89,12 @@ module.exports = function (content) {
   var output = ''
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
+  var hasComment = parts.template && parts.template.attrs.comments
 
   var templateCompilerOptions = '?' + JSON.stringify({
     id: moduleId,
     hasScoped: hasScoped,
+    hasComment: hasComment,
     transformToRequire: options.transformToRequire,
     preserveWhitespace: options.preserveWhitespace,
     buble: options.buble,
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 3d123b3a3..72da53379 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -23,7 +23,8 @@ module.exports = function (html) {
   var compilerOptions = {
     preserveWhitespace: options.preserveWhitespace,
     modules: defaultModules.concat(userModules || []),
-    scopeId: options.hasScoped ? options.id : null
+    scopeId: options.hasScoped ? options.id : null,
+    comments: options.hasComment
   }
 
   var compile = isServer && compiler.ssrCompile && vueOptions.optimizeSSR !== false
diff --git a/test/fixtures/template-comment.vue b/test/fixtures/template-comment.vue
new file mode 100644
index 000000000..a72b02fa4
--- /dev/null
+++ b/test/fixtures/template-comment.vue
@@ -0,0 +1,16 @@
+<template comments>
+  <div>
+    <h2 class="red">{{msg}}</h2><!-- comment here -->
+  </div>
+</template>
+
+<script>
+export default {
+  comments: true,
+  data () {
+    return {
+      msg: 'Hello from Component A!'
+    }
+  }
+}
+</script>
diff --git a/test/test.js b/test/test.js
index 00d3d84c0..60781e2d6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -98,11 +98,18 @@ function mockRender (options, data) {
       children: children
     }
   }
+  function e (text = '') {
+    return {
+      text:  text,
+      isComment: true
+    }
+  }
   return options.render.call(Object.assign({
     _v (val) {
       return val
     },
     _self: {},
+    _e: e,
     $createElement: h,
     _m (index) {
       return options.staticRenderFns[index].call(this)
@@ -907,4 +914,22 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('template with comments', done => {
+    test({
+      entry: './test/fixtures/template-comment.vue'
+    }, (window, module, rawModule) => {
+      expect(module.comments).to.equal(true)
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.children.length).to.equal(2)
+      expect(vnode.children[0].data.staticClass).to.equal('red')
+      expect(vnode.children[0].children[0]).to.equal('hi')
+      expect(vnode.children[1].isComment).to.true
+      expect(vnode.children[1].text).to.equal(' comment here ')
+      done()
+    })
+  })
 })

From b748a5a42eb8c626f354565ba57c7d10e7ce9bb3 Mon Sep 17 00:00:00 2001
From: Capi Etheriel <barraponto@gmail.com>
Date: Sat, 29 Jul 2017 17:30:14 -0300
Subject: [PATCH 677/877] support postcss.options.plugins being a function
 (#866)

---
 lib/style-compiler/load-postcss-config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index f276ce009..df80076ff 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -27,7 +27,9 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig) {
     if (Array.isArray(inlineConfig)) {
       plugins = inlineConfig
     } else if (isObject(inlineConfig)) {
-      plugins = inlineConfig.plugins || []
+      plugins = (typeof inlineConfig.plugins === 'function')
+        ? inlineConfig.plugins.call(this, this)
+        : inlineConfig.plugins || []
       options = inlineConfig.options || {}
     }
 

From f5b59792aa17670f89ec74047da2908cf40625a7 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sun, 30 Jul 2017 02:00:52 +0530
Subject: [PATCH 678/877] chore(package): Bump updatable dependencies (#886)

---
 package.json |  38 +++----
 yarn.lock    | 307 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 202 insertions(+), 143 deletions(-)

diff --git a/package.json b/package.json
index f6a91f6d4..8e3345c30 100644
--- a/package.json
+++ b/package.json
@@ -31,10 +31,10 @@
   "dependencies": {
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
-    "js-beautify": "^1.6.3",
+    "js-beautify": "^1.6.14",
     "loader-utils": "^1.1.0",
-    "lru-cache": "^4.0.1",
-    "postcss": "^6.0.1",
+    "lru-cache": "^4.1.1",
+    "postcss": "^6.0.6",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "resolve": "^1.3.3",
@@ -50,36 +50,36 @@
   "devDependencies": {
     "babel-core": "^6.25.0",
     "babel-loader": "^7.0.0",
-    "babel-preset-env": "^1.5.2",
-    "chai": "^3.0.0",
+    "babel-preset-env": "^1.6.0",
+    "chai": "^4.1.0",
     "coffee-loader": "^0.7.2",
-    "coffee-script": "^1.10.0",
-    "css-loader": "^0.26.0",
-    "eslint": "^3.14.1",
+    "coffee-script": "^1.12.6",
+    "css-loader": "^0.28.4",
+    "eslint": "^3.19.0",
     "eslint-plugin-vue-libs": "^1.2.0",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^2.1.2",
-    "file-loader": "^0.10.0",
-    "inject-loader": "^2.0.0",
-    "js-yaml": "^3.8.2",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^0.11.2",
+    "inject-loader": "^3.0.0",
+    "js-yaml": "^3.9.0",
     "jsdom": "^9.2.1",
     "marked": "^0.3.6",
     "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
+    "mocha": "^3.4.2",
     "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",
     "null-loader": "^0.1.1",
-    "pug": "^2.0.0-beta6",
+    "pug": "^2.0.0-rc.2",
     "raw-loader": "^0.5.1",
-    "skeleton-loader": "0.0.5",
+    "skeleton-loader": "1.1.3",
     "stylus": "^0.54.5",
-    "stylus-loader": "^2.0.0",
-    "sugarss": "^0.2.0",
-    "url-loader": "^0.5.7",
+    "stylus-loader": "^3.0.1",
+    "sugarss": "^1.0.0",
+    "url-loader": "^0.5.9",
     "vue": "^2.4.1",
     "vue-server-renderer": "^2.4.1",
     "vue-template-compiler": "^2.4.1",
-    "webpack": "^3.0.0"
+    "webpack": "^3.3.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 23b52825d..9471b0329 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -92,6 +92,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-styles@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
+  dependencies:
+    color-convert "^1.0.0"
+
 anymatch@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
@@ -192,6 +198,12 @@ async@^2.1.2:
   dependencies:
     lodash "^4.14.0"
 
+async@^2.4.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+  dependencies:
+    lodash "^4.14.0"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -223,7 +235,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.24.1, babel-core@^6.25.0:
+babel-core@^6.24.1, babel-core@^6.25.0, babel-core@~6:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
   dependencies:
@@ -590,9 +602,9 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-preset-env@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
+babel-preset-env@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -881,13 +893,16 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chai@^3.0.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+chai@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.0.tgz#331a0391b55c3af8740ae9c3b7458bc1c3805e6d"
   dependencies:
     assertion-error "^1.0.1"
-    deep-eql "^0.1.3"
-    type-detect "^1.0.0"
+    check-error "^1.0.1"
+    deep-eql "^2.0.1"
+    get-func-name "^2.0.0"
+    pathval "^1.0.0"
+    type-detect "^4.0.0"
 
 chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
@@ -899,15 +914,27 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 character-parser@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
   dependencies:
     is-regex "^1.0.3"
 
-chokidar@^1.4.3:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
+check-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
+chokidar@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -993,11 +1020,11 @@ coffee-loader@^0.7.2:
   dependencies:
     loader-utils "^1.0.2"
 
-coffee-script@^1.10.0:
-  version "1.12.5"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346"
+coffee-script@^1.12.6:
+  version "1.12.6"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.6.tgz#285a3f7115689065064d6bf9ef4572db66695cbf"
 
-color-convert@^1.3.0:
+color-convert@^1.0.0, color-convert@^1.3.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
@@ -1177,13 +1204,14 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-css-loader@^0.26.0:
-  version "0.26.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.4.tgz#b61e9e30db94303e6ffc892f10ecd09ad025a1fd"
+css-loader@^0.28.4:
+  version "0.28.4"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
     cssnano ">=2.6.1 <4"
+    icss-utils "^2.1.0"
     loader-utils "^1.0.2"
     lodash.camelcase "^4.3.0"
     object-assign "^4.0.1"
@@ -1192,6 +1220,7 @@ css-loader@^0.26.0:
     postcss-modules-local-by-default "^1.0.1"
     postcss-modules-scope "^1.0.0"
     postcss-modules-values "^1.1.0"
+    postcss-value-parser "^3.3.0"
     source-list-map "^0.1.7"
 
 css-parse@1.7.x:
@@ -1308,11 +1337,11 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-deep-eql@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+deep-eql@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-2.0.2.tgz#b1bac06e56f0a76777686d50c9feb75c2ed7679a"
   dependencies:
-    type-detect "0.1.1"
+    type-detect "^3.0.0"
 
 deep-extend@~0.4.0:
   version "0.4.1"
@@ -1449,9 +1478,9 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
-enhanced-resolve@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+enhanced-resolve@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -1562,7 +1591,7 @@ eslint-plugin-vue-libs@^1.2.0:
   dependencies:
     eslint-plugin-html "^2.0.0"
 
-eslint@^3.14.1:
+eslint@^3.19.0:
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
   dependencies:
@@ -1617,6 +1646,10 @@ esprima@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
 esquery@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -1693,12 +1726,12 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
+extract-text-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
   dependencies:
-    async "^2.1.2"
-    loader-utils "^1.0.2"
+    async "^2.4.1"
+    loader-utils "^1.1.0"
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
@@ -1732,9 +1765,9 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842"
+file-loader@^0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
   dependencies:
     loader-utils "^1.0.2"
 
@@ -1867,6 +1900,10 @@ get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
 
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2057,6 +2094,12 @@ icss-replace-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
 
+icss-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  dependencies:
+    postcss "^6.0.1"
+
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -2096,11 +2139,11 @@ ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inject-loader@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-2.0.1.tgz#1a7b45d60a81610459ac76079c3ce2a654d0dfc7"
+inject-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-3.0.0.tgz#0aea1f96e589e657bdbb6b26e7d9d41730e5b68f"
   dependencies:
-    loader-utils "^0.2.3"
+    babel-core "~6"
 
 inquirer@^0.12.0:
   version "0.12.0"
@@ -2321,9 +2364,9 @@ js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
-js-beautify@^1.6.3:
-  version "1.6.12"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.12.tgz#78b75933505d376da6e5a28e9b7887e0094db8b5"
+js-beautify@^1.6.14:
+  version "1.6.14"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
   dependencies:
     config-chain "~1.1.5"
     editorconfig "^0.13.2"
@@ -2338,13 +2381,20 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.2:
+js-yaml@^3.4.3, js-yaml@^3.5.1:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
   dependencies:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
+js-yaml@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@~3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -2485,15 +2535,6 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.16, loader-utils@^0.2.3, loader-utils@^0.2.9:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
 loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -2609,12 +2650,12 @@ lru-cache@^3.2.0:
   dependencies:
     pseudomap "^1.0.1"
 
-lru-cache@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+lru-cache@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
-    pseudomap "^1.0.1"
-    yallist "^2.0.0"
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
 macaddress@^0.2.8:
   version "0.2.8"
@@ -2708,9 +2749,9 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
-mocha@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.3.0.tgz#d29b7428d3f52c82e2e65df1ecb7064e1aabbfb5"
+mocha@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.4.2.tgz#d0ef4d332126dbf18d0d640c9b382dd48be97594"
   dependencies:
     browser-stdout "1.3.0"
     commander "2.9.0"
@@ -2994,6 +3035,10 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+pathval@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+
 pbkdf2@^3.0.3:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
@@ -3280,7 +3325,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.4:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -3289,6 +3334,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
+postcss@^6.0.0, postcss@^6.0.6:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
+  dependencies:
+    chalk "^2.0.1"
+    source-map "^0.5.6"
+    supports-color "^4.1.0"
+
 postcss@^6.0.1:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.3.tgz#b7f565b3d956fbb8565ca7c1e239d0506e427d8b"
@@ -3339,7 +3392,7 @@ prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
-pseudomap@^1.0.1:
+pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
@@ -3378,43 +3431,43 @@ pug-error@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
 
-pug-filters@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.2.tgz#3590b41adb34749f71d3f1f1a9f745011119117b"
+pug-filters@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.3.tgz#d59767a220de797dd755489f66834cf9aa83aa54"
   dependencies:
     clean-css "^3.3.0"
     constantinople "^3.0.1"
     jstransformer "1.0.0"
     pug-error "^1.3.2"
-    pug-walk "^1.1.2"
+    pug-walk "^1.1.3"
     resolve "^1.1.6"
     uglify-js "^2.6.1"
 
-pug-lexer@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-2.3.2.tgz#68b19d96ea5dc0e4a86148b01cb966c17815a614"
+pug-lexer@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
   dependencies:
     character-parser "^2.1.1"
     is-expression "^3.0.0"
     pug-error "^1.3.2"
 
-pug-linker@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-2.0.3.tgz#b331ffa25737dde69c127b56c10ff17fae766dca"
+pug-linker@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.1.tgz#ba3f8ff213ca8f3a304859b44fed13ca7b9dfa19"
   dependencies:
     pug-error "^1.3.2"
-    pug-walk "^1.1.2"
+    pug-walk "^1.1.3"
 
-pug-load@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.6.tgz#86da4b31c4f76fd9a471982b9b3d00e6c8a3f945"
+pug-load@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.7.tgz#531d0c6e11546010e984630d03df406367d2de77"
   dependencies:
     object-assign "^4.1.0"
-    pug-walk "^1.1.2"
+    pug-walk "^1.1.3"
 
-pug-parser@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-2.0.2.tgz#53a680cfd05039dcb0c27d029094bc4a792689b0"
+pug-parser@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-3.0.0.tgz#37c619dd800f642187ce4d6ce1a164cdd75487a3"
   dependencies:
     pug-error "^1.3.2"
     token-stream "0.0.1"
@@ -3429,20 +3482,20 @@ pug-strip-comments@^1.0.2:
   dependencies:
     pug-error "^1.3.2"
 
-pug-walk@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.2.tgz#debb24c070a95d5fc2aebf3589261833d2332e3b"
+pug-walk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.3.tgz#d7cd5b23db3ca87c636c86a0973f9cd8e030436c"
 
-pug@^2.0.0-beta6:
-  version "2.0.0-beta9"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-beta9.tgz#158ec6dbace5bb78f2b25e8825477d03ea6e14b0"
+pug@^2.0.0-rc.2:
+  version "2.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-rc.2.tgz#07845527790ab2c6be67dcf5eb1f31804081f04a"
   dependencies:
     pug-code-gen "^1.1.1"
-    pug-filters "^2.1.0"
-    pug-lexer "^2.3.1"
-    pug-linker "^2.0.1"
-    pug-load "^2.0.4"
-    pug-parser "^2.0.2"
+    pug-filters "^2.1.3"
+    pug-lexer "^3.1.0"
+    pug-linker "^3.0.1"
+    pug-load "^2.0.7"
+    pug-parser "^3.0.0"
     pug-runtime "^2.0.3"
     pug-strip-comments "^1.0.2"
 
@@ -3781,11 +3834,11 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-skeleton-loader@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/skeleton-loader/-/skeleton-loader-0.0.5.tgz#0f00aff547f6651db2f52b69decddf969098f678"
+skeleton-loader@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/skeleton-loader/-/skeleton-loader-1.1.3.tgz#0c49a088b74b8b48442de56206059ad05e5af9f0"
   dependencies:
-    loader-utils "^0.2.16"
+    loader-utils "^1.1.0"
 
 slash@^1.0.0:
   version "1.0.0"
@@ -3946,11 +3999,11 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-stylus-loader@^2.0.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-2.5.1.tgz#d5ad8a7e0958adc12b8581e7bb169b9a61d54216"
+stylus-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.1.tgz#77f4b34fd030d25b2617bcf5513db5b0730c4089"
   dependencies:
-    loader-utils "^0.2.9"
+    loader-utils "^1.0.2"
     lodash.clonedeep "^4.5.0"
     when "~3.6.x"
 
@@ -3965,11 +4018,11 @@ stylus@^0.54.5:
     sax "0.5.x"
     source-map "0.1.x"
 
-sugarss@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+sugarss@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"
   dependencies:
-    postcss "^5.2.4"
+    postcss "^6.0.0"
 
 supports-color@3.1.2, supports-color@^3.1.0:
   version "3.1.2"
@@ -3993,6 +4046,12 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
+  dependencies:
+    has-flag "^2.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -4109,13 +4168,13 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+type-detect@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-3.0.0.tgz#46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55"
 
-type-detect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+type-detect@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
 
 typedarray@^0.0.6:
   version "0.0.6"
@@ -4143,7 +4202,7 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^0.4.4:
+uglifyjs-webpack-plugin@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
   dependencies:
@@ -4169,9 +4228,9 @@ uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
 
-url-loader@^0.5.7:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
+url-loader@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
   dependencies:
     loader-utils "^1.0.2"
     mime "1.3.x"
@@ -4269,12 +4328,12 @@ vue@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.1.tgz#76e0b8eee614613532216b7bfe784e0b5695b160"
 
-watchpack@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
   dependencies:
     async "^2.1.2"
-    chokidar "^1.4.3"
+    chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
 webidl-conversions@^3.0.0:
@@ -4292,16 +4351,16 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
+webpack@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
     ajv "^5.1.5"
     ajv-keywords "^2.0.0"
     async "^2.1.2"
-    enhanced-resolve "^3.0.0"
+    enhanced-resolve "^3.3.0"
     escope "^3.6.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
@@ -4314,8 +4373,8 @@ webpack@^3.0.0:
     source-map "^0.5.3"
     supports-color "^3.1.0"
     tapable "~0.2.5"
-    uglifyjs-webpack-plugin "^0.4.4"
-    watchpack "^1.3.1"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
@@ -4398,7 +4457,7 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-yallist@^2.0.0:
+yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 

From 5b135021c9ec5b3ba2261b7ea84778bd1bbeed07 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Sun, 30 Jul 2017 02:01:37 +0530
Subject: [PATCH 679/877] Setup eslint config for test files (#888)

* chore: Setup eslint config for test folder

* style: Fix eslint errors in test files
---
 test/.eslintrc                 |  5 +++++
 test/fixtures/script-import.js |  2 +-
 test/fixtures/unit-test.js     |  2 +-
 test/test.js                   | 23 ++++++++++++-----------
 4 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 test/.eslintrc

diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 000000000..7eeefc33b
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,5 @@
+{
+  "env": {
+    "mocha": true
+  }
+}
diff --git a/test/fixtures/script-import.js b/test/fixtures/script-import.js
index 8ab20152a..03622bda2 100644
--- a/test/fixtures/script-import.js
+++ b/test/fixtures/script-import.js
@@ -4,4 +4,4 @@ export default {
       msg: 'Hello from Component A!'
     }
   }
-};
\ No newline at end of file
+}
diff --git a/test/fixtures/unit-test.js b/test/fixtures/unit-test.js
index 422357802..a44105ba9 100644
--- a/test/fixtures/unit-test.js
+++ b/test/fixtures/unit-test.js
@@ -1,5 +1,5 @@
   describe('example', function () {
     it('basic', function (done) {
-      done();
+      done()
     })
   })
diff --git a/test/test.js b/test/test.js
index 60781e2d6..0bce47f3d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -8,9 +8,9 @@ var MemoryFS = require('memory-fs')
 var expect = require('chai').expect
 var hash = require('hash-sum')
 var SSR = require('vue-server-renderer')
-var compiler = require('../lib/template-compiler')
+// var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
+var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var SourceMapConsumer = require('source-map').SourceMapConsumer
 
 var rawLoaderPath = path.resolve(__dirname, '../index.js')
@@ -602,11 +602,11 @@ describe('vue-loader', function () {
       })
     }, (code, warnings) => {
       // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
-      function requireFromString(src, filename) {
-        var Module = module.constructor;
-        var m = new Module();
-        m._compile(src, filename);
-        return m.exports;
+      function requireFromString (src, filename) {
+        var Module = module.constructor
+        var m = new Module()
+        m._compile(src, filename)
+        return m.exports
       }
 
       var output = interopDefault(requireFromString(code, './test.build.js'))
@@ -780,11 +780,11 @@ describe('vue-loader', function () {
           options: {
             skeletonLoader: {
               procedure: (content, sourceMap, callback, options) => {
-                expect(options.foo).to.equal('bar');
-                expect(options.opt2).to.equal('value2');
+                expect(options.foo).to.equal('bar')
+                expect(options.opt2).to.equal('value2')
 
                 // Return the content to output.
-                return content;
+                return content
               }
             }
           }
@@ -870,7 +870,8 @@ describe('vue-loader', function () {
       }
     }, (window, module) => {
       var results = []
-      var vnode = mockRender(module, {
+      // var vnode =
+      mockRender(module, {
         $processStyle: style => results.push(style),
         transform: 'translateX(10px)'
       })

From 4e5c1b07b5fc3def824bb35d8570798e0f90af70 Mon Sep 17 00:00:00 2001
From: totalamd <totalamd@users.noreply.github.com>
Date: Mon, 31 Jul 2017 12:44:44 +0300
Subject: [PATCH 680/877] typo (#917)

---
 docs/ru/features/es2015.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/features/es2015.md b/docs/ru/features/es2015.md
index ec3ea09c0..b99e931bd 100644
--- a/docs/ru/features/es2015.md
+++ b/docs/ru/features/es2015.md
@@ -22,7 +22,7 @@ export default {
 </script>
 ```
 
-В нём была использована краткая запись свойства объекта, доступная в ES2015 для определения дочерних компонентов. `{ ComponentA }` это попросту сокращение от `{ ComponentA: ComponentA }`. Vue автометически преобразует ключ в `component-a`, так что вы можете использовать импортированный компонент в шаблоне как `<component-a>`.
+В нём была использована краткая запись свойства объекта, доступная в ES2015 для определения дочерних компонентов. `{ ComponentA }` это попросту сокращение от `{ ComponentA: ComponentA }`. Vue автоматически преобразует ключ в `component-a`, так что вы можете использовать импортированный компонент в шаблоне как `<component-a>`.
 
 ### ES2015 в шаблонах
 

From afdb06b8bb16c445e0958c62403c9dbb4d9ac472 Mon Sep 17 00:00:00 2001
From: Nikolay-Govorov <nikolay_govorov@bk.ru>
Date: Wed, 2 Aug 2017 16:20:49 +0600
Subject: [PATCH 681/877] =?UTF-8?q?=D0=90ixed=20a=20typo=20on=20line=20111?=
 =?UTF-8?q?=20(#925)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/ru/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/start/spec.md b/docs/ru/start/spec.md
index 129c006c8..22c0225aa 100644
--- a/docs/ru/start/spec.md
+++ b/docs/ru/start/spec.md
@@ -108,4 +108,4 @@ export default {
 
 ### Комментарии
 
-Внутри каждой секции вы можете использовать синтаксис комментарией, который соответствует используемому языку (HTML, CSS, JavaScript, Pug, и т.д.). Для комментариев на уровне секций, используйте синтаксис комментариев HTML: `<!-- ваш комментарий -->`
+Внутри каждой секции вы можете использовать синтаксис комментариев, который соответствует используемому языку (HTML, CSS, JavaScript, Pug, и т.д.). Для комментариев на уровне секций, используйте синтаксис комментариев HTML: `<!-- ваш комментарий -->`

From 1172384ef3ca379a457ef04283a6dec4c99eac9a Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Thu, 3 Aug 2017 07:09:26 +0530
Subject: [PATCH 682/877] chore: Setup lint-staged with husky(pre-commit)
 (#914)

---
 package.json |  16 ++-
 yarn.lock    | 271 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 281 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 8e3345c30..d3fee36a3 100644
--- a/package.json
+++ b/package.json
@@ -23,11 +23,23 @@
   },
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
-    "lint": "eslint lib",
+    "lint": "eslint lib test",
+    "lint:fix": "eslint lib test --fix",
+    "precommit": "lint-staged",
     "test": "eslint lib && mocha --slow 5000 --timeout 10000",
     "docs": "cd docs && gitbook serve",
     "docs:deploy": "bash ./docs/deploy.sh"
   },
+  "lint-staged": {
+    "lib/**/*.js": [
+      "eslint --fix",
+      "git add"
+    ],
+    "test/**/*.js": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
   "dependencies": {
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
@@ -60,9 +72,11 @@
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
+    "husky": "^0.14.3",
     "inject-loader": "^3.0.0",
     "js-yaml": "^3.9.0",
     "jsdom": "^9.2.1",
+    "lint-staged": "^4.0.2",
     "marked": "^0.3.6",
     "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
diff --git a/yarn.lock b/yarn.lock
index 9471b0329..97787fa04 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -80,7 +80,7 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-escapes@^1.1.0:
+ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
@@ -105,6 +105,10 @@ anymatch@^1.3.0:
     arrify "^1.0.0"
     micromatch "^2.1.5"
 
+app-root-path@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
+
 aproba@^1.0.3:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
@@ -947,6 +951,10 @@ chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+ci-info@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
@@ -970,12 +978,23 @@ clean-css@^3.3.0:
     commander "2.8.x"
     source-map "0.4.x"
 
-cli-cursor@^1.0.1:
+cli-cursor@^1.0.1, cli-cursor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
   dependencies:
     restore-cursor "^1.0.1"
 
+cli-spinners@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
+
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
@@ -1144,6 +1163,19 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cosmiconfig@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-1.1.0.tgz#0dea0f9804efdfb929fbb1b188e25553ea053d37"
+  dependencies:
+    graceful-fs "^4.1.2"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.0.1"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    pinkie-promise "^2.0.0"
+    require-from-string "^1.1.0"
+
 cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.2.tgz#c43ae86d238f08f1728a345ed60ceb0aef63c060"
@@ -1179,6 +1211,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
     create-hash "^1.1.0"
     inherits "^2.0.1"
 
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1313,6 +1353,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-fns@^1.27.2:
+  version "1.28.5"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.28.5.tgz#257cfc45d322df45ef5658665967ee841cd73faf"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -1462,6 +1506,10 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
   version "1.3.14"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -1696,6 +1744,18 @@ evp_bytestokey@^1.0.0:
   dependencies:
     create-hash "^1.1.1"
 
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -1751,7 +1811,7 @@ fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
-figures@^1.3.5:
+figures@^1.3.5, figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
   dependencies:
@@ -1904,6 +1964,10 @@ get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
 
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2086,6 +2150,14 @@ https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
+husky@^0.14.3:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+  dependencies:
+    is-ci "^1.0.10"
+    normalize-path "^1.0.0"
+    strip-indent "^2.0.0"
+
 iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
@@ -2112,6 +2184,16 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -2201,6 +2283,12 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
+is-ci@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  dependencies:
+    ci-info "^1.0.0"
+
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
@@ -2302,7 +2390,7 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-promise@^2.0.0:
+is-promise@^2.0.0, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
@@ -2322,6 +2410,10 @@ is-resolvable@^1.0.0:
   dependencies:
     tryit "^1.0.1"
 
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
@@ -2340,6 +2432,10 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -2521,6 +2617,67 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+lint-staged@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.0.2.tgz#8e83e11e9e1656c09b6117f6db0d55fd4960a1c0"
+  dependencies:
+    app-root-path "^2.0.0"
+    cosmiconfig "^1.1.0"
+    execa "^0.7.0"
+    listr "^0.12.0"
+    lodash.chunk "^4.2.0"
+    minimatch "^3.0.0"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    staged-git-files "0.0.4"
+
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+
+listr-update-renderer@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.0.tgz#44dc01bb0c34a03c572154d4d08cde9b1dc5620f"
+  dependencies:
+    chalk "^1.1.3"
+    cli-cursor "^1.0.2"
+    date-fns "^1.27.2"
+    figures "^1.7.0"
+
+listr@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    figures "^1.7.0"
+    indent-string "^2.1.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.2.0"
+    listr-verbose-renderer "^0.4.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    ora "^0.2.3"
+    p-map "^1.1.1"
+    rxjs "^5.0.0-beta.11"
+    stream-to-observable "^0.1.0"
+    strip-ansi "^3.0.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -2581,6 +2738,10 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
+lodash.chunk@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -2634,6 +2795,19 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  dependencies:
+    chalk "^1.0.0"
+
+log-update@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+  dependencies:
+    ansi-escapes "^1.0.0"
+    cli-cursor "^1.0.2"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -2650,7 +2824,7 @@ lru-cache@^3.2.0:
   dependencies:
     pseudomap "^1.0.1"
 
-lru-cache@^4.1.1:
+lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
@@ -2853,6 +3027,10 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+
 normalize-path@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -2872,6 +3050,26 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+npm-path@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.3.tgz#15cff4e1c89a38da77f56f6055b24f975dfb2bbe"
+  dependencies:
+    which "^1.2.10"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+npm-which@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
+  dependencies:
+    commander "^2.9.0"
+    npm-path "^2.0.2"
+    which "^1.2.10"
+
 npmlog@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
@@ -2933,6 +3131,15 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+ora@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^1.0.2"
+    cli-spinners "^0.1.2"
+    object-assign "^4.0.1"
+
 os-browserify@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
@@ -2958,6 +3165,10 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
 p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@@ -2968,6 +3179,10 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-map@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"
+
 pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
@@ -3023,6 +3238,10 @@ path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
 path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -3774,6 +3993,12 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
+rxjs@^5.0.0-beta.11:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7"
+  dependencies:
+    symbol-observable "^1.0.1"
+
 safe-buffer@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
@@ -3818,6 +4043,16 @@ sha.js@^2.3.6:
   dependencies:
     inherits "^2.0.1"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
 shelljs@^0.7.5:
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
@@ -3929,6 +4164,10 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+staged-git-files@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -3946,6 +4185,10 @@ stream-http@^2.3.1:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-to-observable@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -3995,6 +4238,14 @@ strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -4064,6 +4315,10 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
+symbol-observable@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+
 symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
@@ -4403,6 +4658,12 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
+which@^1.2.10, which@^1.2.9:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"

From c48b6c7d708fb2b086dde681f0e895d763ad0ee9 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Thu, 3 Aug 2017 07:18:47 +0430
Subject: [PATCH 683/877] fix(transform-require): support ~/ aliases (#927)

* fix(transform-require): support ~/ aliases

* test: add tests for ~/ aliases
---
 lib/template-compiler/modules/transform-require.js | 3 ++-
 test/fixtures/resolve.vue                          | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index d347670e7..7d9be15f0 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -40,7 +40,8 @@ function rewrite (attr, name) {
     var firstChar = value.charAt(1)
     if (firstChar === '.' || firstChar === '~') {
       if (firstChar === '~') {
-        value = '"' + value.slice(2)
+        var secondChar = value.charAt(2)
+        value = '"' + value.slice(secondChar === '/' ? 3 : 2)
       }
       attr.value = `require(${value})`
     }
diff --git a/test/fixtures/resolve.vue b/test/fixtures/resolve.vue
index cd66cf905..c98514eb1 100644
--- a/test/fixtures/resolve.vue
+++ b/test/fixtures/resolve.vue
@@ -2,10 +2,12 @@
 <div>
   <img src="./logo.png">
   <img src="~fixtures/logo.png">
+  <img src="~/fixtures/logo.png">
 </div>
 </template>
 
 <style>
 html { background-image: url(./logo.png); }
 body { background-image: url(~fixtures/logo.png); }
+body { background-image: url(~/fixtures/logo.png); }
 </style>

From 1cff850793e8817c0cd9200d1d40f29ee365cdd8 Mon Sep 17 00:00:00 2001
From: Elevista <sunnyholic@sunnyholic.com>
Date: Thu, 3 Aug 2017 11:49:19 +0900
Subject: [PATCH 684/877] keep path of source file in source map (#895)

---
 lib/selector.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/selector.js b/lib/selector.js
index e2f87517f..7a7277592 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -9,7 +9,8 @@ var loaderUtils = require('loader-utils')
 module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.getOptions(this) || {}
-  var filename = path.basename(this.resourcePath)
+  var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
+  var filename = path.relative(context, this.resourcePath).replace(/\..+$/, '.vue')
   var parts = parse(content, filename, this.sourceMap)
   var part = parts[query.type]
   if (Array.isArray(part)) {

From a4a8e2f325563871121a54ffbb797d95fb7da5f2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 3 Aug 2017 11:02:57 +0800
Subject: [PATCH 685/877] bump lockfile

---
 yarn.lock | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 97787fa04..34651749d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -196,13 +196,7 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^2.1.2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
-  dependencies:
-    lodash "^4.14.0"
-
-async@^2.4.1:
+async@^2.1.2, async@^2.4.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -1690,10 +1684,6 @@ esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -2477,14 +2467,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@^3.4.3, js-yaml@^3.5.1:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^3.1.1"
-
-js-yaml@^3.9.0:
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"
   dependencies:
@@ -3553,7 +3536,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.6:
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.6:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
   dependencies:
@@ -3561,14 +3544,6 @@ postcss@^6.0.0, postcss@^6.0.6:
     source-map "^0.5.6"
     supports-color "^4.1.0"
 
-postcss@^6.0.1:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.3.tgz#b7f565b3d956fbb8565ca7c1e239d0506e427d8b"
-  dependencies:
-    chalk "^1.1.3"
-    source-map "^0.5.6"
-    supports-color "^4.0.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -4291,13 +4266,7 @@ supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.0.0.tgz#33a7c680aa512c9d03ef929cacbb974d203d2790"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^4.1.0:
+supports-color@^4.0.0, supports-color@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
   dependencies:

From 674ea6a365a4bca0ec17b383be71302ffb95d5d2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 4 Aug 2017 14:23:58 +0800
Subject: [PATCH 686/877] 13.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d3fee36a3..048654276 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.2",
+  "version": "13.0.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From c3de2a4a7521dcd005c56bb4c5fdfb854eb804ab Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 5 Aug 2017 02:19:10 +0800
Subject: [PATCH 687/877] fix: comments check (fix #931)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 49ec3f23f..d2ca23b33 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -89,7 +89,7 @@ module.exports = function (content) {
   var output = ''
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
-  var hasComment = parts.template && parts.template.attrs.comments
+  var hasComment = parts.template && parts.template.attrs && parts.template.attrs.comments
 
   var templateCompilerOptions = '?' + JSON.stringify({
     id: moduleId,

From 21fb818709a78e01c429f133760951f1d8936f42 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 5 Aug 2017 02:19:22 +0800
Subject: [PATCH 688/877] 13.0.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 048654276..fb1735f84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.3",
+  "version": "13.0.4",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 87ffc2083163090f9c5d5d5a640d90bea96f85ce Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 26 Aug 2017 14:42:06 -0400
Subject: [PATCH 689/877] use npm lockfile

---
 package-lock.json | 9411 +++++++++++++++++++++++++++++++++++++++++++++
 yarn.lock         | 4725 -----------------------
 2 files changed, 9411 insertions(+), 4725 deletions(-)
 create mode 100644 package-lock.json
 delete mode 100644 yarn.lock

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..d113b9780
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,9411 @@
+{
+  "name": "vue-loader",
+  "version": "13.0.4",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "abab": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
+      "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
+    },
+    "acorn": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
+      "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        }
+      }
+    },
+    "acorn-globals": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
+      "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        }
+      }
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "ajv": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
+      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
+      "dev": true
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+      "requires": {
+        "color-convert": "1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "1.1.0"
+          }
+        }
+      }
+    },
+    "app-root-path": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
+      "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "asn1.js": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
+      "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      }
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true
+    },
+    "assertion-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
+      "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "6.7.7",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
+      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000718",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "dev": true,
+          "requires": {
+            "caniuse-db": "1.0.30000718",
+            "electron-to-chromium": "1.3.18"
+          }
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-core": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
+      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.0",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.5.0",
+        "debug": "2.6.8",
+        "json5": "0.5.1",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.7",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
+      "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
+      "dev": true,
+      "requires": {
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.4",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-loader": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.2.tgz",
+      "integrity": "sha512-jRwlFbINAeyDStqK6Dd5YuY0k5YuzQUvlz2ZamuXrXmxav3pNqe9vfJ402+2G+OmlJSXxCOpB6Uz0INM7RQe2A==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "1.0.0",
+        "loader-utils": "1.1.0",
+        "mkdirp": "0.5.1"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
+      "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "0.10.1"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-preset-env": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.0.tgz",
+      "integrity": "sha512-OVgtQRuOZKckrILgMA5rvctvFZPv72Gua9Rt006AiPoB0DJKGN07UmaQA+qRrYgK71MVct8fFhT0EyNWYorVew==",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0",
+        "browserslist": "2.3.3",
+        "invariant": "2.2.2",
+        "semver": "5.4.1"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.0",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.16"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "2.5.0",
+        "regenerator-runtime": "0.11.0"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.8",
+        "globals": "9.18.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
+      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "big.js": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
+      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg="
+    },
+    "binary-extensions": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browser-stdout": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
+      "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.4",
+        "create-hash": "1.1.3",
+        "evp_bytestokey": "1.0.2",
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "1.0.6",
+        "browserify-des": "1.0.0",
+        "evp_bytestokey": "1.0.2"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "randombytes": "2.0.5"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "elliptic": "6.4.0",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "dev": true,
+      "requires": {
+        "pako": "0.2.9"
+      }
+    },
+    "browserslist": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.3.3.tgz",
+      "integrity": "sha512-p9hz6FA2H1w1ZUAXKfK3MlIA4Z9fEd56hnZSOecBIITb5j0oZk/tZRwhdE0xG56RGx2x8cc1c5AWJKWVjMLOEQ==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "1.0.30000718",
+        "electron-to-chromium": "1.3.18"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.2.1",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "dev": true
+    },
+    "caniuse-api": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
+      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000718",
+        "lodash.memoize": "4.1.2",
+        "lodash.uniq": "4.5.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "dev": true,
+          "requires": {
+            "caniuse-db": "1.0.30000718",
+            "electron-to-chromium": "1.3.18"
+          }
+        }
+      }
+    },
+    "caniuse-db": {
+      "version": "1.0.30000718",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000718.tgz",
+      "integrity": "sha1-hs3ZeYcwJVSTTGHhBvTkcPFvmTw=",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000718",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz",
+      "integrity": "sha1-DdJCkL6xExCy2A9rcKgjwqZab60=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chai": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.1.tgz",
+      "integrity": "sha1-ZuISeebzxkFf+CMYeCJ5AOIXGzk=",
+      "dev": true,
+      "requires": {
+        "assertion-error": "1.0.2",
+        "check-error": "1.0.2",
+        "deep-eql": "2.0.2",
+        "get-func-name": "2.0.0",
+        "pathval": "1.1.0",
+        "type-detect": "4.0.3"
+      }
+    },
+    "chalk": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
+      "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+      "requires": {
+        "ansi-styles": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "4.2.1"
+      }
+    },
+    "character-parser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
+      "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
+      "dev": true,
+      "requires": {
+        "is-regex": "1.0.4"
+      }
+    },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.1.2",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
+      }
+    },
+    "ci-info": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz",
+      "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "clap": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz",
+      "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "clean-css": {
+      "version": "3.4.28",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
+      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
+      "dev": true,
+      "requires": {
+        "commander": "2.8.1",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "1.0.1"
+      }
+    },
+    "cli-spinners": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+      "dev": true
+    },
+    "cli-truncate": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
+      "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "0.0.4",
+        "string-width": "1.0.2"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "requires": {
+        "center-align": "0.1.3",
+        "right-align": "0.1.3",
+        "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+      "dev": true
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "coa": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
+      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
+      "dev": true,
+      "requires": {
+        "q": "1.5.0"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "coffee-loader": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/coffee-loader/-/coffee-loader-0.7.3.tgz",
+      "integrity": "sha1-+tvG79b8fsyIxbMEaiwpIGa8tUo=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0"
+      }
+    },
+    "coffee-script": {
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+      "dev": true
+    },
+    "color": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
+      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "dev": true,
+      "requires": {
+        "clone": "1.0.2",
+        "color-convert": "1.9.0",
+        "color-string": "0.3.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "color-string": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
+      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "colormin": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
+      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+      "dev": true,
+      "requires": {
+        "color": "0.11.4",
+        "css-color-names": "0.0.4",
+        "has": "1.0.1"
+      }
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      }
+    },
+    "config-chain": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
+      "requires": {
+        "ini": "1.3.4",
+        "proto-list": "1.2.4"
+      }
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
+    },
+    "consolidate": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz",
+      "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
+      "requires": {
+        "bluebird": "3.5.0"
+      }
+    },
+    "constantinople": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
+      "integrity": "sha1-dWnKqKo/jVk11i4fqW+fcCzYHHk=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0",
+        "is-expression": "2.1.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-type-parser": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
+      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "dev": true
+    },
+    "core-js": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
+      "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.9.1",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
+      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "elliptic": "6.4.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
+      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.4",
+        "create-hash": "1.1.3",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.1",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "shebang-command": "1.2.0",
+        "which": "1.3.0"
+      }
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
+      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "1.0.0",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.0",
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "diffie-hellman": "5.0.2",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.13",
+        "public-encrypt": "4.0.0",
+        "randombytes": "2.0.5"
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-loader": {
+      "version": "0.28.5",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.5.tgz",
+      "integrity": "sha512-/FJmsDD8e6xZOBHMFShN/BCjnrEybq0spYaTZ1QoZ10/jhUa1LDDojQELu/JJ1ykZZjt0nSwkYrb2Mfx3bZx3Q==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "css-selector-tokenizer": "0.7.0",
+        "cssnano": "3.10.0",
+        "icss-utils": "2.1.0",
+        "loader-utils": "1.1.0",
+        "lodash.camelcase": "4.3.0",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.17",
+        "postcss-modules-extract-imports": "1.1.0",
+        "postcss-modules-local-by-default": "1.2.0",
+        "postcss-modules-scope": "1.1.0",
+        "postcss-modules-values": "1.3.0",
+        "postcss-value-parser": "3.3.0",
+        "source-list-map": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "css-parse": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
+      "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
+      "dev": true
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
+      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
+      "dev": true,
+      "requires": {
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
+      },
+      "dependencies": {
+        "regexpu-core": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+          "dev": true,
+          "requires": {
+            "regenerate": "1.3.2",
+            "regjsgen": "0.2.0",
+            "regjsparser": "0.1.5"
+          }
+        }
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
+      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "6.7.7",
+        "decamelize": "1.2.0",
+        "defined": "1.0.0",
+        "has": "1.0.1",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.17",
+        "postcss-calc": "5.3.1",
+        "postcss-colormin": "2.2.2",
+        "postcss-convert-values": "2.6.1",
+        "postcss-discard-comments": "2.0.4",
+        "postcss-discard-duplicates": "2.1.0",
+        "postcss-discard-empty": "2.1.0",
+        "postcss-discard-overridden": "0.1.1",
+        "postcss-discard-unused": "2.2.3",
+        "postcss-filter-plugins": "2.0.2",
+        "postcss-merge-idents": "2.1.7",
+        "postcss-merge-longhand": "2.0.2",
+        "postcss-merge-rules": "2.1.2",
+        "postcss-minify-font-values": "1.0.5",
+        "postcss-minify-gradients": "1.0.5",
+        "postcss-minify-params": "1.2.2",
+        "postcss-minify-selectors": "2.1.1",
+        "postcss-normalize-charset": "1.1.1",
+        "postcss-normalize-url": "3.0.8",
+        "postcss-ordered-values": "2.2.3",
+        "postcss-reduce-idents": "2.4.0",
+        "postcss-reduce-initial": "1.0.1",
+        "postcss-reduce-transforms": "1.0.4",
+        "postcss-svgo": "2.1.6",
+        "postcss-unique-selectors": "2.0.2",
+        "postcss-value-parser": "3.3.0",
+        "postcss-zindex": "2.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "csso": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
+      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
+      "dev": true,
+      "requires": {
+        "clap": "1.2.0",
+        "source-map": "0.5.7"
+      }
+    },
+    "cssom": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
+      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
+      "dev": true
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "dev": true,
+      "requires": {
+        "cssom": "0.3.2"
+      }
+    },
+    "d": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.30"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "date-fns": {
+      "version": "1.28.5",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.28.5.tgz",
+      "integrity": "sha1-JXz8RdMi30XvVlhmWWfuhBzXP68=",
+      "dev": true
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "de-indent": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-eql": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-2.0.2.tgz",
+      "integrity": "sha1-sbrAblbwp2d3aG1Qyf63XC7XZ5o=",
+      "dev": true,
+      "requires": {
+        "type-detect": "3.0.0"
+      },
+      "dependencies": {
+        "type-detect": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-3.0.0.tgz",
+          "integrity": "sha1-RtDMhVOrt7E6NSsNbeov1Y8tm1U=",
+          "dev": true
+        }
+      }
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+      "dev": true
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "5.0.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "diff": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
+      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
+      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "miller-rabin": "4.0.0",
+        "randombytes": "2.0.5"
+      }
+    },
+    "doctrine": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
+      }
+    },
+    "doctypes": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
+      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=",
+      "dev": true
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
+    },
+    "domutils": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "editorconfig": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
+      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
+      "requires": {
+        "bluebird": "3.5.0",
+        "commander": "2.11.0",
+        "lru-cache": "3.2.0",
+        "semver": "5.4.1",
+        "sigmund": "1.0.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
+          "requires": {
+            "pseudomap": "1.0.2"
+          }
+        }
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.18",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz",
+      "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw=",
+      "dev": true
+    },
+    "elegant-spinner": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
+      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
+      "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0",
+        "hash.js": "1.1.3",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+    },
+    "enhanced-resolve": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.4.1",
+        "object-assign": "4.1.1",
+        "tapable": "0.2.8"
+      }
+    },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "dev": true,
+      "requires": {
+        "prr": "0.0.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.30",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz",
+      "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+      "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.30",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.30",
+        "es6-iterator": "2.0.1",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.30",
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.30"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.30",
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "dev": true,
+      "requires": {
+        "esprima": "2.7.3",
+        "estraverse": "1.9.3",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.2.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.0",
+        "estraverse": "4.2.0"
+      }
+    },
+    "eslint": {
+      "version": "3.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
+      "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "chalk": "1.1.3",
+        "concat-stream": "1.6.0",
+        "debug": "2.6.8",
+        "doctrine": "2.0.0",
+        "escope": "3.6.0",
+        "espree": "3.5.0",
+        "esquery": "1.0.0",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "2.0.0",
+        "glob": "7.1.2",
+        "globals": "9.18.0",
+        "ignore": "3.3.4",
+        "imurmurhash": "0.1.4",
+        "inquirer": "0.12.0",
+        "is-my-json-valid": "2.16.1",
+        "is-resolvable": "1.0.0",
+        "js-yaml": "3.9.1",
+        "json-stable-stringify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "pluralize": "1.2.1",
+        "progress": "1.1.8",
+        "require-uncached": "1.0.3",
+        "shelljs": "0.7.8",
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "3.8.3",
+        "text-table": "0.2.0",
+        "user-home": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-html": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz",
+      "integrity": "sha1-fImIOrDIX6XSi2ZqFKTpBqqQuJc=",
+      "dev": true,
+      "requires": {
+        "htmlparser2": "3.9.2"
+      }
+    },
+    "eslint-plugin-vue-libs": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.2.1.tgz",
+      "integrity": "sha512-GSmpfPqSX4d1Etnuh/w98qLw1voc1HYAF9nqROUTwKVz/d3mJEnuR9rJn8XDzBG1ddErBgO11kLI3TUVMNdJ+A==",
+      "dev": true,
+      "requires": {
+        "eslint-plugin-html": "2.0.3"
+      }
+    },
+    "espree": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz",
+      "integrity": "sha1-mDWGJb3QVYYeon4oZ+pyn69GPY0=",
+      "dev": true,
+      "requires": {
+        "acorn": "5.1.1",
+        "acorn-jsx": "3.0.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+    },
+    "esquery": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.30"
+      }
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz",
+      "integrity": "sha512-ni0r0lrm7AOzsh2qC5mi9sj8S0gmj5fLNjfFpxN05FB4tAVZEKotbkjOtLPqTCX/CXT7NsUr6juZb4IFJeNNdA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "1.3.4",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "execa": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
+      "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      }
+    },
+    "exit-hook": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.3"
+      }
+    },
+    "expose-loader": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.3.tgz",
+      "integrity": "sha1-NfvTZZeJ5PqoH1nei36fw55GbVE=",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extract-text-webpack-plugin": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz",
+      "integrity": "sha1-kMqnkHvESfM1AF46x1MrQbAN5hI=",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0",
+        "webpack-sources": "1.0.1"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
+      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
+      "dev": true
+    },
+    "figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "1.2.2",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-loader": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
+      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "dev": true,
+      "requires": {
+        "commondir": "1.0.1",
+        "make-dir": "1.0.0",
+        "pkg-dir": "2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "2.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
+      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.16"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
+      "dev": true
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "requires": {
+        "is-property": "1.0.2"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "dev": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      }
+    },
+    "has": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "dev": true,
+      "requires": {
+        "function-bind": "1.1.0"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+    },
+    "hash-base": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "hash-sum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ="
+    },
+    "hash.js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
+      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "1.1.3",
+        "minimalistic-assert": "1.0.0",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "dev": true
+    },
+    "html-comment-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
+      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
+      "dev": true
+    },
+    "html-encoding-sniffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz",
+      "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=",
+      "dev": true,
+      "requires": {
+        "whatwg-encoding": "1.0.1"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.4.1",
+        "domutils": "1.6.2",
+        "entities": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
+    "https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+      "dev": true
+    },
+    "husky": {
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
+      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
+      "dev": true,
+      "requires": {
+        "is-ci": "1.0.10",
+        "normalize-path": "1.0.0",
+        "strip-indent": "2.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
+      "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
+      "dev": true
+    },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
+      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.9"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.4.tgz",
+      "integrity": "sha512-KjHyHxUgicfgFiTJaIA9DoeY3TIQz5thaKqm35re7RTVVB7zjF1fTMIDMXM4GUUBipR4FW8BvGnA115pZ/AxQQ==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+    },
+    "inject-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/inject-loader/-/inject-loader-3.0.1.tgz",
+      "integrity": "sha512-0Kd4NqMJUhknG4ECiJ/mgyHJBpfBBWZ3IKHl2BLNQiFtMO7/xiv9mmHl7mGvE0iKrBeQAZdMcQP3sMXZN0cqeg==",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.0"
+      }
+    },
+    "inquirer": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "ansi-regex": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-width": "2.2.0",
+        "figures": "1.7.0",
+        "lodash": "4.17.4",
+        "readline2": "1.0.1",
+        "run-async": "0.1.0",
+        "rx-lite": "3.1.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "through": "2.3.8"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
+      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+      "dev": true,
+      "requires": {
+        "loose-envify": "1.3.1"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.10.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-ci": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz",
+      "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
+      "dev": true,
+      "requires": {
+        "ci-info": "1.0.0"
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-expression": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz",
+      "integrity": "sha1-kb6dR968/vB3l36XIr5tz7RGXvA=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0",
+        "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-my-json-valid": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
+      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "dev": true,
+      "requires": {
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
+      "dev": true,
+      "requires": {
+        "tryit": "1.0.3"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-svg": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
+      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
+      "dev": true,
+      "requires": {
+        "html-comment-regex": "1.1.1"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
+      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+      "dev": true
+    },
+    "js-beautify": {
+      "version": "1.6.14",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz",
+      "integrity": "sha1-07j3Mi0CuSd9WL0jgmTDJ+WARM0=",
+      "requires": {
+        "config-chain": "1.1.11",
+        "editorconfig": "0.13.3",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6"
+      }
+    },
+    "js-stringify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
+      "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz",
+      "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==",
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "jsdom": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz",
+      "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=",
+      "dev": true,
+      "requires": {
+        "abab": "1.0.3",
+        "acorn": "4.0.13",
+        "acorn-globals": "3.1.0",
+        "array-equal": "1.0.0",
+        "content-type-parser": "1.0.1",
+        "cssom": "0.3.2",
+        "cssstyle": "0.2.37",
+        "escodegen": "1.8.1",
+        "html-encoding-sniffer": "1.0.1",
+        "nwmatcher": "1.4.1",
+        "parse5": "1.5.1",
+        "request": "2.81.0",
+        "sax": "1.2.4",
+        "symbol-tree": "3.2.2",
+        "tough-cookie": "2.3.2",
+        "webidl-conversions": "4.0.2",
+        "whatwg-encoding": "1.0.1",
+        "whatwg-url": "4.8.0",
+        "xml-name-validator": "2.0.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        }
+      }
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-loader": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "jstransformer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
+      "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
+      "dev": true,
+      "requires": {
+        "is-promise": "2.1.0",
+        "promise": "7.3.1"
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.5"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "lint-staged": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.0.4.tgz",
+      "integrity": "sha1-nKaWizDfv+gTZbenY81PSZKJZVM=",
+      "dev": true,
+      "requires": {
+        "app-root-path": "2.0.1",
+        "cosmiconfig": "1.1.0",
+        "execa": "0.8.0",
+        "listr": "0.12.0",
+        "lodash.chunk": "4.2.0",
+        "minimatch": "3.0.4",
+        "npm-which": "3.0.1",
+        "p-map": "1.1.1",
+        "staged-git-files": "0.0.4"
+      },
+      "dependencies": {
+        "cosmiconfig": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-1.1.0.tgz",
+          "integrity": "sha1-DeoPmATv37kp+7GxiOJVU+oFPTc=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "js-yaml": "3.9.1",
+            "minimist": "1.2.0",
+            "object-assign": "4.1.1",
+            "os-homedir": "1.0.2",
+            "parse-json": "2.2.0",
+            "pinkie-promise": "2.0.1",
+            "require-from-string": "1.2.1"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "listr": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
+      "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "figures": "1.7.0",
+        "indent-string": "2.1.0",
+        "is-promise": "2.1.0",
+        "is-stream": "1.1.0",
+        "listr-silent-renderer": "1.1.1",
+        "listr-update-renderer": "0.2.0",
+        "listr-verbose-renderer": "0.4.0",
+        "log-symbols": "1.0.2",
+        "log-update": "1.0.2",
+        "ora": "0.2.3",
+        "p-map": "1.1.1",
+        "rxjs": "5.4.3",
+        "stream-to-observable": "0.1.0",
+        "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "listr-silent-renderer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
+      "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
+      "dev": true
+    },
+    "listr-update-renderer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
+      "integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-truncate": "0.2.1",
+        "elegant-spinner": "1.0.1",
+        "figures": "1.7.0",
+        "indent-string": "3.2.0",
+        "log-symbols": "1.0.2",
+        "log-update": "1.0.2",
+        "strip-ansi": "3.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "listr-verbose-renderer": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.0.tgz",
+      "integrity": "sha1-RNwBuww0oDxXIVTU0Izemx3FYg8=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "date-fns": "1.28.5",
+        "figures": "1.7.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "strip-bom": "3.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
+      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "requires": {
+        "big.js": "3.1.3",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+      "dev": true
+    },
+    "lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
+      "dev": true,
+      "requires": {
+        "lodash._basecopy": "3.0.1",
+        "lodash.keys": "3.1.2"
+      }
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+      "dev": true
+    },
+    "lodash._basecreate": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "dev": true
+    },
+    "lodash.chunk": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
+      "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.create": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
+      "dev": true,
+      "requires": {
+        "lodash._baseassign": "3.2.0",
+        "lodash._basecreate": "3.0.3",
+        "lodash._isiterateecall": "3.0.9"
+      }
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
+      }
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.template": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.templatesettings": "4.1.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0"
+      }
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "log-update": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "cli-cursor": "1.0.2"
+      }
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "dev": true,
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "macaddress": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
+      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
+      "dev": true
+    },
+    "make-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      }
+    },
+    "marked": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=",
+      "dev": true
+    },
+    "math-expression-evaluator": {
+      "version": "1.2.17",
+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
+      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
+      "requires": {
+        "hash-base": "3.0.4",
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "hash-base": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.4",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.3"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
+          "requires": {
+            "remove-trailing-separator": "1.1.0"
+          }
+        }
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
+      "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "brorand": "1.1.0"
+      }
+    },
+    "mime": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
+      "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
+      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
+      "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.29.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz",
+      "integrity": "sha512-pIU2PJjrPYvYRqVpjXzj76qltO9uBYI7woYAMoxbSefsa+vqAfptjoeevd6bUgwD0mPIO+hv9f7ltvsNreL2PA==",
+      "dev": true,
+      "requires": {
+        "browser-stdout": "1.3.0",
+        "commander": "2.9.0",
+        "debug": "2.6.8",
+        "diff": "3.2.0",
+        "escape-string-regexp": "1.0.5",
+        "glob": "7.1.1",
+        "growl": "1.9.2",
+        "json3": "3.3.2",
+        "lodash.create": "3.1.1",
+        "mkdirp": "0.5.1",
+        "supports-color": "3.1.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        },
+        "glob": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "dev": true,
+      "optional": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
+      "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",
+      "dev": true,
+      "requires": {
+        "assert": "1.4.1",
+        "browserify-zlib": "0.1.4",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.11.1",
+        "domain-browser": "1.1.7",
+        "events": "1.1.1",
+        "https-browserify": "0.0.1",
+        "os-browserify": "0.2.1",
+        "path-browserify": "0.0.0",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.3",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.7.2",
+        "string_decoder": "0.10.31",
+        "timers-browserify": "2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "0.11.0",
+        "util": "0.10.3",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "requires": {
+        "abbrev": "1.1.0"
+      }
+    },
+    "normalize-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-newline/-/normalize-newline-3.0.0.tgz",
+      "integrity": "sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM=",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.4.1",
+        "validate-npm-package-license": "3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
+      "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
+      "dev": true
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "prepend-http": "1.0.4",
+        "query-string": "4.3.4",
+        "sort-keys": "1.1.2"
+      }
+    },
+    "npm-path": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.3.tgz",
+      "integrity": "sha1-Fc/04ciaONp39W9gVbJPl137K74=",
+      "dev": true,
+      "requires": {
+        "which": "1.3.0"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
+    "npm-which": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz",
+      "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
+      "dev": true,
+      "requires": {
+        "commander": "2.11.0",
+        "npm-path": "2.0.3",
+        "which": "1.3.0"
+      }
+    },
+    "null-loader": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz",
+      "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=",
+      "dev": true
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "nwmatcher": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
+      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+      "dev": true
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
+      }
+    },
+    "ora": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
+      "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-spinners": "0.1.2",
+        "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "os-browserify": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
+      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-locale": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "dev": true,
+      "requires": {
+        "execa": "0.7.0",
+        "lcid": "1.0.0",
+        "mem": "1.1.0"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "5.1.0",
+            "get-stream": "3.0.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
+          }
+        }
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
+      "dev": true
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
+      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
+      "dev": true
+    },
+    "pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+      "dev": true
+    },
+    "parse-asn1": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
+      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+      "dev": true,
+      "requires": {
+        "asn1.js": "4.9.1",
+        "browserify-aes": "1.0.6",
+        "create-hash": "1.1.3",
+        "evp_bytestokey": "1.0.2",
+        "pbkdf2": "3.0.13"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "parse5": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
+    },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      }
+    },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
+    "pbkdf2": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz",
+      "integrity": "sha512-+dCHxDH+djNtjgWmvVC/my3SYBAKpKNqKSjLkp+GtWWYe4XPE+e/PSD2aCanlEZZnqPk2uekTKNC/ccbwd2X2Q==",
+      "dev": true,
+      "requires": {
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "ripemd160": "2.0.1",
+        "safe-buffer": "5.1.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "2.1.0"
+      }
+    },
+    "pluralize": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
+      "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+      "requires": {
+        "chalk": "2.1.0",
+        "source-map": "0.5.7",
+        "supports-color": "4.2.1"
+      }
+    },
+    "postcss-calc": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
+      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-message-helpers": "2.0.0",
+        "reduce-css-calc": "1.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-colormin": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
+      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
+      "dev": true,
+      "requires": {
+        "colormin": "1.1.2",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-convert-values": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
+      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
+      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
+      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
+      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
+      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-unused": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
+      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "uniqs": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-filter-plugins": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
+      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "uniqid": "4.1.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-load-config": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
+      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
+      "requires": {
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1",
+        "postcss-load-options": "1.2.0",
+        "postcss-load-plugins": "2.3.0"
+      }
+    },
+    "postcss-load-options": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
+      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
+      "requires": {
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
+      }
+    },
+    "postcss-load-plugins": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
+      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
+      "requires": {
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
+      }
+    },
+    "postcss-merge-idents": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
+      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
+      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
+      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-api": "1.6.1",
+        "postcss": "5.2.17",
+        "postcss-selector-parser": "2.2.3",
+        "vendors": "1.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "dev": true,
+          "requires": {
+            "caniuse-db": "1.0.30000718",
+            "electron-to-chromium": "1.3.18"
+          }
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-message-helpers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
+      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+      "dev": true
+    },
+    "postcss-minify-font-values": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
+      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
+      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-minify-params": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
+      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "1.0.2",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0",
+        "uniqs": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
+      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "1.0.2",
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "postcss-selector-parser": "2.2.3"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
+      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.9"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
+      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.9"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
+      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.9"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "dev": true,
+      "requires": {
+        "icss-replace-symbols": "1.1.0",
+        "postcss": "6.0.9"
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
+      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
+      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "2.1.0",
+        "normalize-url": "1.9.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
+      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-reduce-idents": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
+      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
+      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
+      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "requires": {
+        "flatten": "1.0.2",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
+      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
+      "dev": true,
+      "requires": {
+        "is-svg": "2.1.0",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0",
+        "svgo": "0.7.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
+      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "1.0.2",
+        "postcss": "5.2.17",
+        "uniqs": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "postcss-zindex": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
+      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "uniqs": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.17",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "js-base64": "2.1.9",
+            "source-map": "0.5.7",
+            "supports-color": "3.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "1.0.0"
+          }
+        }
+      }
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
+      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
+    },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "dev": true,
+      "requires": {
+        "asap": "2.0.6"
+      }
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
+    },
+    "prr": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "public-encrypt": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
+      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.8",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.1.3",
+        "parse-asn1": "5.1.0",
+        "randombytes": "2.0.5"
+      }
+    },
+    "pug": {
+      "version": "2.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.3.tgz",
+      "integrity": "sha512-AGEWoQ6SHw7fNiaioEvAEelAYmFTvMTVAUxf4hUCLb5pb2HmN6yLGb/SwPFFaOiqSdxyxSmBVtL/I4VHOF9UPA==",
+      "dev": true,
+      "requires": {
+        "pug-code-gen": "1.1.1",
+        "pug-filters": "2.1.4",
+        "pug-lexer": "3.1.0",
+        "pug-linker": "3.0.2",
+        "pug-load": "2.0.8",
+        "pug-parser": "3.0.1",
+        "pug-runtime": "2.0.3",
+        "pug-strip-comments": "1.0.2"
+      }
+    },
+    "pug-attrs": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz",
+      "integrity": "sha1-i+KyIlVo/6ddG4Zpgr/59BEa/8s=",
+      "dev": true,
+      "requires": {
+        "constantinople": "3.1.0",
+        "js-stringify": "1.0.2",
+        "pug-runtime": "2.0.3"
+      }
+    },
+    "pug-code-gen": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-1.1.1.tgz",
+      "integrity": "sha1-HPcnRO8qA56uajNAyqoRBYcSWOg=",
+      "dev": true,
+      "requires": {
+        "constantinople": "3.1.0",
+        "doctypes": "1.1.0",
+        "js-stringify": "1.0.2",
+        "pug-attrs": "2.0.2",
+        "pug-error": "1.3.2",
+        "pug-runtime": "2.0.3",
+        "void-elements": "2.0.1",
+        "with": "5.1.1"
+      }
+    },
+    "pug-error": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz",
+      "integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY=",
+      "dev": true
+    },
+    "pug-filters": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.4.tgz",
+      "integrity": "sha512-0irOV5M9VhvRBWFGIvkrDDRWnhFpRgedO+yYEKnosgcowTrEnXGhEY/ZXlPM858upi7MqH8ZMXeRz3yTfXEzzQ==",
+      "dev": true,
+      "requires": {
+        "clean-css": "3.4.28",
+        "constantinople": "3.1.0",
+        "jstransformer": "1.0.0",
+        "pug-error": "1.3.2",
+        "pug-walk": "1.1.4",
+        "resolve": "1.4.0",
+        "uglify-js": "2.8.29"
+      }
+    },
+    "pug-lexer": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
+      "integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
+      "dev": true,
+      "requires": {
+        "character-parser": "2.2.0",
+        "is-expression": "3.0.0",
+        "pug-error": "1.3.2"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        },
+        "is-expression": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
+          "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
+          "dev": true,
+          "requires": {
+            "acorn": "4.0.13",
+            "object-assign": "4.1.1"
+          }
+        }
+      }
+    },
+    "pug-linker": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.2.tgz",
+      "integrity": "sha512-8D+XJs5lF2batwEv7UtS0kSklX+k9HapU9UeBmCAJ+XP82idk8XIBu0aV+L5j8rupdyW3fdfKQ/tznMHvqEg6g==",
+      "dev": true,
+      "requires": {
+        "pug-error": "1.3.2",
+        "pug-walk": "1.1.4"
+      }
+    },
+    "pug-load": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.8.tgz",
+      "integrity": "sha512-1T8GaRSyV4Oc3vEPuxB1VwHE4fpU2iYUK6gPLcxXPAiU1k9sYiuRWwBI2vra1oTTmpqwn1GiYFMg1jO74Eb2fA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "pug-walk": "1.1.4"
+      }
+    },
+    "pug-parser": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-3.0.1.tgz",
+      "integrity": "sha512-YNcfPtamkJ6Blgdev1keI1rK5UZ5TtYS4r1lZw1/lhFhyEVAwKtzOsv6aqxI0xBWfCia/vNWhdtdaqoMRB2jcQ==",
+      "dev": true,
+      "requires": {
+        "pug-error": "1.3.2",
+        "token-stream": "0.0.1"
+      }
+    },
+    "pug-runtime": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz",
+      "integrity": "sha1-mBYmB7D86eJU1CfzOYelrucWi9o=",
+      "dev": true
+    },
+    "pug-strip-comments": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz",
+      "integrity": "sha1-0xOvoBvMN0mA4TmeI+vy65vchRM=",
+      "dev": true,
+      "requires": {
+        "pug-error": "1.3.2"
+      }
+    },
+    "pug-walk": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.4.tgz",
+      "integrity": "sha512-29oDmQ4Z5nXJnaVQ/PTLdY3pRBCHcb1dvNhvVZ+c1bOv4cKRbwRD6mm0ZDVVzzZmSC8DctqbVtRgLzNJVQFHMw==",
+      "dev": true
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "dev": true
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "strict-uri-encode": "1.1.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "1.1.5"
+          }
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
+      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "2.0.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "requires": {
+        "find-up": "2.1.0",
+        "read-pkg": "2.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "readline2": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "mute-stream": "0.0.5"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.4.0"
+      }
+    },
+    "reduce-css-calc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "0.4.2",
+        "math-expression-evaluator": "1.2.17",
+        "reduce-function-call": "1.0.2"
+      },
+      "dependencies": {
+        "balanced-match": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+          "dev": true
+        }
+      }
+    },
+    "reduce-function-call": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
+      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "0.4.2"
+      },
+      "dependencies": {
+        "balanced-match": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+          "dev": true
+        }
+      }
+    },
+    "regenerate": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
+      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "private": "0.1.7"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
+      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3",
+        "is-primitive": "2.0.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.3.2",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.81.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.16",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.4.0",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.2",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
+      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg="
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
+      }
+    },
+    "resolve": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
+      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+      "dev": true,
+      "requires": {
+        "exit-hook": "1.1.1",
+        "onetime": "1.1.0"
+      }
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+      "dev": true,
+      "requires": {
+        "hash-base": "2.0.2",
+        "inherits": "2.0.3"
+      }
+    },
+    "run-async": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "rx-lite": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
+      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
+      "dev": true
+    },
+    "rxjs": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
+      "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==",
+      "dev": true,
+      "requires": {
+        "symbol-observable": "1.0.4"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "dev": true
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+      "dev": true,
+      "requires": {
+        "ajv": "5.2.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+    },
+    "serialize-javascript": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz",
+      "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=",
+      "dev": true
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz",
+      "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shelljs": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
+      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "interpret": "1.0.3",
+        "rechoir": "0.6.2"
+      }
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "skeleton-loader": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/skeleton-loader/-/skeleton-loader-1.1.3.tgz",
+      "integrity": "sha1-DEmgiLdLi0hELeViBgWa0F5a+fA=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0"
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
+      "dev": true
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "1.1.0"
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-support": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz",
+      "integrity": "sha512-A6vlydY7H/ljr4L2UOhDSajQdZQ6dMD7cLH0pzwcmwLyc9u8PNI4WGtnfDDzX7uzGL6c/T+ORL97Zlh+S4iOrg==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "dev": true,
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+      "dev": true
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "staged-git-files": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-0.0.4.tgz",
+      "integrity": "sha1-15fhtVHKemOd7AI33G60u5vhfTU=",
+      "dev": true
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "stream-http": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
+      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "stream-to-observable": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
+      "integrity": "sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=",
+      "dev": true
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+      "dev": true
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "stylus": {
+      "version": "0.54.5",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+      "dev": true,
+      "requires": {
+        "css-parse": "1.7.0",
+        "debug": "2.6.8",
+        "glob": "7.0.6",
+        "mkdirp": "0.5.1",
+        "sax": "0.5.8",
+        "source-map": "0.1.43"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "sax": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "stylus-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.1.tgz",
+      "integrity": "sha1-d/SzT9Aw0lsmF7z1UT21sHMMQIk=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "lodash.clonedeep": "4.5.0",
+        "when": "3.6.4"
+      }
+    },
+    "sugarss": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz",
+      "integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.9"
+      }
+    },
+    "supports-color": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
+      "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+      "requires": {
+        "has-flag": "2.0.0"
+      }
+    },
+    "svgo": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
+      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
+      "dev": true,
+      "requires": {
+        "coa": "1.0.4",
+        "colors": "1.1.2",
+        "csso": "2.3.2",
+        "js-yaml": "3.7.0",
+        "mkdirp": "0.5.1",
+        "sax": "1.2.4",
+        "whet.extend": "0.9.9"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
+          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+          "dev": true,
+          "requires": {
+            "argparse": "1.0.9",
+            "esprima": "2.7.3"
+          }
+        }
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=",
+      "dev": true
+    },
+    "symbol-tree": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
+      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
+      "dev": true
+    },
+    "table": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
+      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
+      "dev": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "chalk": "1.1.3",
+        "lodash": "4.17.4",
+        "slice-ansi": "0.0.4",
+        "string-width": "2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "tapable": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
+      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "1.0.5"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "token-stream": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz",
+      "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz",
+      "integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "2.8.29",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.10.0"
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7",
+        "uglify-js": "2.8.29",
+        "webpack-sources": "1.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+    },
+    "uniqid": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
+      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
+      "dev": true,
+      "requires": {
+        "macaddress": "0.2.8"
+      }
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-loader": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
+      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "mime": "1.3.6"
+      }
+    },
+    "user-home": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
+    },
+    "vendors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
+      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "vue": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.2.tgz",
+      "integrity": "sha512-GB5r+CsrCHIB1PoXt4wgBienjF3WGYOIaTK27tDk96sZxpL5RwRrsi9I3ECwFt8x8qAmxT2xk1vsY2Vpcn9nIw==",
+      "dev": true
+    },
+    "vue-hot-reload-api": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz",
+      "integrity": "sha1-nKWKbg35B4VUzhcIaItleHVNht4="
+    },
+    "vue-server-renderer": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.2.tgz",
+      "integrity": "sha512-lSkPRn8IhpAsEwMe1adMP9L5FBPsgQ4KeFyLdcD82j/qlR4x1JPJ+hHZsQrza5rdgpW7np5qT/rSwn65AKztMQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "hash-sum": "1.0.2",
+        "he": "1.1.1",
+        "lodash.template": "4.4.0",
+        "lodash.uniq": "4.5.0",
+        "resolve": "1.4.0",
+        "serialize-javascript": "1.4.0",
+        "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "2.2.1",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "2.0.0",
+            "strip-ansi": "3.0.1",
+            "supports-color": "2.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "vue-style-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.1.tgz",
+      "integrity": "sha1-yLY5uy8kuvnXgnTcF+TyZMHe2gg=",
+      "requires": {
+        "hash-sum": "1.0.2",
+        "loader-utils": "1.1.0"
+      }
+    },
+    "vue-template-compiler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz",
+      "integrity": "sha512-sKa2Bdvh+j6V9eQSyJRxsf8fak0FtQkCZ145aYFDVwZBhHOTt1vKrODLo4RelI1dUczKlDCp5aZ9MD7uJOZwvw==",
+      "dev": true,
+      "requires": {
+        "de-indent": "1.0.2",
+        "he": "1.1.1"
+      }
+    },
+    "vue-template-es2015-compiler": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz",
+      "integrity": "sha512-j3TBDtjqz7pC9XUzeSeqF5oekqPahxyUHsdG+kZKDH/V/DTexq5inYdLGstnqCUljoLC9LTj3H/5hmyToeSd1A=="
+    },
+    "watchpack": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
+      "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=",
+      "dev": true,
+      "requires": {
+        "async": "2.5.0",
+        "chokidar": "1.7.0",
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+      "dev": true
+    },
+    "webpack": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz",
+      "integrity": "sha512-qeUx4nIbeLL53qqNTs3kObPBMkUVDrOjEfp/hTvMlx21qL2MsGNr8/tXCoX/lS12dLl9qtZaXv2qfBEctPScDg==",
+      "dev": true,
+      "requires": {
+        "acorn": "5.1.1",
+        "acorn-dynamic-import": "2.0.2",
+        "ajv": "5.2.2",
+        "ajv-keywords": "2.1.0",
+        "async": "2.5.0",
+        "enhanced-resolve": "3.4.1",
+        "escope": "3.6.0",
+        "interpret": "1.0.3",
+        "json-loader": "0.5.7",
+        "json5": "0.5.1",
+        "loader-runner": "2.3.0",
+        "loader-utils": "1.1.0",
+        "memory-fs": "0.4.1",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "2.0.0",
+        "source-map": "0.5.7",
+        "supports-color": "4.2.1",
+        "tapable": "0.2.8",
+        "uglifyjs-webpack-plugin": "0.4.6",
+        "watchpack": "1.4.0",
+        "webpack-sources": "1.0.1",
+        "yargs": "8.0.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ajv-keywords": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+          "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
+              }
+            }
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "2.0.0",
+        "source-map": "0.5.7"
+      }
+    },
+    "whatwg-encoding": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz",
+      "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.13"
+      }
+    },
+    "whatwg-url": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz",
+      "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=",
+      "dev": true,
+      "requires": {
+        "tr46": "0.0.3",
+        "webidl-conversions": "3.0.1"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+          "dev": true
+        }
+      }
+    },
+    "when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
+    "whet.extend": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
+      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "with": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
+      "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0",
+        "acorn-globals": "3.1.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "xml-name-validator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
+      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yargs": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+      "dev": true,
+      "requires": {
+        "camelcase": "1.2.1",
+        "cliui": "2.1.0",
+        "decamelize": "1.2.0",
+        "window-size": "0.1.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "dev": true,
+      "requires": {
+        "camelcase": "4.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        }
+      }
+    }
+  }
+}
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index 34651749d..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4725 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-abab@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
-
-abbrev@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
-
-acorn-dynamic-import@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
-  dependencies:
-    acorn "^4.0.3"
-
-acorn-globals@^3.0.0, acorn-globals@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
-  dependencies:
-    acorn "^4.0.4"
-
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  dependencies:
-    acorn "^3.0.4"
-
-acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
-acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
-
-acorn@^5.0.0, acorn@^5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
-
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-
-ajv-keywords@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
-
-ajv@^4.7.0, ajv@^4.9.1:
-  version "4.11.7"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.0.0, ajv@^5.1.5:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^0.1.0"
-    json-schema-traverse "^0.3.0"
-    json-stable-stringify "^1.0.1"
-
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-
-ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-ansi-styles@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
-  dependencies:
-    color-convert "^1.0.0"
-
-anymatch@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
-  dependencies:
-    arrify "^1.0.0"
-    micromatch "^2.1.5"
-
-app-root-path@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
-
-aproba@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
-
-are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
-
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-asap@~2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
-
-asn1.js@^4.0.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  dependencies:
-    util "0.10.3"
-
-assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-
-async@^2.1.2, async@^2.4.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-  dependencies:
-    lodash "^4.14.0"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
-  dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
-aws4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
-  dependencies:
-    chalk "^1.1.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-babel-core@^6.24.1, babel-core@^6.25.0, babel-core@~6:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.25.0.tgz#7dd42b0463c742e9d5296deb3ec67a9322dad729"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.25.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.25.0"
-    babel-traverse "^6.25.0"
-    babel-types "^6.25.0"
-    babylon "^6.17.2"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-generator@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.25.0.tgz#33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.25.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-call-delegate@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-define-map@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
-
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-  dependencies:
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-get-function-arity@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-hoist-variables@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-optimise-call-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
-
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-replace-supers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-  dependencies:
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-loader@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
-  dependencies:
-    find-cache-dir "^1.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-
-babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-    lodash "^4.2.0"
-
-babel-plugin-transform-es2015-classes@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  dependencies:
-    babel-helper-define-map "^6.24.1"
-    babel-helper-function-name "^6.24.1"
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-helper-replace-supers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-destructuring@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-for-of@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-function-name@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-umd@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-object-super@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-  dependencies:
-    babel-helper-replace-supers "^6.24.1"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-parameters@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-  dependencies:
-    babel-helper-call-delegate "^6.24.1"
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
-babel-plugin-transform-exponentiation-operator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-regenerator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
-  dependencies:
-    regenerator-transform "0.9.11"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-preset-env@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.23.0"
-    babel-plugin-transform-es2015-classes "^6.23.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-    babel-plugin-transform-es2015-destructuring "^6.23.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-    babel-plugin-transform-es2015-for-of "^6.23.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-umd "^6.23.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.23.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
-    browserslist "^2.1.2"
-    invariant "^2.2.2"
-    semver "^5.3.0"
-
-babel-register@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
-  dependencies:
-    babel-core "^6.24.1"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
-babel-runtime@^6.18.0, babel-runtime@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
-babel-template@^6.24.1, babel-template@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.25.0"
-    babel-types "^6.25.0"
-    babylon "^6.17.2"
-    lodash "^4.2.0"
-
-babel-traverse@^6.24.1, babel-traverse@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.25.0"
-    babylon "^6.17.2"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.25.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babylon@^6.17.2:
-  version "6.17.4"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
-
-balanced-match@^0.4.1, balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
-base64-js@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-big.js@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
-
-binary-extensions@^1.0.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
-bluebird@^3.0.5, bluebird@^3.1.1:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-brace-expansion@^1.0.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
-  dependencies:
-    balanced-match "^0.4.1"
-    concat-map "0.0.1"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-brorand@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-
-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
-  dependencies:
-    buffer-xor "^1.0.2"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    inherits "^2.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
-  dependencies:
-    pako "~0.2.0"
-
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
-
-browserslist@^2.1.2:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
-  dependencies:
-    caniuse-lite "^1.0.30000684"
-    electron-to-chromium "^1.3.14"
-
-buffer-shims@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
-buffer-xor@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  dependencies:
-    callsites "^0.2.0"
-
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
-caniuse-api@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
-  dependencies:
-    browserslist "^1.3.6"
-    caniuse-db "^1.0.30000529"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000662"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000662.tgz#616b17a525b52fec14611f88af3d5a9b5438c050"
-
-caniuse-lite@^1.0.30000684:
-  version "1.0.30000696"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz#30f2695d2a01a0dfd779a26ab83f4d134b3da5cc"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
-chai@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.0.tgz#331a0391b55c3af8740ae9c3b7458bc1c3805e6d"
-  dependencies:
-    assertion-error "^1.0.1"
-    check-error "^1.0.1"
-    deep-eql "^2.0.1"
-    get-func-name "^2.0.0"
-    pathval "^1.0.0"
-    type-detect "^4.0.0"
-
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-character-parser@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
-  dependencies:
-    is-regex "^1.0.3"
-
-check-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-
-chokidar@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-ci-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
-
-cipher-base@^1.0.0, cipher-base@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
-  dependencies:
-    inherits "^2.0.1"
-
-circular-json@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
-
-clap@^1.0.9:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
-  dependencies:
-    chalk "^1.1.3"
-
-clean-css@^3.3.0:
-  version "3.4.25"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.25.tgz#9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"
-  dependencies:
-    commander "2.8.x"
-    source-map "0.4.x"
-
-cli-cursor@^1.0.1, cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-spinners@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
-
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
-
-cli-width@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
-
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-clone@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-coa@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
-  dependencies:
-    q "^1.1.2"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-coffee-loader@^0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.7.3.tgz#fadbc6efd6fc7ecc88c5b3046a2c292066bcb54a"
-  dependencies:
-    loader-utils "^1.0.2"
-
-coffee-script@^1.12.6:
-  version "1.12.6"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.6.tgz#285a3f7115689065064d6bf9ef4572db66695cbf"
-
-color-convert@^1.0.0, color-convert@^1.3.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
-  dependencies:
-    color-name "^1.1.1"
-
-color-name@^1.0.0, color-name@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
-
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  dependencies:
-    color-name "^1.0.0"
-
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
-
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
-  dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
-
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2.8.x:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commander@2.9.0, commander@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-concat-stream@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-config-chain@~1.1.5:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-consolidate@^0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
-  dependencies:
-    bluebird "^3.1.1"
-
-constantinople@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
-  dependencies:
-    acorn "^3.1.0"
-    is-expression "^2.0.1"
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-
-content-type-parser@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
-
-convert-source-map@^1.1.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
-
-core-js@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cosmiconfig@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-1.1.0.tgz#0dea0f9804efdfb929fbb1b188e25553ea053d37"
-  dependencies:
-    graceful-fs "^4.1.2"
-    js-yaml "^3.4.3"
-    minimist "^1.2.0"
-    object-assign "^4.0.1"
-    os-homedir "^1.0.1"
-    parse-json "^2.2.0"
-    pinkie-promise "^2.0.0"
-    require-from-string "^1.1.0"
-
-cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.2.tgz#c43ae86d238f08f1728a345ed60ceb0aef63c060"
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.4.3"
-    json-parse-helpfulerror "^1.0.3"
-    minimist "^1.2.0"
-    object-assign "^4.1.0"
-    os-homedir "^1.0.1"
-    require-from-string "^1.1.0"
-
-create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.2.tgz#51210062d7bb7479f6c65bb41a92208b1d61abad"
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    ripemd160 "^1.0.0"
-    sha.js "^2.3.6"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.4.tgz#d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"
-  dependencies:
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-crypto-browserify@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-
-css-color-names@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
-css-loader@^0.28.4:
-  version "0.28.4"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
-  dependencies:
-    babel-code-frame "^6.11.0"
-    css-selector-tokenizer "^0.7.0"
-    cssnano ">=2.6.1 <4"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    object-assign "^4.0.1"
-    postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.0.0"
-    postcss-modules-local-by-default "^1.0.1"
-    postcss-modules-scope "^1.0.0"
-    postcss-modules-values "^1.1.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^0.1.7"
-
-css-parse@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-
-css-selector-tokenizer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-
-"cssnano@>=2.6.1 <4":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-  dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
-
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
-
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
-
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
-  dependencies:
-    cssom "0.3.x"
-
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-fns@^1.27.2:
-  version "1.28.5"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.28.5.tgz#257cfc45d322df45ef5658665967ee841cd73faf"
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
-de-indent@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-
-debug@*, debug@^2.1.1, debug@^2.2.0:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
-  dependencies:
-    ms "0.7.3"
-
-debug@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
-  dependencies:
-    ms "0.7.2"
-
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-deep-eql@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-2.0.2.tgz#b1bac06e56f0a76777686d50c9feb75c2ed7679a"
-  dependencies:
-    type-detect "^3.0.0"
-
-deep-extend@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-
-diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-doctrine@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
-doctypes@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
-
-dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
-
-domain-browser@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
-
-domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
-  dependencies:
-    domelementtype "1"
-
-domutils@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-editorconfig@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
-  dependencies:
-    bluebird "^3.0.5"
-    commander "^2.9.0"
-    lru-cache "^3.2.0"
-    sigmund "^1.0.1"
-
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
-  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
-
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-
-elliptic@^6.0.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-
-enhanced-resolve@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    object-assign "^4.0.1"
-    tapable "^0.2.5"
-
-entities@^1.1.1, entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-
-errno@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
-  dependencies:
-    prr "~0.0.0"
-
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.15"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
-  dependencies:
-    es6-iterator "2"
-    es6-symbol "~3.1"
-
-es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-symbol "^3.1"
-
-es6-map@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-set "~0.1.5"
-    es6-symbol "~3.1.1"
-    event-emitter "~0.3.5"
-
-es6-set@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-symbol "3.1.1"
-    event-emitter "~0.3.5"
-
-es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-es6-weak-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-escodegen@^1.6.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  dependencies:
-    esprima "^2.7.1"
-    estraverse "^1.9.1"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.2.0"
-
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-plugin-html@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.1.tgz#3a829510e82522f1e2e44d55d7661a176121fce1"
-  dependencies:
-    htmlparser2 "^3.8.2"
-
-eslint-plugin-vue-libs@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.2.0.tgz#eff85ecd66e8f1c9538d668205fa8d65136f1eac"
-  dependencies:
-    eslint-plugin-html "^2.0.0"
-
-eslint@^3.19.0:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
-    doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
-    esquery "^1.0.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
-    strip-json-comments "~2.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
-
-espree@^3.4.0:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.2.tgz#38dbdedbedc95b8961a1fbf04734a8f6a9c8c592"
-  dependencies:
-    acorn "^5.0.1"
-    acorn-jsx "^3.0.0"
-
-esprima@^2.6.0, esprima@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-
-esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-
-esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
-  dependencies:
-    estraverse "^4.0.0"
-
-esrecurse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
-  dependencies:
-    estraverse "~4.1.0"
-    object-assign "^4.0.1"
-
-estraverse@^1.9.1:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-
-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
-estraverse@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-event-emitter@~0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-
-evp_bytestokey@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
-  dependencies:
-    create-hash "^1.1.1"
-
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-expose-loader@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.3.tgz#35fbd3659789e4faa81f59de8b7e9fc39e466d51"
-
-extend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
-extract-text-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
-  dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
-    schema-utils "^0.3.0"
-    webpack-sources "^1.0.1"
-
-extsprintf@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
-
-fast-deep-equal@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
-
-fast-levenshtein@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-
-fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-
-figures@^1.3.5, figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
-file-loader@^0.11.2:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
-  dependencies:
-    loader-utils "^1.0.2"
-
-filename-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  dependencies:
-    locate-path "^2.0.0"
-
-flat-cache@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
-  dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
-
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-function-bind@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
-
-gauge@~2.7.1:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-
-get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
-glob@7.0.x:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^9.0.0, globals@^9.14.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  dependencies:
-    function-bind "^1.0.2"
-
-hash-sum@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
-  dependencies:
-    inherits "^2.0.1"
-
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-he@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
-hmac-drbg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
-hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
-
-html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-
-html-encoding-sniffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
-  dependencies:
-    whatwg-encoding "^1.0.1"
-
-htmlparser2@^3.8.2:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
-  dependencies:
-    domelementtype "^1.3.0"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^2.0.2"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
-
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
-
-iconv-lite@0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
-
-icss-replace-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
-
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  dependencies:
-    postcss "^6.0.1"
-
-ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-
-ignore@^3.2.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
-
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
-
-inject-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-3.0.0.tgz#0aea1f96e589e657bdbb6b26e7d9d41730e5b68f"
-  dependencies:
-    babel-core "~6"
-
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-interpret@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
-
-invariant@^2.2.0, invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
-  dependencies:
-    loose-envify "^1.0.0"
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-ci@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
-  dependencies:
-    ci-info "^1.0.0"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-
-is-dotfile@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-expression@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
-  dependencies:
-    acorn "~3.3.0"
-    object-assign "^4.0.1"
-
-is-expression@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
-  dependencies:
-    acorn "~4.0.2"
-    object-assign "^4.0.1"
-
-is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
-is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-my-json-valid@^2.10.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-number@^2.0.2, is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
-is-promise@^2.0.0, is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
-is-regex@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
-is-resolvable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
-  dependencies:
-    tryit "^1.0.1"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  dependencies:
-    html-comment-regex "^1.1.0"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  dependencies:
-    isarray "1.0.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jju@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"
-
-jodid25519@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
-  dependencies:
-    jsbn "~0.1.0"
-
-js-base64@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
-
-js-beautify@^1.6.14:
-  version "1.6.14"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.6.14.tgz#d3b8f7322d02b9277d58bd238264c327e58044cd"
-  dependencies:
-    config-chain "~1.1.5"
-    editorconfig "^0.13.2"
-    mkdirp "~0.5.0"
-    nopt "~3.0.1"
-
-js-stringify@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
-
-js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
-
-js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-jsdom@^9.2.1:
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
-  dependencies:
-    abab "^1.0.3"
-    acorn "^4.0.4"
-    acorn-globals "^3.1.0"
-    array-equal "^1.0.0"
-    content-type-parser "^1.0.1"
-    cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
-    escodegen "^1.6.1"
-    html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.79.0"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
-    tough-cookie "^2.3.2"
-    webidl-conversions "^4.0.0"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
-    xml-name-validator "^2.0.1"
-
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-
-json-loader@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
-
-json-parse-helpfulerror@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
-  dependencies:
-    jju "^1.1.0"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
-json5@^0.5.0, json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
-jsprim@^1.2.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.0.2"
-    json-schema "0.2.3"
-    verror "1.3.6"
-
-jstransformer@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
-  dependencies:
-    is-promise "^2.0.0"
-    promise "^7.0.1"
-
-kind-of@^3.0.2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
-  dependencies:
-    is-buffer "^1.1.5"
-
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  dependencies:
-    invert-kv "^1.0.0"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-lint-staged@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.0.2.tgz#8e83e11e9e1656c09b6117f6db0d55fd4960a1c0"
-  dependencies:
-    app-root-path "^2.0.0"
-    cosmiconfig "^1.1.0"
-    execa "^0.7.0"
-    listr "^0.12.0"
-    lodash.chunk "^4.2.0"
-    minimatch "^3.0.0"
-    npm-which "^3.0.1"
-    p-map "^1.1.1"
-    staged-git-files "0.0.4"
-
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-
-listr-update-renderer@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^1.0.2"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.0.tgz#44dc01bb0c34a03c572154d4d08cde9b1dc5620f"
-  dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
-
-listr@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a"
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    figures "^1.7.0"
-    indent-string "^2.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.2.0"
-    listr-verbose-renderer "^0.4.0"
-    log-symbols "^1.0.2"
-    log-update "^1.0.2"
-    ora "^0.2.3"
-    p-map "^1.1.1"
-    rxjs "^5.0.0-beta.11"
-    stream-to-observable "^0.1.0"
-    strip-ansi "^3.0.1"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
-
-loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash._reinterpolate@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-
-lodash.chunk@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
-lodash.template@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.3.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  dependencies:
-    chalk "^1.0.0"
-
-log-update@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
-  dependencies:
-    ansi-escapes "^1.0.0"
-    cli-cursor "^1.0.2"
-
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
-loose-envify@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
-
-lru-cache@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
-  dependencies:
-    pseudomap "^1.0.1"
-
-lru-cache@^4.0.1, lru-cache@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
-
-make-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.0.0.tgz#97a011751e91dd87cfadef58832ebb04936de978"
-  dependencies:
-    pify "^2.3.0"
-
-marked@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
-
-math-expression-evaluator@^1.2.14:
-  version "1.2.16"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-miller-rabin@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
-
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.15"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
-  dependencies:
-    mime-db "~1.27.0"
-
-mime@1.3.x:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
-minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-
-minimatch@^3.0.0, minimatch@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-mocha@^3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.4.2.tgz#d0ef4d332126dbf18d0d640c9b382dd48be97594"
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.0"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
-ms@0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-
-nan@^2.3.0:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-
-node-libs-browser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646"
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.1.4"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^1.0.0"
-    https-browserify "0.0.1"
-    os-browserify "^0.2.0"
-    path-browserify "0.0.0"
-    process "^0.11.0"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.0.5"
-    stream-browserify "^2.0.1"
-    stream-http "^2.3.1"
-    string_decoder "^0.10.25"
-    timers-browserify "^2.0.2"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
-
-node-pre-gyp@^0.6.29:
-  version "0.6.34"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
-  dependencies:
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "^2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-nopt@~3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  dependencies:
-    abbrev "1"
-
-normalize-newline@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-newline/-/normalize-newline-3.0.0.tgz#1cbea804aba436001f83938ab21ec039d69ae9d3"
-
-normalize-package-data@^2.3.2:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
-npm-path@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.3.tgz#15cff4e1c89a38da77f56f6055b24f975dfb2bbe"
-  dependencies:
-    which "^1.2.10"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  dependencies:
-    path-key "^2.0.0"
-
-npm-which@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
-  dependencies:
-    commander "^2.9.0"
-    npm-path "^2.0.2"
-    which "^1.2.10"
-
-npmlog@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.1"
-    set-blocking "~2.0.0"
-
-null-loader@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-0.1.1.tgz#17be9abfcd3ff0e1512f6fc4afcb1f5039378fae"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-"nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.3.9"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
-
-oauth-sign@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-once@^1.3.0, once@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-
-optionator@^0.8.1, optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-ora@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
-  dependencies:
-    chalk "^1.1.1"
-    cli-cursor "^1.0.2"
-    cli-spinners "^0.1.2"
-    object-assign "^4.0.1"
-
-os-browserify@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
-
-os-homedir@^1.0.0, os-homedir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
-p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
-
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  dependencies:
-    p-limit "^1.1.0"
-
-p-map@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"
-
-pako@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-
-parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  dependencies:
-    error-ex "^1.2.0"
-
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-
-path-key@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-pathval@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-
-pbkdf2@^3.0.3:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693"
-  dependencies:
-    create-hmac "^1.1.2"
-
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
-pify@^2.0.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  dependencies:
-    find-up "^2.1.0"
-
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
-
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
-
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-overridden@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  dependencies:
-    postcss "^5.0.16"
-
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
-
-postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
-  dependencies:
-    postcss "^5.0.4"
-    uniqid "^4.0.0"
-
-postcss-load-config@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
-  dependencies:
-    cosmiconfig "^2.1.0"
-    object-assign "^4.1.0"
-    postcss-load-options "^1.2.0"
-    postcss-load-plugins "^2.3.0"
-
-postcss-load-options@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
-  dependencies:
-    cosmiconfig "^2.1.0"
-    object-assign "^4.1.0"
-
-postcss-load-plugins@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
-  dependencies:
-    cosmiconfig "^2.1.1"
-    object-assign "^4.1.0"
-
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
-
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-merge-rules@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
-    vendors "^1.0.0"
-
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
-  dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
-  dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
-
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
-    uniqs "^2.0.0"
-
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
-
-postcss-modules-extract-imports@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-modules-local-by-default@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
-  dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
-
-postcss-modules-scope@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
-  dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
-
-postcss-modules-values@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
-  dependencies:
-    icss-replace-symbols "^1.0.2"
-    postcss "^5.0.14"
-
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
-  dependencies:
-    postcss "^5.0.5"
-
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
-  dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
-
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
-  dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
-
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
-
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
-  dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
-
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
-
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
-  version "5.2.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
-  dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
-
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.6:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
-  dependencies:
-    chalk "^2.0.1"
-    source-map "^0.5.6"
-    supports-color "^4.1.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
-private@^0.1.6:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-process@^0.11.0:
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
-
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
-promise@^7.0.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
-  dependencies:
-    asap "~2.0.3"
-
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-
-pseudomap@^1.0.1, pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-
-public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-
-pug-attrs@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
-  dependencies:
-    constantinople "^3.0.1"
-    js-stringify "^1.0.1"
-    pug-runtime "^2.0.3"
-
-pug-code-gen@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
-  dependencies:
-    constantinople "^3.0.1"
-    doctypes "^1.1.0"
-    js-stringify "^1.0.1"
-    pug-attrs "^2.0.2"
-    pug-error "^1.3.2"
-    pug-runtime "^2.0.3"
-    void-elements "^2.0.1"
-    with "^5.0.0"
-
-pug-error@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
-
-pug-filters@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.3.tgz#d59767a220de797dd755489f66834cf9aa83aa54"
-  dependencies:
-    clean-css "^3.3.0"
-    constantinople "^3.0.1"
-    jstransformer "1.0.0"
-    pug-error "^1.3.2"
-    pug-walk "^1.1.3"
-    resolve "^1.1.6"
-    uglify-js "^2.6.1"
-
-pug-lexer@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
-  dependencies:
-    character-parser "^2.1.1"
-    is-expression "^3.0.0"
-    pug-error "^1.3.2"
-
-pug-linker@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.1.tgz#ba3f8ff213ca8f3a304859b44fed13ca7b9dfa19"
-  dependencies:
-    pug-error "^1.3.2"
-    pug-walk "^1.1.3"
-
-pug-load@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.7.tgz#531d0c6e11546010e984630d03df406367d2de77"
-  dependencies:
-    object-assign "^4.1.0"
-    pug-walk "^1.1.3"
-
-pug-parser@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-3.0.0.tgz#37c619dd800f642187ce4d6ce1a164cdd75487a3"
-  dependencies:
-    pug-error "^1.3.2"
-    token-stream "0.0.1"
-
-pug-runtime@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
-
-pug-strip-comments@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
-  dependencies:
-    pug-error "^1.3.2"
-
-pug-walk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.3.tgz#d7cd5b23db3ca87c636c86a0973f9cd8e030436c"
-
-pug@^2.0.0-rc.2:
-  version "2.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-rc.2.tgz#07845527790ab2c6be67dcf5eb1f31804081f04a"
-  dependencies:
-    pug-code-gen "^1.1.1"
-    pug-filters "^2.1.3"
-    pug-lexer "^3.1.0"
-    pug-linker "^3.0.1"
-    pug-load "^2.0.7"
-    pug-parser "^3.0.0"
-    pug-runtime "^2.0.3"
-    pug-strip-comments "^1.0.2"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-q@^1.1.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
-randomatic@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
-  dependencies:
-    is-number "^2.0.2"
-    kind-of "^3.0.2"
-
-randombytes@^2.0.0, randombytes@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
-
-raw-loader@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-
-rc@^1.1.7:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
-  dependencies:
-    buffer-shims "~1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~1.0.0"
-    util-deprecate "~1.0.1"
-
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
-reduce-css-calc@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  dependencies:
-    balanced-match "^0.4.2"
-
-regenerate@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
-
-regenerator-runtime@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
-
-regenerator-transform@0.9.11:
-  version "0.9.11"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
-  dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
-    private "^0.1.6"
-
-regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
-
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  dependencies:
-    jsesc "~0.5.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  dependencies:
-    is-finite "^1.0.0"
-
-request@^2.79.0, request@^2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-from-string@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
-require-uncached@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-
-resolve@^1.1.6, resolve@^1.2.0, resolve@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
-  dependencies:
-    path-parse "^1.0.5"
-
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
-
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
-  dependencies:
-    glob "^7.0.5"
-
-ripemd160@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
-
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  dependencies:
-    once "^1.3.0"
-
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-
-rxjs@^5.0.0-beta.11:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.2.tgz#2a3236fcbf03df57bae06fd6972fd99e5c08fcf7"
-  dependencies:
-    symbol-observable "^1.0.1"
-
-safe-buffer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-
-sax@^1.2.1, sax@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
-
-schema-utils@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-  dependencies:
-    ajv "^5.0.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-serialize-javascript@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.3.0.tgz#86a4f3752f5c7e47295449b0bbb63d64ba533f05"
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-sha.js@^2.3.6:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
-  dependencies:
-    inherits "^2.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-
-shelljs@^0.7.5:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-sigmund@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-skeleton-loader@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/skeleton-loader/-/skeleton-loader-1.1.3.tgz#0c49a088b74b8b48442de56206059ad05e5af9f0"
-  dependencies:
-    loader-utils "^1.1.0"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-source-list-map@^0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-
-source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-
-source-map-support@^0.4.2:
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.4.x:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.5.6, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-
-source-map@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-  dependencies:
-    amdefine ">=0.0.4"
-
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  dependencies:
-    spdx-license-ids "^1.0.2"
-
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
-
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-
-sshpk@^1.7.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jodid25519 "^1.0.0"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-staged-git-files@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
-
-stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-http@^2.3.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.2.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-to-observable@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^3.0.0"
-
-string_decoder@^0.10.25:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
-  dependencies:
-    buffer-shims "~1.0.0"
-
-stringstream@~0.0.4:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  dependencies:
-    is-utf8 "^0.2.0"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
-stylus-loader@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.1.tgz#77f4b34fd030d25b2617bcf5513db5b0730c4089"
-  dependencies:
-    loader-utils "^1.0.2"
-    lodash.clonedeep "^4.5.0"
-    when "~3.6.x"
-
-stylus@^0.54.5:
-  version "0.54.5"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  dependencies:
-    css-parse "1.7.x"
-    debug "*"
-    glob "7.0.x"
-    mkdirp "0.5.x"
-    sax "0.5.x"
-    source-map "0.1.x"
-
-sugarss@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"
-  dependencies:
-    postcss "^6.0.0"
-
-supports-color@3.1.2, supports-color@^3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^4.0.0, supports-color@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
-  dependencies:
-    has-flag "^2.0.0"
-
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
-
-symbol-observable@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
-
-symbol-tree@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
-tapable@^0.2.5, tapable@~0.2.5:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
-
-tar-pack@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-text-table@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
-timers-browserify@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
-  dependencies:
-    setimmediate "^1.0.4"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-
-to-fast-properties@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
-
-token-stream@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
-
-tough-cookie@^2.3.2, tough-cookie@~2.3.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
-  dependencies:
-    punycode "^1.4.1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
-tryit@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-detect@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-3.0.0.tgz#46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55"
-
-type-detect@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-uglify-js@^2.6.1:
-  version "2.8.22"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-js@^2.8.29:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-
-uglifyjs-webpack-plugin@^0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
-  dependencies:
-    source-map "^0.5.6"
-    uglify-js "^2.8.29"
-    webpack-sources "^1.0.1"
-
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  dependencies:
-    macaddress "^0.2.8"
-
-uniqs@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
-
-url-loader@^0.5.9:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
-  dependencies:
-    loader-utils "^1.0.2"
-    mime "1.3.x"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-util@0.10.3, util@^0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  dependencies:
-    inherits "2.0.1"
-
-uuid@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
-
-vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
-
-verror@1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
-  dependencies:
-    extsprintf "1.0.2"
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  dependencies:
-    indexof "0.0.1"
-
-void-elements@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-
-vue-hot-reload-api@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"
-
-vue-server-renderer@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.4.1.tgz#9a1986c459387eaa319c16ca5c0d0f2ebb2c66c5"
-  dependencies:
-    chalk "^1.1.3"
-    hash-sum "^1.0.2"
-    he "^1.1.0"
-    lodash.template "^4.4.0"
-    lodash.uniq "^4.5.0"
-    resolve "^1.2.0"
-    serialize-javascript "^1.3.0"
-    source-map "0.5.6"
-
-vue-style-loader@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.0.1.tgz#c8b639bb2f24baf9d78274dc17e4f264c1deda08"
-  dependencies:
-    hash-sum "^1.0.2"
-    loader-utils "^1.0.2"
-
-vue-template-compiler@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.4.1.tgz#20115cf8714f222f9be4111ec75b079a1c9b8197"
-  dependencies:
-    de-indent "^1.0.2"
-    he "^1.1.0"
-
-vue-template-es2015-compiler@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
-
-vue@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.1.tgz#76e0b8eee614613532216b7bfe784e0b5695b160"
-
-watchpack@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
-  dependencies:
-    async "^2.1.2"
-    chokidar "^1.7.0"
-    graceful-fs "^4.1.2"
-
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
-
-webpack-sources@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.5.3"
-
-webpack@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc"
-  dependencies:
-    acorn "^5.0.0"
-    acorn-dynamic-import "^2.0.0"
-    ajv "^5.1.5"
-    ajv-keywords "^2.0.0"
-    async "^2.1.2"
-    enhanced-resolve "^3.3.0"
-    escope "^3.6.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    json5 "^0.5.1"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    mkdirp "~0.5.0"
-    node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^3.1.0"
-    tapable "~0.2.5"
-    uglifyjs-webpack-plugin "^0.4.6"
-    watchpack "^1.4.0"
-    webpack-sources "^1.0.1"
-    yargs "^6.0.0"
-
-whatwg-encoding@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
-  dependencies:
-    iconv-lite "0.4.13"
-
-whatwg-url@^4.3.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.1.tgz#df4dc2e3f25a63b1fa5b32ed6d6c139577d690de"
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-when@~3.6.x:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
-
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-
-which@^1.2.10, which@^1.2.9:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
-  dependencies:
-    string-width "^1.0.1"
-
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
-with@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
-  dependencies:
-    acorn "^3.1.0"
-    acorn-globals "^3.0.0"
-
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  dependencies:
-    mkdirp "^0.5.1"
-
-xml-name-validator@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
-yargs-parser@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
-  dependencies:
-    camelcase "^3.0.0"
-
-yargs@^6.0.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
-  dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"

From e59b08b4834dd7d57ab7b0ac2db96652254cea4d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 26 Aug 2017 14:43:28 -0400
Subject: [PATCH 690/877] update docs theme plugin

---
 docs/book.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/book.json b/docs/book.json
index 4cdd37699..102189947 100644
--- a/docs/book.json
+++ b/docs/book.json
@@ -1,7 +1,7 @@
 {
   "title": "vue-loader",
   "gitbook": ">3.0.0",
-  "plugins": ["edit-link", "theme-vuejs@git+https://github.com/pearofducks/gitbook-plugin-theme-vuejs.git", "-fontsettings", "github"],
+  "plugins": ["edit-link", "theme-vuejs", "-fontsettings", "github"],
   "pluginsConfig": {
     "edit-link": {
       "base": "https://github.com/vuejs/vue-loader/tree/master/docs",

From 597d26bd14260c83a24e19fb6abc8ce56a11adf5 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Wed, 30 Aug 2017 08:09:11 +0300
Subject: [PATCH 691/877] [RU] Updates (#916)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение
---
 docs/ru/configurations/advanced.md       |  2 +-
 docs/ru/configurations/pre-processors.md | 34 ++++++++++++++++++++++++
 docs/ru/features/scoped-css.md           | 16 +++++++++++
 docs/ru/options.md                       | 10 ++++---
 docs/ru/workflow/testing-with-mocks.md   |  4 +--
 docs/ru/workflow/testing.md              |  2 +-
 6 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
index 015dd1ef9..51edb4d2b 100644
--- a/docs/ru/configurations/advanced.md
+++ b/docs/ru/configurations/advanced.md
@@ -10,7 +10,7 @@
 
 Чтобы сделать это укажите опцию `loaders` для `vue-loader`:
 
-> Опции `preLoaders` и `postLoaders` доступны только в версиях >=10.3.0
+> Опции `preLoaders` и `postLoaders` доступны только в версиях 10.3.0+
 
 ### Webpack 2.x
 
diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
index 1d3c80f85..921a7b4ea 100644
--- a/docs/ru/configurations/pre-processors.md
+++ b/docs/ru/configurations/pre-processors.md
@@ -37,6 +37,40 @@ npm install sass-loader node-sass --save-dev
 
 Обратитесь к разделу [продвинутой конфигурации загрузчиков](./advanced.md) для получения дополнительной информации о том, как настраивать vue-loader.
 
+#### Загрузка глобального файла настроек
+
+Часто встречаются просьбы добавить возможность загружать файл настроек в каждом компоненте без необходимости явно импортировать его каждый раз, например для использования SCSS-переменных глобально во всех компонентах. Для этого нужно:
+
+``` bash
+npm install sass-resources-loader --save-dev
+```
+
+Затем добавить новое правило в Webpack:
+
+``` js
+{
+  loader: 'sass-resources-loader',
+  options: {
+    resources: path.resolve(__dirname, '../src/style/_variables.scss')
+  }
+}
+```
+
+Например, если вы используете [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack), измените файл `build/util.js` таким образом:
+
+``` js
+scss: generateLoaders('sass').concat(
+  {
+    loader: 'sass-resources-loader',
+    options: {
+      resources: path.resolve(__dirname, '../src/style/_variables.scss')
+    }
+  }
+),
+```
+
+В этот файл рекомендуется включать только переменные, примеси и т.п., чтобы предотвратить дублирование CSS в финальных скомпилированных файлах. 
+
 ### JavaScript
 
 Весь JavaScript внутри Vue компонентов обрабатывается `babel-loader` по умолчанию. При необходимости это можно изменить:
diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
index 1ca2c27aa..4375a5607 100644
--- a/docs/ru/features/scoped-css.md
+++ b/docs/ru/features/scoped-css.md
@@ -49,3 +49,19 @@
 4. **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](http://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
 
 5. **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.
+
+6. Если вам нужны вложенные селекторы в `scoped` стилях, вам нужно будет использовать оператор `>>>` для CSS и `/deep/` для `scss`:
+
+  ``` html
+  <style scoped>
+  .a >>> .b {
+  
+  }
+  </style>
+  
+  <style lang="scss" scoped>
+  .a /deep/ .b {
+  
+  }
+  </style>
+  ```
\ No newline at end of file
diff --git a/docs/ru/options.md b/docs/ru/options.md
index 0e2d361b8..7b789383c 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -64,14 +64,14 @@ module.exports = {
 ### preLoaders
 
 - Тип: `{ [lang: string]: string }`
-- поддерживается только в версиях >=10.3.0
+- поддерживается только в версиях 10.3.0+
 
   Конфигурация подобна как и в `loaders`, но `preLoaders` будут применены к соответствующим секциям перед стандартными загрузчиками. Вы можете использовать это для предварительной обработки секций - например для локализации на этапе сборки.
 
 ### postLoaders
 
 - Тип: `{ [lang: string]: string }`
-- поддерживается только в версиях >=10.3.0
+- поддерживается только в версиях 10.3.0+
 
   Конфигурация подобна как и в `loaders`, но `postLoaders` применяются после загрузчиков по умолчанию. Вы можете использовать это для пост-обработки языков. Обратите внимание, что тем не менее всё несколько сложнее:
 
@@ -81,7 +81,7 @@ module.exports = {
 
 ### postcss
 
-> Примечание: в версиях >=11.0.0 рекомендуется использовать файл конфигурации PostCSS вместо описания секции. [Использование аналогично как в `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+> Примечание: в версиях 11.0.0+ рекомендуется использовать файл конфигурации PostCSS вместо описания секции. [Использование аналогично как в `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
 
 - Тип: `Array` или `Function` или `Object`
 
@@ -124,10 +124,12 @@ module.exports = {
 ### esModule
 
 - Тип: `boolean`
-- По умолчанию: `false`
+- По умолчанию: `true` (v13.0+)
 
   Генерация esModule совместимого кода. По умолчанию vue-loader генерирует модули в формате commonjs `module.exports = ....`. Когда опция `esModule` установлена в true, экспорт по умолчанию (default export) будет преобразован в `exports.__esModule = true; exports = ...`. Это может быть полезным для настройки взаимодействия с транспиляторами, отличными от  Babel, как например TypeScript.
 
+> Примечание: до версии v12.x, значение по умолчанию `false`.
+
 ### preserveWhitespace
 
 - Тип: `boolean`
diff --git a/docs/ru/workflow/testing-with-mocks.md b/docs/ru/workflow/testing-with-mocks.md
index 5326d0543..1b7b7a6ff 100644
--- a/docs/ru/workflow/testing-with-mocks.md
+++ b/docs/ru/workflow/testing-with-mocks.md
@@ -38,13 +38,13 @@ npm install inject-loader@^2.0.0 --save-dev
 
 ``` js
 // example.spec.js
-const ExampleInjector = require('!!vue?inject!./example.vue')
+const ExampleInjector = require('!!vue-loader?inject!./example.vue')
 ```
 
 Обратите внимание на эту безумную строку импорта – мы используем [запросы к webpack загрузчику](https://webpack.github.io/docs/loaders.html). Краткое пояснение:
 
 - `!!` в начале строки означает "отключи все загрузчики из глобальной конфигурации"
-- `vue?inject!` значит "используй `vue` загрузчик и передай запрос `?inject`". Это заставляет `vue-loader` скомпилировать компонент в режиме внедрения зависимостей.
+- `vue-loader?inject!` значит "используй загрузчик `vue-loader` и передай запрос `?inject`". Это заставляет `vue-loader` скомпилировать компонент в режиме внедрения зависимостей.
 
 Полученный `ExampleInjector` – это фабричная функция, которую можно вызвать, чтобы создать экземпляр модуля `example.vue`:
 
diff --git a/docs/ru/workflow/testing.md b/docs/ru/workflow/testing.md
index 389eac419..e8bdf2090 100644
--- a/docs/ru/workflow/testing.md
+++ b/docs/ru/workflow/testing.md
@@ -11,7 +11,7 @@ Karma – это тестовый движок, который запускае
 npm install\
   karma karma-webpack\
   karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs\
+  karma-phantomjs-launcher phantomjs-prebuilt\
   --save-dev
 ```
 

From c48e6fe2a6fb20493d0e8cac3266a7dde82ecf5c Mon Sep 17 00:00:00 2001
From: Elevista <sunnyholic@sunnyholic.com>
Date: Fri, 1 Sep 2017 23:38:08 +0900
Subject: [PATCH 692/877] fix #943, should consider path or file name includes
 dot (#945)

* keep path of source file in source map

* fix #943, regex should consider path or file name includes dot

* use path.extname rather than regex

* add sourceRoot option for SourceMapGenerator
---
 lib/parser.js   | 12 +++++++-----
 lib/selector.js |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/parser.js b/lib/parser.js
index 66439909f..55db356cd 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -6,7 +6,7 @@ var SourceMapGenerator = require('source-map').SourceMapGenerator
 var splitRE = /\r?\n/g
 var emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = function (content, filename, needMap) {
+module.exports = function (content, filename, needMap, sourceRoot) {
   var cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
   var filenameWithHash = filename + '?' + cacheKey
@@ -18,7 +18,8 @@ module.exports = function (content, filename, needMap) {
       output.script.map = generateSourceMap(
         filenameWithHash,
         content,
-        output.script.content
+        output.script.content,
+        sourceRoot
       )
     }
     if (output.styles) {
@@ -27,7 +28,8 @@ module.exports = function (content, filename, needMap) {
           style.map = generateSourceMap(
             filenameWithHash,
             content,
-            style.content
+            style.content,
+            sourceRoot
           )
         }
       })
@@ -37,8 +39,8 @@ module.exports = function (content, filename, needMap) {
   return output
 }
 
-function generateSourceMap (filename, source, generated) {
-  var map = new SourceMapGenerator()
+function generateSourceMap (filename, source, generated, sourceRoot) {
+  var map = new SourceMapGenerator({ sourceRoot })
   map.setSourceContent(filename, source)
   generated.split(splitRE).forEach((line, index) => {
     if (!emptyRE.test(line)) {
diff --git a/lib/selector.js b/lib/selector.js
index 7a7277592..75c32b2d8 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -10,8 +10,10 @@ module.exports = function (content) {
   this.cacheable()
   var query = loaderUtils.getOptions(this) || {}
   var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
-  var filename = path.relative(context, this.resourcePath).replace(/\..+$/, '.vue')
-  var parts = parse(content, filename, this.sourceMap)
+  var filename = path.basename(this.resourcePath)
+  filename = filename.substring(0, filename.lastIndexOf(path.extname(filename))) + '.vue'
+  var sourceRoot = path.dirname(path.relative(context, this.resourcePath))
+  var parts = parse(content, filename, this.sourceMap, sourceRoot)
   var part = parts[query.type]
   if (Array.isArray(part)) {
     part = part[query.index]

From 9d2ecc3fa4952fbd5c16c1f81c33e03504a02a5a Mon Sep 17 00:00:00 2001
From: mpr0xy <mpr0xy@live.com>
Date: Fri, 1 Sep 2017 22:40:25 +0800
Subject: [PATCH 693/877] fix scoped id if keyframes has prefix (#934)

* add -webkit-keyframes in test

* add scope id if keyframes has prefix

* add @-webkit-keyframes in test
---
 lib/style-compiler/plugins/scope-id.js | 2 +-
 test/fixtures/scoped-css.vue           | 4 ++++
 test/test.js                           | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index 20aba44a0..c2f2c2566 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -11,7 +11,7 @@ module.exports = postcss.plugin('add-id', function (opts) {
         if (node.type === 'atrule') {
           if (node.name === 'media' || node.name === 'supports') {
             node.each(rewriteSelector)
-          } else if (node.name === 'keyframes') {
+          } else if (/-?keyframes$/.test(node.name)) {
             // register keyframes
             keyframes[node.params] = node.params = node.params + '-' + opts.id
           }
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 1b5aa0214..ef2d41b7f 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -19,6 +19,10 @@ h1 {
   from { color: red; }
   to { color: green; }
 }
+@-webkit-keyframes color {
+  from { color: red; }
+  to { color: green; }
+}
 .foo p >>> .bar {
   color: red;
 }
diff --git a/test/test.js b/test/test.js
index 0bce47f3d..c5b56a0ff 100644
--- a/test/test.js
+++ b/test/test.js
@@ -237,6 +237,7 @@ describe('vue-loader', function () {
       expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id} 5s infinite, other 5s;`)
       expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
       expect(style).to.contain(`@keyframes color-${id} {`)
+      expect(style).to.contain(`@-webkit-keyframes color-${id} {`)
       // >>> combinator
       expect(style).to.contain(`.foo p[${id}] .bar {\n  color: red;\n}`)
       done()

From 3a104763a7b43e47e1ddf2fc646433c3074b8bd5 Mon Sep 17 00:00:00 2001
From: Kenta Suzuki <ksuzuki180@gmail.com>
Date: Sun, 3 Sep 2017 21:05:55 +0900
Subject: [PATCH 694/877] Fix typo in Japanese translation (#962)

---
 docs/ja/features/postcss.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
index 3ae7d33e7..07bff8d7f 100644
--- a/docs/ja/features/postcss.md
+++ b/docs/ja/features/postcss.md
@@ -1,6 +1,6 @@
 # PostCSS
 
-`vue-loader`により処理されたCSSのアウトプットはスコープされたCSSにに書き換えるために[PostCSS](https://github.com/postcss/postcss) を通します。カスタムされた PostCSSプラグインをプロセスに追加することが出来ます。例えば、[autoprefixer](https://github.com/postcss/autoprefixer) や [CSSNext](http://cssnext.io/)があります。
+`vue-loader`により処理されたCSSのアウトプットはスコープされたCSSに書き換えるために[PostCSS](https://github.com/postcss/postcss) を通します。カスタムされた PostCSSプラグインをプロセスに追加することが出来ます。例えば、[autoprefixer](https://github.com/postcss/autoprefixer) や [CSSNext](http://cssnext.io/)があります。
 
 ## 設定ファイルの使用
 

From 6558e24aa18972f5d5e17ecb6ed8f74925857ae3 Mon Sep 17 00:00:00 2001
From: Luca <perret.luca@gmail.com>
Date: Sun, 3 Sep 2017 14:07:26 +0200
Subject: [PATCH 695/877] docs(EN,JA,RU): fix webpack template utils filename
 (#961)

---
 docs/en/configurations/pre-processors.md | 2 +-
 docs/ja/configurations/pre-processors.md | 2 +-
 docs/ru/configurations/pre-processors.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index ba24a9b47..caf92e277 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -56,7 +56,7 @@ Then add the following webpack rule:
 }
 ```
 
-As an example, if you are using [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack), modify `build/util.js` like so:
+As an example, if you are using [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack), modify `build/utils.js` like so:
 
 ``` js
 scss: generateLoaders('sass').concat(
diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
index 5b6c76b25..7d41a2abc 100644
--- a/docs/ja/configurations/pre-processors.md
+++ b/docs/ja/configurations/pre-processors.md
@@ -56,7 +56,7 @@ npm install sass-resources-loader --save-dev
 }
 ```
 
-例として、[vuejs-templates/webpack](https://github.com/vuejs-templates/webpack) を使用している場合、 `build/util.js` を以下のように変更してください:
+例として、[vuejs-templates/webpack](https://github.com/vuejs-templates/webpack) を使用している場合、 `build/utils.js` を以下のように変更してください:
 
 ``` js
 scss: generateLoaders('sass').concat(
diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
index 921a7b4ea..dcad1fd36 100644
--- a/docs/ru/configurations/pre-processors.md
+++ b/docs/ru/configurations/pre-processors.md
@@ -56,7 +56,7 @@ npm install sass-resources-loader --save-dev
 }
 ```
 
-Например, если вы используете [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack), измените файл `build/util.js` таким образом:
+Например, если вы используете [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack), измените файл `build/utils.js` таким образом:
 
 ``` js
 scss: generateLoaders('sass').concat(

From 25ac3f8729f6bf7415ba900086464f3c11332321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?=
 <hh_2013@foxmail.com>
Date: Thu, 14 Sep 2017 00:20:26 -0500
Subject: [PATCH 696/877] Update spec.md (#973)

---
 docs/zh-cn/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index e6e8a5ef0..7aa364f35 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -105,7 +105,7 @@ export default {
 ### 语法高亮
 
 
-目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 等)。 非常感谢其他编辑器/IDEs 所作的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
+目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 等)。 非常感谢其他编辑器/IDEs 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
 
 ### 注释
 

From db545374f788ab5dffbbb52c707e91565ee33159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Thu, 14 Sep 2017 17:20:44 +0800
Subject: [PATCH 697/877] [CN] Added "Loading a global settings file" (#964)

* [CN] Added "Loading a global settings file"

* Typo
---
 docs/zh-cn/configurations/pre-processors.md | 34 +++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/docs/zh-cn/configurations/pre-processors.md b/docs/zh-cn/configurations/pre-processors.md
index d3779403c..c880499db 100644
--- a/docs/zh-cn/configurations/pre-processors.md
+++ b/docs/zh-cn/configurations/pre-processors.md
@@ -37,6 +37,40 @@ npm install sass-loader node-sass --save-dev
 
 如要获得更多关于 `vue-loader` 的配置信息，请查看 [Loader 进阶配置](./advanced.md) 章节。
 
+### 加载一个全局设置文件
+
+在每个组件里加载一个设置文件，而无需每次都将其显式导入，是一个常见的需求。比如为所有组件全局使用 scss 变量。为了达成此目的：
+
+``` bash
+npm install sass-resources-loader --save-dev
+```
+
+然后增加下面的 webpack 规则：
+
+``` js
+{
+  loader: 'sass-resources-loader',
+  options: {
+    resources: path.resolve(__dirname, '../src/style/_variables.scss')
+  }
+}
+```
+
+举个例子，如果你使用了 [vuejs-templates/webpack](https://github.com/vuejs-templates/webpack)，请如下修改 `build/utils.js`：
+
+``` js
+scss: generateLoaders('sass').concat(
+  {
+    loader: 'sass-resources-loader',
+    options: {
+      resources: path.resolve(__dirname, '../src/style/_variables.scss')
+    }
+  }
+),
+```
+
+在这个文件里，为了避免在最终编译后的文件中出现重复的 CSS，建议只包含变量、mixins 等。
+
 ### JavaScript
 
 Vue 组件中的所有 JavaScript 默认使用 `babel-loader` 处理。你也可以改变处理方式：

From 97bd432bba4350988bfd0db6d7a1a514b66a9826 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 18 Sep 2017 10:21:19 -0400
Subject: [PATCH 698/877] switch to prettier for formatting render fn code

---
 lib/template-compiler/index.js |  12 ++--
 package-lock.json              | 119 ++++++++-------------------------
 package.json                   |   2 +-
 3 files changed, 38 insertions(+), 95 deletions(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 72da53379..ce1e40328 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -1,7 +1,7 @@
+var prettier = require('prettier')
 var loaderUtils = require('loader-utils')
 var normalize = require('../utils/normalize')
 var compiler = require('vue-template-compiler')
-var beautify = require('js-beautify').js_beautify
 var transpile = require('vue-template-es2015-compiler')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 var transformRequire = require('./modules/transform-require')
@@ -56,6 +56,12 @@ module.exports = function (html) {
       'var staticRenderFns = [' + compiled.staticRenderFns.map(toFunction).join(',') + ']',
       bubleOptions
     ) + '\n'
+
+    // prettify render fn
+    if (!isProduction) {
+      code = prettier.format(code, { semi: false })
+    }
+
     // mark with stripped (this enables Vue to use correct runtime proxy detection)
     if (!isProduction && (
       !bubleOptions ||
@@ -85,9 +91,7 @@ module.exports = function (html) {
 }
 
 function toFunction (code) {
-  return 'function () {' + beautify(code, {
-    indent_size: 2 // eslint-disable-line camelcase
-  }) + '}'
+  return 'function () {' + code + '}'
 }
 
 function pad (html) {
diff --git a/package-lock.json b/package-lock.json
index d113b9780..321b4d396 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,11 +10,6 @@
       "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=",
       "dev": true
     },
-    "abbrev": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8="
-    },
     "acorn": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
@@ -1587,7 +1582,8 @@
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "dev": true
     },
     "commondir": {
       "version": "1.0.1",
@@ -1612,15 +1608,6 @@
         "typedarray": "0.0.6"
       }
     },
-    "config-chain": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
-      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
-      "requires": {
-        "ini": "1.3.4",
-        "proto-list": "1.2.4"
-      }
-    },
     "console-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -2242,28 +2229,6 @@
         "jsbn": "0.1.1"
       }
     },
-    "editorconfig": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
-      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
-      "requires": {
-        "bluebird": "3.5.0",
-        "commander": "2.11.0",
-        "lru-cache": "3.2.0",
-        "semver": "5.4.1",
-        "sigmund": "1.0.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
-          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
-          "requires": {
-            "pseudomap": "1.0.2"
-          }
-        }
-      }
-    },
     "electron-to-chromium": {
       "version": "1.3.18",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz",
@@ -3603,14 +3568,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -3621,6 +3578,14 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -4106,11 +4071,6 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
-    "ini": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
-    },
     "inject-loader": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/inject-loader/-/inject-loader-3.0.1.tgz",
@@ -4457,17 +4417,6 @@
       "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
       "dev": true
     },
-    "js-beautify": {
-      "version": "1.6.14",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz",
-      "integrity": "sha1-07j3Mi0CuSd9WL0jgmTDJ+WARM0=",
-      "requires": {
-        "config-chain": "1.1.11",
-        "editorconfig": "0.13.3",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6"
-      }
-    },
     "js-stringify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
@@ -5241,12 +5190,14 @@
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
     },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
@@ -5374,14 +5325,6 @@
         }
       }
     },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "requires": {
-        "abbrev": "1.1.0"
-      }
-    },
     "normalize-newline": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-newline/-/normalize-newline-3.0.0.tgz",
@@ -7577,6 +7520,11 @@
       "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
       "dev": true
     },
+    "prettier": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.7.0.tgz",
+      "integrity": "sha512-kIbA3UE9sYGiVCxlWg92EOHWZqte6EAkC7DS5je6NaL8g3Uw1rWe0eH+UX4Hy5OEiR9aql2vVMHeg6lR4YGxYg=="
+    },
     "private": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
@@ -7610,11 +7558,6 @@
         "asap": "2.0.6"
       }
     },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk="
-    },
     "prr": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
@@ -8248,7 +8191,8 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "dev": true
     },
     "serialize-javascript": {
       "version": "1.4.0",
@@ -8309,11 +8253,6 @@
         "rechoir": "0.6.2"
       }
     },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
-    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -8470,15 +8409,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -8490,6 +8420,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index fb1735f84..718c65113 100644
--- a/package.json
+++ b/package.json
@@ -43,12 +43,12 @@
   "dependencies": {
     "consolidate": "^0.14.0",
     "hash-sum": "^1.0.2",
-    "js-beautify": "^1.6.14",
     "loader-utils": "^1.1.0",
     "lru-cache": "^4.1.1",
     "postcss": "^6.0.6",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
+    "prettier": "^1.7.0",
     "resolve": "^1.3.3",
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.1.0",

From 118901faf708e435782035e9c2d535af4a1043ad Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 18 Sep 2017 10:22:32 -0400
Subject: [PATCH 699/877] 13.0.5

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 321b4d396..af3c5839a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.4",
+  "version": "13.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 718c65113..d04cc14cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.4",
+  "version": "13.0.5",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From d89bd3ce56f1a98926dc820d12d8e3ab335ce80a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 18 Sep 2017 15:35:09 -0400
Subject: [PATCH 700/877] docs: clarify scoped CSS and Hot reload sections

---
 docs/en/features/hot-reload.md | 14 ++++++++
 docs/en/features/scoped-css.md | 66 +++++++++++++++++++---------------
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/docs/en/features/hot-reload.md b/docs/en/features/hot-reload.md
index 6ce6f8389..1004c9617 100644
--- a/docs/en/features/hot-reload.md
+++ b/docs/en/features/hot-reload.md
@@ -4,4 +4,18 @@
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
+## State Preservation Rules
+
+- When editing the `<template>` of a component, instances of the edited component will re-render in place, preserving all current private state. This is possible because templates are compiled into new render functions that produce no side-effects.
+
+- When editing the `<script>` part of a component, instances of the edited component will be destroyed and re-created in place. (State of the other components in the app are preserved) This is because `<script>` can include lifecycle hooks that may produce side-effects, so a "reload" instead of re-render is required to ensure consistent behavior. This also means you need to be careful about global side effects such as timers inside your components lifecycle hooks. Sometimes you may need to do a full-page reload if your component produces global side-effects.
+
+- `<style>` hot reload operates on its own via `vue-style-loader`, so it doesn't affect application state.
+
+## Usage
+
 When scaffolding the project with `vue-cli`, Hot Reload is enabled out-of-the-box.
+
+When manually setting up your project, hot-reload is enabled automatically when you serve your project with `webpack-dev-server --hot`.
+
+Advanced users may want to check out [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api), which is used internally by `vue-loader`.
diff --git a/docs/en/features/scoped-css.md b/docs/en/features/scoped-css.md
index 765793666..4465c79b5 100644
--- a/docs/en/features/scoped-css.md
+++ b/docs/en/features/scoped-css.md
@@ -28,40 +28,50 @@ Into the following:
 </template>
 ```
 
-#### Notes
+## Tips
 
-1. You can include both scoped and non-scoped styles in the same component:
+### Mixing Local and Global Styles
 
-  ``` html
-  <style>
-  /* global styles */
-  </style>
+You can include both scoped and non-scoped styles in the same component:
 
-  <style scoped>
-  /* local styles */
-  </style>
-  ```
+``` html
+<style>
+/* global styles */
+</style>
+
+<style scoped>
+/* local styles */
+</style>
+```
+
+### Child Component Root Elements
+
+With `scoped`, the parent component's styles will not leak into child components. However, a child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS. This is by design so that the the parent can style the child root element for layout purposes.
+
+### Deep Selectors
+
+If you want a selector in `scoped` styles to be "deep", i.e. affecting child components, you can use the `>>>` combinator:
+
+``` html
+<style scoped>
+.a >>> .b { /* ... */ }
+</style>
+```
+
+The above will be compiled into:
+
+``` css
+.a[data-v-f3f3eg9] .b { /* ... */ }
+```
 
-2. A child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS.
+Some pre-processors, such as SASS, may not be able to parse `>>>` properly. In those cases you can use the `/deep/` combinator instead - it's an alias for `>>>` and works exactly the same.
 
-3. Partials are not affected by scoped styles.
+### Dynamically Generated Content
 
-4. **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
+DOM content created with `v-html` are not affected by scoped styles, but you can still style them using deep selectors.
 
-5. **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
+### Also Keep in Mind
 
-6. If you need nested selectors in `scoped` styles, you will have to use `>>>` operator for CSS and `/deep/` for `scss`:
+- **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
 
-    ``` html
-    <style scoped>
-    .a >>> .b {
-    
-    }
-    </style>
-    
-    <style lang="scss" scoped>
-    .a /deep/ .b {
-    
-    }
-    </style>
-    ```
+- **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.

From 39af4fc042c247dc060045305aaa6dda28ca4c50 Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Tue, 19 Sep 2017 18:48:10 +0530
Subject: [PATCH 701/877] chore(package): Bump dependencies(minor/patch) (#918)

---
 package-lock.json | 925 +---------------------------------------------
 package.json      |  18 +-
 2 files changed, 18 insertions(+), 925 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index af3c5839a..a5534d710 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1331,7 +1331,6 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
-        "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -2799,905 +2798,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.6.2",
-        "node-pre-gyp": "0.6.36"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
     "function-bind": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
@@ -5273,13 +4373,6 @@
       "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
       "dev": true
     },
-    "nan": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
-      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
-      "dev": true,
-      "optional": true
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -8409,6 +7502,15 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -8420,15 +7522,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index d04cc14cf..d11d4b649 100644
--- a/package.json
+++ b/package.json
@@ -45,11 +45,11 @@
     "hash-sum": "^1.0.2",
     "loader-utils": "^1.1.0",
     "lru-cache": "^4.1.1",
-    "postcss": "^6.0.6",
+    "postcss": "^6.0.8",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
     "prettier": "^1.7.0",
-    "resolve": "^1.3.3",
+    "resolve": "^1.4.0",
     "source-map": "^0.5.6",
     "vue-hot-reload-api": "^2.1.0",
     "vue-style-loader": "^3.0.0",
@@ -65,7 +65,7 @@
     "babel-preset-env": "^1.6.0",
     "chai": "^4.1.0",
     "coffee-loader": "^0.7.2",
-    "coffee-script": "^1.12.6",
+    "coffee-script": "^1.12.7",
     "css-loader": "^0.28.4",
     "eslint": "^3.19.0",
     "eslint-plugin-vue-libs": "^1.2.0",
@@ -73,8 +73,8 @@
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
     "husky": "^0.14.3",
-    "inject-loader": "^3.0.0",
-    "js-yaml": "^3.9.0",
+    "inject-loader": "^3.0.1",
+    "js-yaml": "^3.9.1",
     "jsdom": "^9.2.1",
     "lint-staged": "^4.0.2",
     "marked": "^0.3.6",
@@ -91,9 +91,9 @@
     "stylus-loader": "^3.0.1",
     "sugarss": "^1.0.0",
     "url-loader": "^0.5.9",
-    "vue": "^2.4.1",
-    "vue-server-renderer": "^2.4.1",
-    "vue-template-compiler": "^2.4.1",
-    "webpack": "^3.3.0"
+    "vue": "^2.4.2",
+    "vue-server-renderer": "^2.4.2",
+    "vue-template-compiler": "^2.4.2",
+    "webpack": "^3.4.1"
   }
 }

From 407ddbd9e442fc8551d662d1709fcffd35419f21 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Tue, 19 Sep 2017 22:23:30 +0900
Subject: [PATCH 702/877] add vue-template-compiler options passing (#976)

* feat(template-compiler): add compilerDirectives option

* docs(en): add compilerDirectives option

* docs(en): add compilerModules option

* docs(ja): translate options

* docs: updates
---
 docs/en/SUMMARY.md                 |  2 ++
 docs/en/options.md                 | 16 ++++++++++++++++
 docs/ja/SUMMARY.md                 |  2 ++
 docs/ja/options.md                 | 18 +++++++++++++++++-
 lib/template-compiler/index.js     |  1 +
 test/fixtures/custom-directive.vue |  3 +++
 test/test.js                       | 25 ++++++++++++++++++++++++-
 7 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/custom-directive.vue

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 22001aabd..c2d08b1b7 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -26,6 +26,8 @@
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
+  - [compilerModules](options.md#compilermodules)
+  - [compilerDirectives](options.md#compilerdirectives)
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
diff --git a/docs/en/options.md b/docs/en/options.md
index 09e616870..519d931d2 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -137,6 +137,22 @@ module.exports = {
 
   If set to `false`, the whitespaces between HTML tags in templates will be ignored.
 
+### compilerModules
+
+- type: `Array<ModuleOptions>`
+- default: `[]`
+
+  Configure `modules` options for `vue-template-compiler`, In about details, see more [`modules` option](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options) of `vue-template-compiler`.
+
+### compilerDirectives
+
+- type: `{ [tag: string]: Function }`
+- default: `{}` (v13.0.5+)
+
+  > version note: in v12.x, supported in v12.2.3+
+
+  Configure `directives` options for `vue-template-compiler`, In about details, see more [`directives` option](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options) of `vue-template-compiler`.
+
 ### transformToRequire
 
 - type: `{ [tag: string]: string | Array<string> }`
diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
index b35c8a221..12babb1ac 100644
--- a/docs/ja/SUMMARY.md
+++ b/docs/ja/SUMMARY.md
@@ -26,6 +26,8 @@
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
+  - [compilerModules](options.md#compilermodules)
+  - [compilerDirectives](options.md#compilerdirectives)
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
diff --git a/docs/ja/options.md b/docs/ja/options.md
index d5bc5f3f4..cd38ef9d6 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -132,10 +132,26 @@ module.exports = {
 ### preserveWhitespace
 
 - 型: `boolean`
-- デフォルトx: `true`
+- デフォルト: `true`
 
   もし `false` に設定されていたら、テンプレート内の HTML タグ間の空白は無視されます。
 
+### compilerModules
+
+- 型: `Array<ModuleOptions>`
+- デフォルト: `[]`
+
+  `vue-template-compiler` の `modules` オプションを設定します。詳細については `vue-template-compiler` の [`modules` option](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options) を参照してください。
+
+### compilerDirectives
+
+- 型: `{ [tag: string]: Function }`
+- デフォルト: `{}` (v13.0.5 以降)
+
+  > バージョンメモ: v12.x においては、v12.2.3 以降からサポートされます。
+
+  `vue-template-compiler` の `directives` オプションを設定します。詳細については `vue-template-compiler` の [`directives` option](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options) を参照してください。
+
 ### transformToRequire
 
 - 型: `{ [tag: string]: string | Array<string> }`
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index ce1e40328..16309ee32 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -23,6 +23,7 @@ module.exports = function (html) {
   var compilerOptions = {
     preserveWhitespace: options.preserveWhitespace,
     modules: defaultModules.concat(userModules || []),
+    directives: vueOptions.compilerDirectives || options.compilerDirectives || {},
     scopeId: options.hasScoped ? options.id : null,
     comments: options.hasComment
   }
diff --git a/test/fixtures/custom-directive.vue b/test/fixtures/custom-directive.vue
new file mode 100644
index 000000000..b11d74e33
--- /dev/null
+++ b/test/fixtures/custom-directive.vue
@@ -0,0 +1,3 @@
+<template>
+  <p v-i18n="keypath"></p>
+</template>
diff --git a/test/test.js b/test/test.js
index c5b56a0ff..ad5332b9b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -100,7 +100,7 @@ function mockRender (options, data) {
   }
   function e (text = '') {
     return {
-      text:  text,
+      text: text,
       isComment: true
     }
   }
@@ -899,6 +899,29 @@ describe('vue-loader', function () {
     })
   })
 
+  it('custom compiler directives', done => {
+    test({
+      entry: './test/fixtures/custom-directive.vue',
+      vue: {
+        compilerDirectives: {
+          i18n (el, dir) {
+            if (dir.name === 'i18n' && dir.value) {
+              el.i18n = dir.value
+              if (!el.props) {
+                el.props = []
+              }
+              el.props.push({ name: 'textContent', value: `_s(${JSON.stringify(dir.value)})` })
+            }
+          }
+        }
+      }
+    }, (window, module) => {
+      var vnode = mockRender(module)
+      expect(vnode.data.domProps.textContent).to.equal('keypath')
+      done()
+    })
+  })
+
   it('functional component with styles', done => {
     test({
       entry: './test/fixtures/functional-style.vue'

From 6b188983e34b0361dcff64739a906a596a7aa39e Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Fri, 22 Sep 2017 03:36:00 +0300
Subject: [PATCH 703/877] [RU] Translation update (#986)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка
---
 docs/ru/SUMMARY.md                       |  2 +
 docs/ru/configurations/pre-processors.md |  2 +-
 docs/ru/features/hot-reload.md           | 14 +++++
 docs/ru/features/scoped-css.md           | 66 ++++++++++++++----------
 docs/ru/options.md                       | 16 ++++++
 5 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index c4468f738..cc830c1a7 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -26,6 +26,8 @@
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
+  - [compilerModules](options.md#compilermodules)
+  - [compilerDirectives](options.md#compilerdirectives)
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
index dcad1fd36..1bb3be1bc 100644
--- a/docs/ru/configurations/pre-processors.md
+++ b/docs/ru/configurations/pre-processors.md
@@ -69,7 +69,7 @@ scss: generateLoaders('sass').concat(
 ),
 ```
 
-В этот файл рекомендуется включать только переменные, примеси и т.п., чтобы предотвратить дублирование CSS в финальных скомпилированных файлах. 
+В этот файл рекомендуется включать только переменные, примеси и т.п., чтобы предотвратить дублирование CSS в финальных скомпилированных файлах.
 
 ### JavaScript
 
diff --git a/docs/ru/features/hot-reload.md b/docs/ru/features/hot-reload.md
index 58844d5f5..66af67734 100644
--- a/docs/ru/features/hot-reload.md
+++ b/docs/ru/features/hot-reload.md
@@ -4,4 +4,18 @@
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
+## Правила сохранения текущего состояния компонента
+
+- При редактировании `<template>` компонента, экземпляры изменённого компонента будут повторно отрендерены, сохраняя всё текущее собственное состояние. Это возможно, потому что шаблоны компилируются в новые render-функции, которые не создают побочных эффектов.
+
+- При редактировании `<script>` компонента, экземпляры редактируемого компонента будут уничтожены и созданы заново (состояние других компонентов в приложении сохраняется). Это связано с тем, что `<script>` может включать в себя хуки жизненного цикла, которые могут создавать побочные эффекты, поэтому для обеспечения согласованности поведения требуется "перезагрузка", а не просто повторный рендеринг. Это также означает, что вам нужно быть осторожным в отношении глобальных побочных эффектов, таких как использование таймеров внутри хуков жизненного цикла компонентов. Иногда вам может потребоваться полная перезагрузка страницы, если ваш компонент создаёт глобальные побочные эффекты.
+
+- Горячая перезагрузка `<style>` работает самостоятельно через `vue-style-loader`, поэтому никак не затрагивает состояние приложения.
+
+## Использование
+
 При создании проекта с помощью `vue-cli`, горячая замена включена по умолчанию.
+
+При настройке проекта вручную горячая перезагрузка включится автоматически, когда вы запускаете ваш проект с помощью `webpack-dev-server --hot`.
+
+Продвинутые пользователи могут изучить [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api), который используется внутри `vue-loader`.
\ No newline at end of file
diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
index 4375a5607..660a07bca 100644
--- a/docs/ru/features/scoped-css.md
+++ b/docs/ru/features/scoped-css.md
@@ -28,40 +28,50 @@
 </template>
 ```
 
-#### Примечания
+#### Советы
 
-1. Вы можете использовать в компоненте локальные и глобальные стили одновременно:
+### Использование локальных и глобальных стилей
 
-  ``` html
-  <style>
-  /* глобальные стили */
-  </style>
+Вы можете сочетать использование в компоненте локальных и глобальных стили одновременно:
 
-  <style scoped>
-  /* локальные стили */
-  </style>
-  ```
+``` html
+<style>
+/* глобальные стили */
+</style>
+
+<style scoped>
+/* локальные стили */
+</style>
+```
+
+### Корневой узел дочернего компонента
+
+С помощью `scoped`, стили родительского компонента не будут влиять на содержимое дочерних компонентов. Тем не менее, корневой узел дочернего компонента будет зависеть как от scoped CSS из родительского элемента, так и от scoped CSS дочернего. Это предусмотрено специально, чтобы родительский элемент мог стилизовать корневой элемент дочернего компонента например для целей макета.
+
+### Глубокие селекторы
+
+Если вы хотите, чтобы селектор в `scoped` стилях был "глубоким", т.е. влиял на дочерние компоненты, вы можете использовать комбинатор `>>>`:
+
+``` html
+<style scoped>
+.a >>> .b { /* ... */ }
+</style>
+```
+
+Указанное выше будет скомпилировано в:
+
+``` css
+.a[data-v-f3f3eg9] .b { /* ... */ }
+```
 
-2. Корневой тег компонента потомка будет попадать под область видимости родительского локального CSS и своего локального CSS.
+Некоторые пре-процессоры, такие как SASS, не могут правильно обработать `>>>`. В таких случаях вы можете использовать комбинатор `/deep/` — это псевдоним для `>>>` работающий точно также.
 
-3. Partials не затрагиваются локальными стилями.
+### Динамически генерируемый контент
 
-4. **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](http://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
+DOM-содержимое, создаваемое с помощью `v-html` не попадает под область действия scoped-стилей, но вы всё равно можете его стилизовать воспользовавшись deep-селекторами.
 
-5. **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.
+### О чём следует помнить
 
-6. Если вам нужны вложенные селекторы в `scoped` стилях, вам нужно будет использовать оператор `>>>` для CSS и `/deep/` для `scss`:
+- **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](http://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
 
-  ``` html
-  <style scoped>
-  .a >>> .b {
-  
-  }
-  </style>
-  
-  <style lang="scss" scoped>
-  .a /deep/ .b {
-  
-  }
-  </style>
-  ```
\ No newline at end of file
+- **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.
\ No newline at end of file
diff --git a/docs/ru/options.md b/docs/ru/options.md
index 7b789383c..d39930d90 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -137,6 +137,22 @@ module.exports = {
 
   При установке в `false` пробельные символы между HTML тегами в шаблонах будут проигнорированы.
 
+### compilerModules
+
+- Тип: `Array<ModuleOptions>`
+- По умолчанию: `[]`
+
+  Настройка опции `modules` для `vue-template-compiler`. См. подробнее в документации `vue-template-compiler` [опция `modules`](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options).
+
+### compilerDirectives
+
+- Тип: `{ [tag: string]: Function }`
+- По умолчанию: `{}` (v13.0.5+)
+
+  > Примечание: в версиях v12.x поддержка добавлена с v12.2.3+
+
+  Настройка опции `directives` для `vue-template-compiler`. См. подробнее в документации `vue-template-compiler` [опция `directives`](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options).
+
 ### transformToRequire
 
 - Тип: `{ [tag: string]: string | Array<string> }`

From 5b1e1a591105a274d1f166c2f74d3c9ab7a90067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Tue, 26 Sep 2017 07:55:24 +0800
Subject: [PATCH 704/877] [zh-cn] synced recent updates from en (#989)

* Synced recent updates from en.

* [zh-cn] finished translation of recent updates

* [zh-cn] http -> https

* [zh-cn] fixed some syntax and format
---
 docs/zh-cn/README.md                        |  8 +--
 docs/zh-cn/SUMMARY.md                       | 11 ++++
 docs/zh-cn/configurations/advanced.md       | 17 +++--
 docs/zh-cn/configurations/asset-url.md      |  6 +-
 docs/zh-cn/configurations/custom-blocks.md  | 70 ++++++++++++++++++++-
 docs/zh-cn/configurations/pre-processors.md | 12 ++--
 docs/zh-cn/features/css-modules.md          |  4 +-
 docs/zh-cn/features/es2015.md               |  6 +-
 docs/zh-cn/features/postcss.md              |  4 +-
 docs/zh-cn/features/scoped-css.md           | 20 +++++-
 docs/zh-cn/options.md                       | 37 ++++++-----
 docs/zh-cn/start/spec.md                    | 20 +++---
 docs/zh-cn/workflow/linting.md              |  8 +--
 docs/zh-cn/workflow/production.md           |  2 +-
 docs/zh-cn/workflow/testing-with-mocks.md   |  6 +-
 docs/zh-cn/workflow/testing.md              | 10 +--
 16 files changed, 171 insertions(+), 70 deletions(-)

diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index f09fa22d2..775459aee 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -8,7 +8,7 @@
 
 这里有一些 `vue-loader` 提供的很酷的特性：
 
-- ES2015 默认支持;
+- ES2015 默认支持；
 - 允许对 Vue 组件的组成部分使用其它 Webpack loaders，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
 - `.vue` 文件中允许自定义节点，然后使用自定义的 loader 处理他们；
 - 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 Webpack loaders 进行处理；
@@ -19,11 +19,11 @@
 
 ### Webpack 是什么?
 
-如果你已经熟悉了 Webpack，随时可以跳过下面的说明。如果你没有使用过 Webpack,下面是一个快速介绍：
+如果你已经熟悉了 Webpack，随时可以跳过下面的说明。如果你没有使用过 Webpack，下面是一个快速介绍：
 
-[Webpack](http://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出他们的依赖关系，将它们打包为可部署的静态资源。
+[Webpack](https://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出他们的依赖关系，将它们打包为可部署的静态资源。
 
-![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
 一个基本的例子，想像我们有一些 CommonJS 模块，它不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过`<script>` 标签加载。Webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
 
diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index 6aa5eb440..12fa66686 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -19,3 +19,14 @@
   - [测试](workflow/testing.md)
   - [使用 Mock 测试](workflow/testing-with-mocks.md)
 - [选项参考](options.md)
+  - [loaders](options.md#loaders)
+  - [preLoaders](options.md#preloaders)
+  - [postLoaders](options.md#postloaders)
+  - [postcss](options.md#postcss)
+  - [cssSourceMap](options.md#csssourcemap)
+  - [esModule](options.md#esmodule)
+  - [preserveWhitespace](options.md#preservewhitespace)
+  - [transformToRequire](options.md#transformtorequire)
+  - [buble](options.md#buble)
+  - [extractCSS](options.md#extractcss)
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index b4f066a9e..79c7222c4 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -10,7 +10,7 @@
 
 为此，请指定 `vue-loader` 的 `loaders` 选项：
 
-> 注意 `preLoaders` 和 `postLoaders` 只在版本 >=10.3.0 支持
+> 注意 `preLoaders` 和 `postLoaders` 只在 10.3.0+ 版本支持
 
 ### Webpack 2.x
 
@@ -18,26 +18,25 @@
 module.exports = {
   // other options...
   module: {
-    // module.rules 与 1.x中的 module.loaders 相同
+    // module.rules 与 1.x 中的 module.loaders 相同
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          // `loaders` 覆盖默认 loaders.
-          // 以下配置会导致所有的 <script> 标签 "lang" 属性失效。
-          // attribute to be loaded with coffee-loader
+          // `loaders` 覆盖默认 loaders。
+          // 以下配置会导致所有无 "lang" 特性的 <script> 标签加载 coffee-loader
           loaders: {
             js: 'coffee-loader'
           },
 
-          // `preLoaders` 会在默认 loaders 之前加载.
-          // 你可以用来预处理语言块 - 一个例子是用来处理构建时的 i18n
+          // `preLoaders` 会在默认 loaders 之前加载。
+          // 你可以用来预处理语言块——一个例子是用来处理构建时的 i18n
           preLoaders: {
             js: '/path/to/custom/loader'
           },
 
-          // `postLoaders` 会在默认 loaders 之后加载.
+          // `postLoaders` 会在默认 loaders 之后加载。
           //
           // - 对于 `html`, 默认 loader 返回会编译为 JavaScript 渲染函数
           //
@@ -78,4 +77,4 @@ module.exports = {
 }
 ```
 
-进阶配置更实际的用法是 [提取组件中的 CSS 到单个文件](./extract-css.md)。
+进阶配置更实际的用法是[提取组件中的 CSS 到单个文件](./extract-css.md)。
diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index a0ef574de..f0fdbe66e 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -1,8 +1,8 @@
 # 资源路径处理
 
-默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理你的样式和模版文件。在编译过程中，所有的资源路径例如 `<img src="...">`, `background: url(...)` 和 `@import` **会作为模块依赖**。
+默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理你的样式和模版文件。在编译过程中，所有的资源路径例如 `<img src="...">`、`background: url(...)` 和 `@import` **会作为模块依赖**。
 
-例如，`url(./image.png)` 会被转换为 `require('./image.png')`,
+例如，`url(./image.png)` 会被转换为 `require('./image.png')`，而
 
 ``` html
 <img src="../image.png">
@@ -20,4 +20,4 @@ createElement('img', { attrs: { src: require('../image.png') }})
 
 1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理你的图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，Webpack 将会在打包输出中自动重写文件路径为正确的URL。
 
-2. `url-loader` 允许你有条件将文件转换为内联的 base-64 URL（当文件小于给定的阈值），这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。
+2. `url-loader` 允许你有条件将文件转换为内联的 base-64 URL (当文件小于给定的阈值)，这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index 8b1d6f0de..dc50e87f5 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -4,10 +4,10 @@
 
 在 `.vue` 文件中，你可以自定义语言块。自定义块的内容将由 `vue-loader` 的 options 中的 `loader` 对象中指定的 loader 处理，然后被组件模块依赖。类似 [Loader 进阶配置](../configurations/advanced.md)中的配置，但使用的是标签名匹配，而不是 `lang` 属性。
 
-如果找到一个自定义块的 matching loader，该自定义块将被处理; 否则自定义块将被忽略。
+如果找到一个自定义块的 matching loader，该自定义块将被处理；否则自定义块将被忽略。
 另外，如果找到的 loader 返回一个函数，该函数将以 `* .vue` 文件的组件作为参数来调用。
 
-## 例子
+## 单个文档文件的例子
 
 这是提取自定义块 `<docs>` 的内容到单个 docs 文件中的例子：
 
@@ -66,3 +66,69 @@ module.exports = {
   ]
 }
 ```
+
+## 运行时可用的文档
+
+这里有一个向组件注入 `<docs>` 自定义块使其在运行时可用的例子。
+
+#### docs-loader.js
+
+为了使得自定义块内容被注入，我们需要一个自定义的 loader：
+
+``` js
+module.exports = function (source, map) {
+  this.callback(null, 'module.exports = function(Component) {Component.options.__docs = ' +
+    JSON.stringify(source) +
+    '}', map)
+}
+```
+
+#### webpack.config.js
+
+现在我们将为 `<docs>` 自定义块配置我们的 webpack 自定义 loader。
+
+``` js
+const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue',
+        options: {
+          loaders: {
+            'docs': docsLoader
+          }
+        }
+      }
+    ]
+  }
+}
+```
+
+#### component.vue
+
+现在我们可以在运行时访问已导入组件的 `<docs>` 块内容了。
+
+``` html
+<template>
+  <div>
+    <component-b />
+    <p>{{ docs }}</p>
+  </div>
+</template>
+
+<script>
+import componentB from 'componentB';
+
+export default = {
+  data () {
+    return {
+      docs: componentB.__docs
+    }
+  },
+  components: {componentB}
+}
+</script>
+```
diff --git a/docs/zh-cn/configurations/pre-processors.md b/docs/zh-cn/configurations/pre-processors.md
index c880499db..076d4df5d 100644
--- a/docs/zh-cn/configurations/pre-processors.md
+++ b/docs/zh-cn/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # 使用预处理器
 
-在 Webpack 中，所有的预处理器需要匹配对应的 loader。 `vue-loader` 允许你使用其它 Webpack loaders 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loaders。
+在 Webpack 中，所有的预处理器需要匹配对应的 loader。`vue-loader` 允许你使用其它 Webpack loaders 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loaders。
 
 ### CSS
 
@@ -35,7 +35,7 @@ npm install sass-loader node-sass --save-dev
 }
 ```
 
-如要获得更多关于 `vue-loader` 的配置信息，请查看 [Loader 进阶配置](./advanced.md) 章节。
+如要获得更多关于 `vue-loader` 的配置信息，请查看 [Loader 进阶配置](./advanced.md)章节。
 
 ### 加载一个全局设置文件
 
@@ -87,7 +87,7 @@ npm install coffee-loader --save-dev
 
 ### 模版
 
-模版的处理方式略有不同，因为大多数 Webpack 模版处理器（比如 `pug-loader`）会返回模版处理函数，而不是编译的 HTML 字符串，我们使用原始的 `pug` 替代 `pug-loader`:
+模版的处理方式略有不同，因为大多数 Webpack 模版处理器 (比如 `pug-loader`) 会返回模版处理函数，而不是编译的 HTML 字符串，我们使用原始的 `pug` 替代 `pug-loader`：
 
 ``` bash
 npm install pug --save-dev
@@ -100,11 +100,11 @@ div
 </template>
 ```
 
-> **重要:** 如果你使用 `vue-loader@<8.2.0`， 你还需要安装 `template-html-loader`。
+> **重要:** 如果你使用 `vue-loader@<8.2.0`，你还需要安装 `template-html-loader`。
 
 ### 行内 Loader Requests
 
-你可以在 `lang` 属性中使用 [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) ：
+你可以在 `lang` 属性中使用 [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction)：
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -112,4 +112,4 @@ div
 </style>
 ```
 
-但是，这使你的 Vue 组件只适用于 Webpack，不能与 Browserify and [vueify](https://github.com/vuejs/vueify) 一同使用。**如果你打算将你的 Vue 组件作为可重复使用的第三方组件，请避免使用这个语法。**
+但是，这使你的 Vue 组件只适用于 Webpack，不能与 Browserify 和 [vueify](https://github.com/vuejs/vueify) 一同使用。**如果你打算将你的 Vue 组件作为可重复使用的第三方组件，请避免使用这个语法。**
diff --git a/docs/zh-cn/features/css-modules.md b/docs/zh-cn/features/css-modules.md
index 24a689081..8789895a2 100644
--- a/docs/zh-cn/features/css-modules.md
+++ b/docs/zh-cn/features/css-modules.md
@@ -2,7 +2,7 @@
 
 > 需要 ^9.8.0
 
-[CSS 模块](https://github.com/css-modules/css-modules) 是一个用于模块化和组合 CSS的流行系统。`vue-loader` 提供了与 CSS 模块的一流集成，可以作为模拟 CSS 作用域的替代方案。
+[CSS 模块](https://github.com/css-modules/css-modules)是一个用于模块化和组合 CSS的流行系统。`vue-loader` 提供了与 CSS 模块的一流集成，可以作为模拟 CSS 作用域的替代方案。
 
 ### 使用
 
@@ -58,7 +58,7 @@ export default {
 </script>
 ```
 
-请参考 [CSS Modules spec](https://github.com/css-modules/css-modules) 了解更多详细信息 [global exceptions](https://github.com/css-modules/css-modules#exceptions) 和 [composition](https://github.com/css-modules/css-modules#composition).
+请参考 [CSS Modules spec](https://github.com/css-modules/css-modules) 了解更多诸如 [global exceptions](https://github.com/css-modules/css-modules#exceptions) 和 [composition](https://github.com/css-modules/css-modules#composition) 等详细信息。
 
 ### 自定义注入名称
 
diff --git a/docs/zh-cn/features/es2015.md b/docs/zh-cn/features/es2015.md
index 8c0184e1c..6bca7f0fd 100644
--- a/docs/zh-cn/features/es2015.md
+++ b/docs/zh-cn/features/es2015.md
@@ -22,11 +22,11 @@ export default {
 </script>
 ```
 
-我们使用 ES2015 的属性的简洁表示法去定义子组件，`{ ComponentA }` 是 `{ ComponentA: ComponentA }` 的简写，Vue 会自动的将 key 转换为`component-a`，所以你可以在 template 中使用 `<component-a>`.
+我们使用 ES2015 的属性的简洁表示法去定义子组件，`{ ComponentA }` 是 `{ ComponentA: ComponentA }` 的简写，Vue 会自动的将 key 转换为`component-a`，所以你可以在 template 中使用 `<component-a>`。
 
 ### 在 Templates 中使用 ES2015
 
-`.vue` 中的 `<template>` 会编译为 JavaScript 渲染函数，然后通过自定义构建的 [Buble](https://buble.surge.sh/guide/) 去支持 ES2015，这允许你使用[属性的简洁表示法](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-) 和 [属性名表达式](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)：
+`.vue` 中的 `<template>` 会编译为 JavaScript 渲染函数，然后通过自定义构建的 [Buble](https://buble.surge.sh/guide/) 去支持 ES2015，这允许你使用[属性的简洁表示法](https://buble.surge.sh/guide/#object-shorthand-methods-and-properties-transforms-concisemethodproperty-)和[属性名表达式](https://buble.surge.sh/guide/#computed-properties-transforms-computedproperty-)：
 
 ``` html
 <div :class="[{ active: active }, isButton ? prefix + '-button' : null]">
@@ -54,7 +54,7 @@ export default {
 </my-component>
 ```
 
-你还可以使用 [`buble` 选项](../options.md#buble) 自定义模板中支持的功能。
+你还可以使用 [`buble` 选项](../options.md#buble)自定义模板中支持的功能。
 
 ### 转换普通 `.js` 文件
 
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
index 175353824..6f951ab43 100644
--- a/docs/zh-cn/features/postcss.md
+++ b/docs/zh-cn/features/postcss.md
@@ -29,7 +29,7 @@ module.exports = {
 }
 ```
 
-Webpack 2.x 例子:
+Webpack 2.x 例子：
 
 ``` js
 // webpack.config.js
@@ -56,7 +56,7 @@ module.exports = {
 
 - 返回插件数组的函数；
 
-- 要传递给 PostCSS 处理器的包含 options 的对象。当你使用的 PostCSS 项目依赖自定义 `parser/stringifiers`时，这很有用：
+- 要传递给 PostCSS 处理器的包含 options 的对象。当你使用的 PostCSS 项目依赖自定义 parser/stringifiers 时，这很有用：
 
   ``` js
   postcss: {
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
index 237e0321e..945b07aa1 100644
--- a/docs/zh-cn/features/scoped-css.md
+++ b/docs/zh-cn/features/scoped-css.md
@@ -1,6 +1,6 @@
 # CSS 作用域
 
-当 `<style>` 标签有 `scoped` 属性时，它的 CSS 只作用于当前组件中的元素。 这类似于 Shadow DOM 中的样式封装。它有一些注意事项，但不需要任何 polyfills。 它通过使用 PostCSS 来实现以下转换：
+当 `<style>` 标签有 `scoped` 属性时，它的 CSS 只作用于当前组件中的元素。这类似于 Shadow DOM 中的样式封装。它有一些注意事项，但不需要任何 polyfills。它通过使用 PostCSS 来实现以下转换：
 
 ``` html
 <style scoped>
@@ -46,6 +46,22 @@
 
 3. Partials 不受作用域样式影响。
 
-4. **CSS 作用域不能代替 classes**。考虑到浏览器渲染各种 CSS 选择器的方式，当使用 scoped 时，`p { color: red }` 在作用域中会慢很多倍（即当与属性选择器组合时）。如果你使用 classes 或者 ids 代替，比如 `.example { color: red }`，这样几乎没有性能影响。[Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) 你可以测试它们的不同。
+4. **CSS 作用域不能代替 classes**。考虑到浏览器渲染各种 CSS 选择器的方式，当使用 scoped 时，`p { color: red }` 在作用域中会慢很多倍 (即当与属性选择器组合时)。如果你使用 classes 或者 ids 代替，比如 `.example { color: red }`，这样几乎没有性能影响。你可以在[这块试验田](https://stevesouders.com/efws/css-selectors/csscreate.php)测试它们的不同。
 
 5. **在递归组件中小心使用后代选择器!** 对于带有选择器 `.a .b` 的CSS 规则，如果元素 `.a` 包含递归子组件，所有的子组件中的 `.b` 会被匹配。
+
+6. 如果 `scoped` 样式中需要嵌套的选择器，你得在 CSS 中使用 `>>>` 操作符，且在 `scss` 中使用 `/deep/`：
+
+    ``` html
+    <style scoped>
+    .a >>> .b {
+
+    }
+    </style>
+
+    <style lang="scss" scoped>
+    .a /deep/ .b {
+
+    }
+    </style>
+    ```
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 6b79401da..8c31c240f 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -34,9 +34,9 @@ module.exports = {
 
 ### loaders
 
-- 类型： `{ [lang: string]: string }`
+- 类型：`{ [lang: string]: string }`
 
-  指定 Webpack loader 对象覆盖用于 `*.vue` 文件内的语言块的默认 loader。如果指定，该键对应于语言块的 `lang` 属性。 每种类型的默认 `lang` 是：
+  指定 Webpack loader 对象覆盖用于 `*.vue` 文件内的语言块的默认 loader。如果指定，该键对应于语言块的 `lang` 属性。每种类型的默认 `lang` 是：
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -63,15 +63,15 @@ module.exports = {
 
 ### preLoaders
 
-- 类型： `{ [lang: string]: string }`
-- 仅在 >=10.3.0 版本中支持
+- 类型：`{ [lang: string]: string }`
+- 仅在 10.3.0+ 版本中支持
 
   配置格式和 `loaders` 相同，但是 `preLoaders` 会在默认 loaders 之前处理。你可以用来预处理语言块 - 一个常见用例是用来处理构建时的 i18n。
 
 ### postLoaders
 
-- 类型： `{ [lang: string]: string }`
-- 仅在 >=10.3.0 版本中支持
+- 类型：`{ [lang: string]: string }`
+- 仅在 10.3.0+ 版本中支持
 
   配置格式和 `loaders` 相同，但是 `postLoaders` 会在默认 loaders 之后处理。你可以用来后处理语言块。注意这会有些复杂：
 
@@ -81,9 +81,9 @@ module.exports = {
 
 ### postcss
 
-> 注意： 在 >=11.0.0 版本中，推荐使用 PostCSS 配置文件代替. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+> 注意：在 11.0.0+ 版本中，推荐使用 PostCSS 配置文件代替。[用法和 `postcss-loader` 相同](https://github.com/postcss/postcss-loader#usage)。
 
-- 类型： `Array` or `Function` or `Object`
+- 类型：`Array` or `Function` or `Object`
 
 
   指定要应用于 `.vue` 文件中 CSS 的自定义 PostCSS 插件。如果使用函数，函数将使用相同的 loader 上下文调用，并返回一个插件数组。
@@ -141,18 +141,18 @@ module.exports = {
 - 类型: `{ [tag: string]: string | Array<string> }`
 - 默认值: `{ img: 'src', image: 'xlink:href' }`
 
-  在模版编译过程中，编译器可以将某些属性，如 `src` 路径，转换为 `require` 调用，以便目标资源可以由 Webpack 处理。 默认配置会转换 `<img>` 标签上的 `src` 属性和 SVG 的 `<image>` 标签上的 `xlink：href` 属性。
+  在模版编译过程中，编译器可以将某些属性，如 `src` 路径，转换为 `require` 调用，以便目标资源可以由 Webpack 处理。默认配置会转换 `<img>` 标签上的 `src` 属性和 SVG 的 `<image>` 标签上的 `xlink：href` 属性。
 
 ### buble
 
 - 类型: `Object`
 - 默认值: `{}`
 
-  配置 `buble-loader` 的选项（如果存在），并且 buble 编译传递模板渲染函数。
+  配置 `buble-loader` 的选项 (如果存在)，并且 buble 编译传递模板渲染函数。
 
   > 版本警告：在 9.x 版本中，模板表达式通过现在已经删除的 `templateBuble` 选项单独配置。
 
-  模板渲染函数编译支持一个特殊的变换 `stripWith`（默认启用），它删除生成的渲染函数中的 `with` 用法，使它们兼容严格模式。
+  模板渲染函数编译支持一个特殊的变换 `stripWith` (默认启用)，它删除生成的渲染函数中的 `with` 用法，使它们兼容严格模式。
 
   配置例子：
 
@@ -191,13 +191,13 @@ module.exports = {
 
 > 12.0.0 新增
 
-使用 `extract-text-webpack-plugin` 自动提取 CSS。 适用于大多数预处理器，且也可在生产环境进行压缩。
+使用 `extract-text-webpack-plugin` 自动提取 CSS。适用于大多数预处理器，且也可在生产环境进行压缩。
 
-传入的值可以是 `true`，也可以是插件的一个实例（这样可以为多个提取的文件使用多个提取插件的实例）。
+传入的值可以是 `true`，也可以是插件的一个实例 (这样可以为多个提取的文件使用多个提取插件的实例)。
 
 这应当只用于生产环境，以便可以在开发过程中使用热重载。
 
-示例:
+示例：
 
 ``` js
 // webpack.config.js
@@ -247,3 +247,12 @@ module.exports = {
   ]
 }
 ```
+
+### optimizeSSR
+
+> 12.1.1 新增
+
+- 类型: `boolean`
+- 默认值: 当 webpack config 中包含 `target: 'node'` 且 `vue-template-compiler` 版本号大于等于 2.4.0 时为 `true`。
+
+开启 Vue 2.4 服务端渲染的编译优化之后，渲染函数将会把返回的 vdom 树的一部分编译为字符串，以提升服务端渲染的性能。在一些情况下，你可能想要明确的将其关掉，因为该渲染函数只能用于服务端渲染，而不能用于客户端渲染或测试环境。
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 7aa364f35..043bb0269 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -1,6 +1,6 @@
 # Vue 组件细则
 
-`.vue` 文件是一个自定义的文件类型，用类 HTML 语法描述一个 Vue 组件。每个 `.vue` 文件包含三种类型的顶级语言块 `<template>`, `<script>` 和 `<style>`，还允许添加可选的自定义块：
+`.vue` 文件是一个自定义的文件类型，用类 HTML 语法描述一个 Vue 组件。每个 `.vue` 文件包含三种类型的顶级语言块 `<template>`、`<script>` 和 `<style>`，还允许添加可选的自定义块：
 
 ``` html
 <template>
@@ -38,7 +38,7 @@ export default {
 </style>
 ```
 
-更多细节可以在 [预处理器](../configurations/pre-processors.md) 中找到。
+更多细节可以在[预处理器](../configurations/pre-processors.md)中找到。
 
 ### 语言块
 
@@ -52,23 +52,23 @@ export default {
 
 #### `<script>`
 
-- 默认语言：`js` (在检测到 `babel-loader` 或 `buble-loader` 配置时自动支持ES2015).
+- 默认语言：`js` (在检测到 `babel-loader` 或 `buble-loader` 配置时自动支持ES2015)。
 
 - 每个 `.vue` 文件最多包含一个 `<script>` 块
 
-- 该脚本在类 CommonJS 环境中执行（就像通过 Webpack 打包的正常 js 模块），这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
+- 该脚本在类 CommonJS 环境中执行 (就像通过 Webpack 打包的正常 js 模块)，这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
 
 - 脚本必须导出 Vue.js 组件对象。也可以导出由 `Vue.extend()` 创建的扩展对象，但是普通对象是更好的选择。
 
 #### `<style>`
 
-- 默认语言： `css`。
+- 默认语言：`css`。
 
 - 一个 `.vue` 文件可以包含多个 `<style>` 标签。
 
-- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md) 和 [CSS 模块](../features/css-modules.md)) 以帮助你将样式封装到当前组件。具有不同封装模式的多个 `<style>` 标签可以在同一个组件中混合使用。
+- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md)和 [CSS 模块](../features/css-modules.md)) 以帮助你将样式封装到当前组件。具有不同封装模式的多个 `<style>` 标签可以在同一个组件中混合使用。
 
-- 默认情况下，将会使用 `style-loader` 提取内容，并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md).
+- 默认情况下，将会使用 `style-loader` 提取内容，并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md)。
 
 ### 自定义块
 
@@ -76,7 +76,7 @@ export default {
 
 可以在 `.vue` 文件中添加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loaders 来应用在对应的块上。webpack loaders 需要在 `vue-loader` 的选项 `loaders` 中指定。
 
-更多细节，查看 [自定义块](../configurations/custom-blocks.md)。
+更多细节，查看[自定义块](../configurations/custom-blocks.md)。
 
 ### Src 导入
 
@@ -105,8 +105,8 @@ export default {
 ### 语法高亮
 
 
-目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 等)。 非常感谢其他编辑器/IDEs 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
+目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight)、[Atom](https://atom.io/packages/language-vue)、[Vim](https://github.com/posva/vim-vue)、[Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue)、[Brackets](https://github.com/pandao/brackets-vue) 和 [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm、PhpStorm 等)。非常感谢其他编辑器/IDEs 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
 
 ### 注释
 
-在语言块中使用该语言块对应的注释语法（HTML, CSS, JavaScript, Jade, 等）。顶层注释使用 HTML 注释语法：`<!-- comment contents here -->`
+在语言块中使用该语言块对应的注释语法 (HTML、CSS、JavaScript、Jade 等)。顶层注释使用 HTML 注释语法：`<!-- comment contents here -->`
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
index b5524aa16..80512aaec 100644
--- a/docs/zh-cn/workflow/linting.md
+++ b/docs/zh-cn/workflow/linting.md
@@ -1,6 +1,6 @@
 # 代码检验
 
-你可能有疑问，在 `.vue` 文件中你怎么检验你的代码，因为它不是 Javascript。我们假设你使用 [ESLint](http://eslint.org/) (如果你没有使用话，你应该去使用！)。
+你可能有疑问，在 `.vue` 文件中你怎么检验你的代码，因为它不是 Javascript。我们假设你使用 [ESLint](https://eslint.org/) (如果你没有使用话，你应该去使用！)。
 
 你还需要 [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) 来支持提取并检验你的 `.vue` 文件中的 JavaScript。
 
@@ -17,7 +17,7 @@
 eslint --ext js,vue MyComponent.vue
 ```
 
-别一种方法是使用 [eslint-loader](https://github.com/MoOx/eslint-loader),这样你的 `.vue` 文件会在开发期间每次保存时自动检验。
+别一种方法是使用 [eslint-loader](https://github.com/MoOx/eslint-loader)，这样你的 `.vue` 文件会在开发期间每次保存时自动检验。
 
 ``` bash
 npm install eslint eslint-loader --save-dev
@@ -40,7 +40,7 @@ module.exports = {
 
 注意 Webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
 
-我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 linting 配置到 Webpack 的  [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
+我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 linting 配置到 Webpack 的 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
 
 ``` js
 // webpack.config.js
@@ -66,7 +66,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2.x:
+For Webpack 2.x：
 
 ``` js
 // webpack.config.js
diff --git a/docs/zh-cn/workflow/production.md b/docs/zh-cn/workflow/production.md
index 83995287a..fc5118908 100644
--- a/docs/zh-cn/workflow/production.md
+++ b/docs/zh-cn/workflow/production.md
@@ -3,7 +3,7 @@
 生产环境打包要做两件事：
 
 1. 压缩应用代码；
-2. 使用 [Vue.js 指南 - 删除警告](https://cn.vuejs.org/v2/guide/deployment.html#删除警告) 去除 Vue.js 中的警告。
+2. 使用 [Vue.js 指南中描述的部署方式](https://cn.vuejs.org/v2/guide/deployment.html)去除 Vue.js 中的警告。
 
 下面是配置示例：
 
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
index baebcbd32..890892984 100644
--- a/docs/zh-cn/workflow/testing-with-mocks.md
+++ b/docs/zh-cn/workflow/testing-with-mocks.md
@@ -2,7 +2,7 @@
 
 在真实世界的应用中，我们的组件很有可能具有外部依赖。在为组件编写单元测试时，理想的状态是我们可以模拟这些外部依赖关系，这样我们的测试只依赖被测组件的行为。
 
-`vue-loader` 提供了一个可以使用 [inject-loader](https://github.com/plasticine/inject-loader) 将任意依赖项注入到 `*.vue` 组件的特性。 大体思路是：我们使用 `inject-loader` 为该模块创建一个 “模块工厂” 功能，而不是直接导入组件模块。当使用 mock 对象调用此函数时，它会返回模块的实例，并注入到 mock 中。
+`vue-loader` 提供了一个可以使用 [inject-loader](https://github.com/plasticine/inject-loader) 将任意依赖项注入到 `*.vue` 组件的特性。大体思路是：我们使用 `inject-loader` 为该模块创建一个 “模块工厂” 功能，而不是直接导入组件模块。当使用 mock 对象调用此函数时，它会返回模块的实例，并注入到 mock 中。
 
 假设我们有一个这样的组件：
 
@@ -39,9 +39,9 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-请注意 crazy require string - 我们在这里使用一些内联 [webpack loader requests](https://webpack.github.io/docs/loaders.html)。 简要解释：
+请注意 crazy require string - 我们在这里使用一些内联 [webpack loader requests](https://webpack.github.io/docs/loaders.html)。简要解释：
 
-- 以 `!!` 打头意味着 “禁用全局配置中的所有 loader”;
+- 以 `!!` 打头意味着 “禁用全局配置中的所有 loader”；
 - `vue?inject!`意思是 “使用 `vue` loader，并传入 `?inject` 查询”。这告诉 `vue-loader` 在依赖注入模式下编译组件。
 
 返回的 `ExampleInjector` 是一个工厂函数，可以调用它来创建 `example.vue` 模块的实例：
diff --git a/docs/zh-cn/workflow/testing.md b/docs/zh-cn/workflow/testing.md
index 53e9c7cdd..8c5bd5f9f 100644
--- a/docs/zh-cn/workflow/testing.md
+++ b/docs/zh-cn/workflow/testing.md
@@ -1,10 +1,10 @@
 # 测试
 
-> [webpack vue-cli 模板](https://github.com/vuejs-templates/webpack) 为你提供预配置的单元测试和 e2e 测试设置。
+> [webpack vue-cli 模板](https://github.com/vuejs-templates/webpack)为你提供预配置的单元测试和 e2e 测试设置。
 
-当测试 `*.vue` 文件时，我们不能使用基于 CommonJS 的简单测试运行器，因为它不知道如何处理 `*.vue` 文件。而是应该使用 Webpack + vue-loader 打包我们的测试文件。推荐的设置是使用 [Karma](http://karma-runner.github.io/0.13/index.html) 和  [karma-webpack](https://github.com/webpack/karma-webpack)。
+当测试 `*.vue` 文件时，我们不能使用基于 CommonJS 的简单测试运行器，因为它不知道如何处理 `*.vue` 文件。而是应该使用 Webpack + vue-loader 打包我们的测试文件。推荐的设置是使用 [Karma](https://karma-runner.github.io/0.13/index.html) 和 [karma-webpack](https://github.com/webpack/karma-webpack)。
 
-Karma 是一个启动浏览器并为你运行测试的测试运行器。你可以选择要测试的浏览器以及你要使用的测试框架（例如，Mocha 或  Jasmine）。以下是一个在 [PhantomJS](http://phantomjs.org/) 中使用[Jasmine](http://jasmine.github.io/edge/introduction.html) 测试框架运行测试的 Karma 配置示例：
+Karma 是一个启动浏览器并为你运行测试的测试运行器。你可以选择要测试的浏览器以及你要使用的测试框架 (例如 Mocha 或 Jasmine)。以下是一个在 [PhantomJS](http://phantomjs.org/) 中使用 [Jasmine](https://jasmine.github.io/edge/introduction.html) 测试框架运行测试的 Karma 配置示例：
 
 ``` bash
 npm install\
@@ -52,7 +52,7 @@ var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
 ```
 
-此入口文件只需要在同一文件夹中的 `.spec.js` 结尾引入其他所有文件。 现在我们可以写一些测试：
+此入口文件只需要在同一文件夹中的 `.spec.js` 结尾引入其他所有文件。现在我们可以写一些测试：
 
 ``` js
 // test/component-a.spec.js
@@ -97,4 +97,4 @@ describe('a.vue', function () {
 npm test
 ```
 
-此外，[webpack vue-cli 模板](https://github.com/vuejs-templates/webpack) 包含一个完整的测试用例。
+此外，[webpack vue-cli 模板](https://github.com/vuejs-templates/webpack)包含一个完整的测试用例。

From c39ba70ed9883073ec93e41c6a8e8ef06ab68f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Tue, 26 Sep 2017 07:56:18 +0800
Subject: [PATCH 705/877] [en] http -> https (#990)

---
 docs/en/README.md              | 4 ++--
 docs/en/features/scoped-css.md | 2 +-
 docs/en/workflow/linting.md    | 2 +-
 docs/en/workflow/testing.md    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/README.md b/docs/en/README.md
index ed4480e79..0250fa4a9 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -21,9 +21,9 @@ In a nutshell, the combination of Webpack and `vue-loader` gives you a modern, f
 
 If you are already familiar with Webpack, feel free to skip the following explanation. But for those of you who are new to Webpack, here's a quick intro:
 
-[Webpack](http://webpack.github.io/) is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
+[Webpack](https://webpack.github.io/) is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
 
-![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
 For a basic example, imagine we have a bunch of CommonJS modules. They cannot run directly inside the browser, so we need to "bundle" them into a single file that can be included via a `<script>` tag. Webpack can follow the dependencies of the `require()` calls and do that for us.
 
diff --git a/docs/en/features/scoped-css.md b/docs/en/features/scoped-css.md
index 4465c79b5..68d00b5c9 100644
--- a/docs/en/features/scoped-css.md
+++ b/docs/en/features/scoped-css.md
@@ -72,6 +72,6 @@ DOM content created with `v-html` are not affected by scoped styles, but you can
 
 ### Also Keep in Mind
 
-- **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](http://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
+- **Scoped styles do not eliminate the need for classes**. Due to the way browsers render various CSS selectors, `p { color: red }` will be many times slower when scoped (i.e. when combined with an attribute selector). If you use classes or ids instead, such as in `.example { color: red }`, then you virtually eliminate that performance hit. [Here's a playground](https://stevesouders.com/efws/css-selectors/csscreate.php) where you can test the differences yourself.
 
 - **Be careful with descendant selectors in recursive components!** For a CSS rule with the selector `.a .b`, if the element that matches `.a` contains a recursive child component, then all `.b` in that child component will be matched by the rule.
diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index 0c077255e..d23cd01b7 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -1,6 +1,6 @@
 # Linting
 
-You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](http://eslint.org/) (if you are not, you should!).
+You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](https://eslint.org/) (if you are not, you should!).
 
 You will also need the [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) which supports extracting and linting the JavaScript inside `*.vue` files.
 
diff --git a/docs/en/workflow/testing.md b/docs/en/workflow/testing.md
index 514b9964c..b8ca599cd 100644
--- a/docs/en/workflow/testing.md
+++ b/docs/en/workflow/testing.md
@@ -2,9 +2,9 @@
 
 > The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
 
-When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](http://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](https://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
 
-Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](http://jasmine.github.io/edge/introduction.html) test framework:
+Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](https://jasmine.github.io/edge/introduction.html) test framework:
 
 ``` bash
 npm install\

From 56cacda4b260ef3a8f275916816a4ecd71f72b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Tue, 26 Sep 2017 16:36:00 +0800
Subject: [PATCH 706/877] [en] typos (#991)

---
 docs/en/features/scoped-css.md | 2 +-
 docs/en/options.md             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/features/scoped-css.md b/docs/en/features/scoped-css.md
index 68d00b5c9..35e91ad82 100644
--- a/docs/en/features/scoped-css.md
+++ b/docs/en/features/scoped-css.md
@@ -46,7 +46,7 @@ You can include both scoped and non-scoped styles in the same component:
 
 ### Child Component Root Elements
 
-With `scoped`, the parent component's styles will not leak into child components. However, a child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS. This is by design so that the the parent can style the child root element for layout purposes.
+With `scoped`, the parent component's styles will not leak into child components. However, a child component's root node will be affected by both the parent's scoped CSS and the child's scoped CSS. This is by design so that the parent can style the child root element for layout purposes.
 
 ### Deep Selectors
 
diff --git a/docs/en/options.md b/docs/en/options.md
index 519d931d2..fde81e4e2 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -142,7 +142,7 @@ module.exports = {
 - type: `Array<ModuleOptions>`
 - default: `[]`
 
-  Configure `modules` options for `vue-template-compiler`, In about details, see more [`modules` option](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options) of `vue-template-compiler`.
+  Configure `modules` options for `vue-template-compiler`. In about details, see more [`modules` option](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options) of `vue-template-compiler`.
 
 ### compilerDirectives
 

From c316cd59fd3f05492f0f84792919641d9e3092f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Tue, 26 Sep 2017 17:07:29 +0800
Subject: [PATCH 707/877] [zh-cn] typos & improvements in #989 (#992)

---
 docs/zh-cn/README.md                        | 14 +++++++-------
 docs/zh-cn/SUMMARY.md                       |  2 +-
 docs/zh-cn/configurations/asset-url.md      |  4 ++--
 docs/zh-cn/configurations/custom-blocks.md  |  2 +-
 docs/zh-cn/configurations/pre-processors.md |  4 ++--
 docs/zh-cn/features/css-modules.md          | 10 +++++-----
 docs/zh-cn/features/scoped-css.md           |  2 +-
 docs/zh-cn/options.md                       |  2 +-
 docs/zh-cn/start/spec.md                    | 10 +++++-----
 docs/zh-cn/workflow/linting.md              |  4 ++--
 docs/zh-cn/workflow/testing-with-mocks.md   |  2 +-
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index 775459aee..be23ad2a6 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -8,10 +8,10 @@
 
 这里有一些 `vue-loader` 提供的很酷的特性：
 
-- ES2015 默认支持；
-- 允许对 Vue 组件的组成部分使用其它 Webpack loaders，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
-- `.vue` 文件中允许自定义节点，然后使用自定义的 loader 处理他们；
-- 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 Webpack loaders 进行处理；
+- 默认支持 ES2015；
+- 允许对 Vue 组件的组成部分使用其它 Webpack loader，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
+- `.vue` 文件中允许自定义节点，然后使用自定义的 loader 进行处理；
+- 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 Webpack loader 进行处理；
 - 对每个组件模拟出 CSS 作用域；
 - 支持开发期组件的热重载。
 
@@ -21,13 +21,13 @@
 
 如果你已经熟悉了 Webpack，随时可以跳过下面的说明。如果你没有使用过 Webpack，下面是一个快速介绍：
 
-[Webpack](https://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出他们的依赖关系，将它们打包为可部署的静态资源。
+[Webpack](https://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出它们的依赖关系，将它们打包为可部署的静态资源。
 
 ![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
-一个基本的例子，想像我们有一些 CommonJS 模块，它不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过`<script>` 标签加载。Webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
+一个基本的例子，想像我们有一些 CommonJS 模块，它们不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过 `<script>` 标签加载。Webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
 
-但是 Webpack 可以做的不止这些。使用 "loaders"，我们可以配置 Webpack 以任何方式去转换所有类型的文件。包括以下例子：
+但是 Webpack 可以做的不止这些。通过“loader”，我们可以配置 Webpack 以任何方式去转换所有类型的文件。包括以下例子：
 
 - 转换 ES2015，CoffeeScript 或者 TypeScript 模块为普通的 ES5 CommonJS 模块；
 - 可以选择在编译之前检验你的源代码；
diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index 12fa66686..6082b26bb 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -4,7 +4,7 @@
 - 特性
   - [ES2015](features/es2015.md)
   - [CSS 作用域](features/scoped-css.md)
-  - [CSS 模块](features/css-modules.md)
+  - [CSS Modules](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [热重载](features/hot-reload.md)
 - 配置
diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index f0fdbe66e..195731385 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -1,6 +1,6 @@
 # 资源路径处理
 
-默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理你的样式和模版文件。在编译过程中，所有的资源路径例如 `<img src="...">`、`background: url(...)` 和 `@import` **会作为模块依赖**。
+默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理样式和模版文件。在编译过程中，所有的资源路径例如 `<img src="...">`、`background: url(...)` 和 `@import` **会作为模块依赖**。
 
 例如，`url(./image.png)` 会被转换为 `require('./image.png')`，而
 
@@ -18,6 +18,6 @@ createElement('img', { attrs: { src: require('../image.png') }})
 
 使用它们的好处：
 
-1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理你的图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，Webpack 将会在打包输出中自动重写文件路径为正确的URL。
+1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，Webpack 将会在打包输出中自动重写文件路径为正确的URL。
 
 2. `url-loader` 允许你有条件将文件转换为内联的 base-64 URL (当文件小于给定的阈值)，这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index dc50e87f5..1d8431c70 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -4,7 +4,7 @@
 
 在 `.vue` 文件中，你可以自定义语言块。自定义块的内容将由 `vue-loader` 的 options 中的 `loader` 对象中指定的 loader 处理，然后被组件模块依赖。类似 [Loader 进阶配置](../configurations/advanced.md)中的配置，但使用的是标签名匹配，而不是 `lang` 属性。
 
-如果找到一个自定义块的 matching loader，该自定义块将被处理；否则自定义块将被忽略。
+如果找到一个与自定义块匹配的 loader，该自定义块将被处理；否则自定义块将被忽略。
 另外，如果找到的 loader 返回一个函数，该函数将以 `* .vue` 文件的组件作为参数来调用。
 
 ## 单个文档文件的例子
diff --git a/docs/zh-cn/configurations/pre-processors.md b/docs/zh-cn/configurations/pre-processors.md
index 076d4df5d..65e6a50b7 100644
--- a/docs/zh-cn/configurations/pre-processors.md
+++ b/docs/zh-cn/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # 使用预处理器
 
-在 Webpack 中，所有的预处理器需要匹配对应的 loader。`vue-loader` 允许你使用其它 Webpack loaders 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loaders。
+在 Webpack 中，所有的预处理器需要匹配对应的 loader。`vue-loader` 允许你使用其它 Webpack loader 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loader。
 
 ### CSS
 
@@ -35,7 +35,7 @@ npm install sass-loader node-sass --save-dev
 }
 ```
 
-如要获得更多关于 `vue-loader` 的配置信息，请查看 [Loader 进阶配置](./advanced.md)章节。
+如要获得更多关于 `vue-loader` 的配置信息，请查看 [loader 进阶配置](./advanced.md)章节。
 
 ### 加载一个全局设置文件
 
diff --git a/docs/zh-cn/features/css-modules.md b/docs/zh-cn/features/css-modules.md
index 8789895a2..d9f24be47 100644
--- a/docs/zh-cn/features/css-modules.md
+++ b/docs/zh-cn/features/css-modules.md
@@ -1,8 +1,8 @@
-# CSS 模块
+# CSS Modules
 
 > 需要 ^9.8.0
 
-[CSS 模块](https://github.com/css-modules/css-modules)是一个用于模块化和组合 CSS的流行系统。`vue-loader` 提供了与 CSS 模块的一流集成，可以作为模拟 CSS 作用域的替代方案。
+[CSS Modules](https://github.com/css-modules/css-modules)是一个用于模块化和组合 CSS 的流行系统。`vue-loader` 提供了与 CSS 模块的一流集成，可以作为模拟 CSS 作用域的替代方案。
 
 ### 使用
 
@@ -19,7 +19,7 @@
 </style>
 ```
 
-这将为 `css-loader` 打开 CSS 模块模式，生成的 CSS 对象将为组件注入一个名叫 `$style` 的计算属性，你可以在你的模块中使用动态 class 绑定：
+这将为 `css-loader` 打开 CSS Modules 模式，生成的 CSS 对象将为组件注入一个名叫 `$style` 的计算属性，你可以在你的模块中使用动态 class 绑定：
 
 ``` html
 <template>
@@ -58,7 +58,7 @@ export default {
 </script>
 ```
 
-请参考 [CSS Modules spec](https://github.com/css-modules/css-modules) 了解更多诸如 [global exceptions](https://github.com/css-modules/css-modules#exceptions) 和 [composition](https://github.com/css-modules/css-modules#composition) 等详细信息。
+请参考 [CSS Modules 规范](https://github.com/css-modules/css-modules)了解更多诸如 [global exception](https://github.com/css-modules/css-modules#exceptions) 和 [composition](https://github.com/css-modules/css-modules#composition) 等详细信息。
 
 ### 自定义注入名称
 
@@ -76,7 +76,7 @@ export default {
 
 ### 配置 `css-loader` Query
 
-CSS 模块处理是通过 [css-loader](https://github.com/webpack/css-loader)。默认 query 如下：
+CSS Modules 处理是通过 [css-loader](https://github.com/webpack/css-loader)。默认 query 如下：
 
 ``` js
 {
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
index 945b07aa1..d0fe49aa6 100644
--- a/docs/zh-cn/features/scoped-css.md
+++ b/docs/zh-cn/features/scoped-css.md
@@ -1,6 +1,6 @@
 # CSS 作用域
 
-当 `<style>` 标签有 `scoped` 属性时，它的 CSS 只作用于当前组件中的元素。这类似于 Shadow DOM 中的样式封装。它有一些注意事项，但不需要任何 polyfills。它通过使用 PostCSS 来实现以下转换：
+当 `<style>` 标签有 `scoped` 属性时，它的 CSS 只作用于当前组件中的元素。这类似于 Shadow DOM 中的样式封装。它有一些注意事项，但不需要任何 polyfill。它通过使用 PostCSS 来实现以下转换：
 
 ``` html
 <style scoped>
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 8c31c240f..eed23124a 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -253,6 +253,6 @@ module.exports = {
 > 12.1.1 新增
 
 - 类型: `boolean`
-- 默认值: 当 webpack config 中包含 `target: 'node'` 且 `vue-template-compiler` 版本号大于等于 2.4.0 时为 `true`。
+- 默认值: 当 webpack 配置中包含 `target: 'node'` 且 `vue-template-compiler` 版本号大于等于 2.4.0 时为 `true`。
 
 开启 Vue 2.4 服务端渲染的编译优化之后，渲染函数将会把返回的 vdom 树的一部分编译为字符串，以提升服务端渲染的性能。在一些情况下，你可能想要明确的将其关掉，因为该渲染函数只能用于服务端渲染，而不能用于客户端渲染或测试环境。
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 043bb0269..4bbd5e4f5 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -46,7 +46,7 @@ export default {
 
 - 默认语言：`html`。
 
-- 每个 `.vue` 文件最多包含一个 `<template>` 块
+- 每个 `.vue` 文件最多包含一个 `<template>` 块。
 
 - 内容将被提取为字符串，将编译并用作 Vue 组件的 `template` 选项。
 
@@ -54,7 +54,7 @@ export default {
 
 - 默认语言：`js` (在检测到 `babel-loader` 或 `buble-loader` 配置时自动支持ES2015)。
 
-- 每个 `.vue` 文件最多包含一个 `<script>` 块
+- 每个 `.vue` 文件最多包含一个 `<script>` 块。
 
 - 该脚本在类 CommonJS 环境中执行 (就像通过 Webpack 打包的正常 js 模块)，这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
 
@@ -66,7 +66,7 @@ export default {
 
 - 一个 `.vue` 文件可以包含多个 `<style>` 标签。
 
-- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md)和 [CSS 模块](../features/css-modules.md)) 以帮助你将样式封装到当前组件。具有不同封装模式的多个 `<style>` 标签可以在同一个组件中混合使用。
+- `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md)和 [CSS Modules](../features/css-modules.md)) 以帮助你将样式封装到当前组件。具有不同封装模式的多个 `<style>` 标签可以在同一个组件中混合使用。
 
 - 默认情况下，将会使用 `style-loader` 提取内容，并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md)。
 
@@ -74,7 +74,7 @@ export default {
 
 > 只在 vue-loader 10.2.0+ 中支持
 
-可以在 `.vue` 文件中添加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loaders 来应用在对应的块上。webpack loaders 需要在 `vue-loader` 的选项 `loaders` 中指定。
+可以在 `.vue` 文件中添加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loader 来应用在对应的块上。Webpack loader 需要在 `vue-loader` 的选项 `loaders` 中指定。
 
 更多细节，查看[自定义块](../configurations/custom-blocks.md)。
 
@@ -105,7 +105,7 @@ export default {
 ### 语法高亮
 
 
-目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight)、[Atom](https://atom.io/packages/language-vue)、[Vim](https://github.com/posva/vim-vue)、[Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue)、[Brackets](https://github.com/pandao/brackets-vue) 和 [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm、PhpStorm 等)。非常感谢其他编辑器/IDEs 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
+目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight)、[Atom](https://atom.io/packages/language-vue)、[Vim](https://github.com/posva/vim-vue)、[Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue)、[Brackets](https://github.com/pandao/brackets-vue) 和 [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm、PhpStorm 等)。非常感谢其他编辑器/IDE 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
 
 ### 注释
 
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
index 80512aaec..fabdeb190 100644
--- a/docs/zh-cn/workflow/linting.md
+++ b/docs/zh-cn/workflow/linting.md
@@ -1,6 +1,6 @@
 # 代码检验
 
-你可能有疑问，在 `.vue` 文件中你怎么检验你的代码，因为它不是 Javascript。我们假设你使用 [ESLint](https://eslint.org/) (如果你没有使用话，你应该去使用！)。
+你可能有疑问，在 `.vue` 文件中你怎么检验你的代码，因为它不是 JavaScript。我们假设你使用 [ESLint](https://eslint.org/) (如果你没有使用话，你应该去使用！)。
 
 你还需要 [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) 来支持提取并检验你的 `.vue` 文件中的 JavaScript。
 
@@ -40,7 +40,7 @@ module.exports = {
 
 注意 Webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
 
-我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 linting 配置到 Webpack 的 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
+我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 lint 配置到 Webpack 的 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
 
 ``` js
 // webpack.config.js
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
index 890892984..00a793013 100644
--- a/docs/zh-cn/workflow/testing-with-mocks.md
+++ b/docs/zh-cn/workflow/testing-with-mocks.md
@@ -39,7 +39,7 @@ npm install inject-loader@^2.0.0 --save-dev
 const ExampleInjector = require('!!vue?inject!./example.vue')
 ```
 
-请注意 crazy require string - 我们在这里使用一些内联 [webpack loader requests](https://webpack.github.io/docs/loaders.html)。简要解释：
+请注意那些超长的依赖字符串——也就是我们使用的一些内联 [webpack loader 依赖](https://webpack.github.io/docs/loaders.html)。简要解释一下：
 
 - 以 `!!` 打头意味着 “禁用全局配置中的所有 loader”；
 - `vue?inject!`意思是 “使用 `vue` loader，并传入 `?inject` 查询”。这告诉 `vue-loader` 在依赖注入模式下编译组件。

From 50dcf6573e73982942c3be13f38e610b313df450 Mon Sep 17 00:00:00 2001
From: tanasinn <genaxy@gmail.com>
Date: Wed, 27 Sep 2017 14:24:05 +0900
Subject: [PATCH 708/877] [ja] typos (#994)

---
 docs/ja/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
index 092a9a2ab..8ec36f226 100644
--- a/docs/ja/start/spec.md
+++ b/docs/ja/start/spec.md
@@ -51,7 +51,7 @@ export default {
 
 - デフォルトの言語は `js`（`babel-loader` や `buble-loader` が検出される場合、自動的にES2015がサポートされる）
 - それぞれの `*.vue` ファイルは最大で一つの `<script>` ブロックを含みます
-- スクリプトは CommonJS のように処理されます（ Webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `recuire()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます
+- スクリプトは CommonJS のように処理されます（ Webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `require()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます
 - スクリプトは Vue.js コンポーネントのオプションオブジェクトをエクスポートする必要があります。 `Vue.extend()` によって拡張されたコンストラクタもエクスポートすることが可能ですが、プレーンなオブジェクトが好ましいです
 
 #### `<style>`

From d21f35b638817e589c9613e46126e85f1e8e4e60 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Wed, 27 Sep 2017 14:12:34 +0300
Subject: [PATCH 709/877] [RU] Translation update (#995)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS
---
 docs/ru/README.md              | 4 ++--
 docs/ru/features/scoped-css.md | 2 +-
 docs/ru/workflow/linting.md    | 2 +-
 docs/ru/workflow/testing.md    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/ru/README.md b/docs/ru/README.md
index 4b8ddbde5..d131f849e 100644
--- a/docs/ru/README.md
+++ b/docs/ru/README.md
@@ -21,9 +21,9 @@
 
 Если вы уже знакомы с Webpack, можете пропустить дальнейшее объяснение. Для тех же, кому Webpack в новинку, вот краткая вводная:
 
-[Webpack](http://webpack.github.io/) – это сборщик модулей. Он берёт кучу файлов, рассматривая каждый как модуль, разрешает зависимости между ними и собирает их в статические ресурсы, готовые к развёртыванию.
+[Webpack](https://webpack.github.io/) – это сборщик модулей. Он берёт кучу файлов, рассматривая каждый как модуль, разрешает зависимости между ними и собирает их в статические ресурсы, готовые к развёртыванию.
 
-![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
 В качестве простого примера, представим, что у нас есть набор модулей CommonJS. Они не могут запускаться прямо в браузере, так что нам нужно "собрать" их в единый файл, который можно будет вставить на страницу через тег `<script>`. Webpack может сделать это за нас, следуя инструкциям `require()`.
 
diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
index 660a07bca..d77cbb992 100644
--- a/docs/ru/features/scoped-css.md
+++ b/docs/ru/features/scoped-css.md
@@ -72,6 +72,6 @@ DOM-содержимое, создаваемое с помощью `v-html` не
 
 ### О чём следует помнить
 
-- **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](http://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
+- **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](https://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
 
 - **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.
\ No newline at end of file
diff --git a/docs/ru/workflow/linting.md b/docs/ru/workflow/linting.md
index 028a117ff..085b3499a 100644
--- a/docs/ru/workflow/linting.md
+++ b/docs/ru/workflow/linting.md
@@ -1,6 +1,6 @@
 # Статические анализаторы
 
-Вы, возможно, гадаете, как же прогонять код в `*.vue` файлах через статические анализаторы, поскольку это не JavaScript. Мы предполагаем, что вы используете [ESLint](http://eslint.org/) (если нет, настоятельно рекомендуем!).
+Вы, возможно, гадаете, как же прогонять код в `*.vue` файлах через статические анализаторы, поскольку это не JavaScript. Мы предполагаем, что вы используете [ESLint](https://eslint.org/) (если нет, настоятельно рекомендуем!).
 
 Вам также понадобится [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) с поддержкой извлечения и анализа JavaScript в `*.vue` файлах.
 
diff --git a/docs/ru/workflow/testing.md b/docs/ru/workflow/testing.md
index e8bdf2090..5650b5de3 100644
--- a/docs/ru/workflow/testing.md
+++ b/docs/ru/workflow/testing.md
@@ -3,9 +3,9 @@
 
 > [Шаблон webpack vue-cli](https://github.com/vuejs-templates/webpack) предлагает вам готовые решения для модульного и e2e-тестирования.
 
-Тестируя `*.vue` файлы, мы не можем использовать обычные тестовые движки для CommonJS, поскольку они не знают, как обрабатывать `*.vue` файлы. Вместо этого мы снова воспользуемся Webpack + vue-loader для сборки наших тестов. Мы рекомендуем использовать сочетание [Karma](http://karma-runner.github.io/0.13/index.html) и [karma-webpack](https://github.com/webpack/karma-webpack).
+Тестируя `*.vue` файлы, мы не можем использовать обычные тестовые движки для CommonJS, поскольку они не знают, как обрабатывать `*.vue` файлы. Вместо этого мы снова воспользуемся Webpack + vue-loader для сборки наших тестов. Мы рекомендуем использовать сочетание [Karma](https://karma-runner.github.io/0.13/index.html) и [karma-webpack](https://github.com/webpack/karma-webpack).
 
-Karma – это тестовый движок, который запускает браузеры и прогоняет тесты за вас. Вы можете выбрать, в каких браузерах выполнять тесты и какой тестовый фреймворк использовать (например, Mocha или Jasmin). Вот пример конфигурации Karma для тестирования в [PhantomJS](http://phantomjs.org/) с помощью фреймворка [Jasmine](http://jasmine.github.io/edge/introduction.html):
+Karma – это тестовый движок, который запускает браузеры и прогоняет тесты за вас. Вы можете выбрать, в каких браузерах выполнять тесты и какой тестовый фреймворк использовать (например, Mocha или Jasmin). Вот пример конфигурации Karma для тестирования в [PhantomJS](http://phantomjs.org/) с помощью фреймворка [Jasmine](https://jasmine.github.io/edge/introduction.html):
 
 ``` bash
 npm install\

From eb748f2f2af3de7ce3a5b869e54605a36a3b59dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sun, 1 Oct 2017 16:38:54 +0800
Subject: [PATCH 710/877] [zh-cn] Sync en updates #db54537 -> #c39ba70 (#993)

* [zh-cn] sync recent updates from #db54537 to #c39ba70

* [zh-cn] synced recent updates (#db54537 to #c39ba70)

* [zh-cn] fixed some details
---
 docs/zh-cn/SUMMARY.md             |  2 +
 docs/zh-cn/features/hot-reload.md | 14 +++++++
 docs/zh-cn/features/scoped-css.md | 62 ++++++++++++++++++-------------
 docs/zh-cn/options.md             | 16 ++++++++
 4 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index 6082b26bb..7b9a44a95 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -26,6 +26,8 @@
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
+  - [compilerModules](options.md#compilermodules)
+  - [compilerDirectives](options.md#compilerdirectives)
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
diff --git a/docs/zh-cn/features/hot-reload.md b/docs/zh-cn/features/hot-reload.md
index 944d23923..1d5b8280f 100644
--- a/docs/zh-cn/features/hot-reload.md
+++ b/docs/zh-cn/features/hot-reload.md
@@ -4,4 +4,18 @@
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
+## 状态保留规则
+
+- 当编辑一个组件的 `<template>` 时，这个组件实例将就地重新渲染，并保留当前所有的私有状态。能够做到这一点是因为模板被编译成了新的无副作用的渲染函数。
+
+- 当编辑一个组件的 `<script>` 时，这个组件实例将就地销毁并重新创建。(应用中其它组件的状态将会被保留) 是因为 `<script>` 可能包含带有副作用的生命周期钩子，所以将“重新加载”替换为重新渲染是必须的，这样做可以确保组件行为的一致性。这也意味着，如果你的组件带有全局副作用，则整个页面将会被重新加载。
+
+- `<style>` 会通过 `vue-style-loader` 自行热重载，所以它不会影响应用的状态。
+
+## 用法
+
 当使用脚手架工具 `vue-cli` 时，热重载是开箱即用的。
+
+当手动设置你的工程时，热重载会在你启动 `webpack-dev-server --hot` 服务时自动开启。
+
+高阶用户可能希望移步 `vue-loader` 内部使用的 [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api) 继续查阅。
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
index d0fe49aa6..5ee171555 100644
--- a/docs/zh-cn/features/scoped-css.md
+++ b/docs/zh-cn/features/scoped-css.md
@@ -1,4 +1,4 @@
-# CSS 作用域
+# 有作用域的 CSS
 
 当 `<style>` 标签有 `scoped` 属性时，它的 CSS 只作用于当前组件中的元素。这类似于 Shadow DOM 中的样式封装。它有一些注意事项，但不需要任何 polyfill。它通过使用 PostCSS 来实现以下转换：
 
@@ -28,40 +28,50 @@
 </template>
 ```
 
-#### 注意
+## 注意
 
-1. 你可以在一个组件中同时使用 scoped 和 non-scoped styles
+### 混用本地和全局样式
 
-  ``` html
-  <style>
-  /* global styles */
-  </style>
+你可以在一个组件中同时使用有作用域和无作用域的样式：
 
-  <style scoped>
-  /* local styles */
-  </style>
-  ```
+``` html
+<style>
+/* 全局样式 */
+</style>
+
+<style scoped>
+/* 本地样式 */
+</style>
+```
+
+### 子组件的根元素
 
-2. 子组件的根节点将同时受父组件和子组件作用域 CSS 的影响。
+使用 `scoped` 后，父组件的样式将不会渗透到子组件中。不过一个子组件的根节点会同时受其父组件有作用域的 CSS 和子组件有作用域的 CSS 的影响。这样设计是为了让父组件可以从布局的角度出发，调整其子组件根元素的样式。
 
-3. Partials 不受作用域样式影响。
+### 深度作用选择器
 
-4. **CSS 作用域不能代替 classes**。考虑到浏览器渲染各种 CSS 选择器的方式，当使用 scoped 时，`p { color: red }` 在作用域中会慢很多倍 (即当与属性选择器组合时)。如果你使用 classes 或者 ids 代替，比如 `.example { color: red }`，这样几乎没有性能影响。你可以在[这块试验田](https://stevesouders.com/efws/css-selectors/csscreate.php)测试它们的不同。
+如果你希望 `scoped` 样式中的一个选择器能够作用得“更深”，例如影响子组件，你可以使用 `>>>` 操作符：
+
+``` html
+<style scoped>
+.a >>> .b { /* ... */ }
+</style>
+```
+
+上述代码将会编译成：
+
+``` css
+.a[data-v-f3f3eg9] .b { /* ... */ }
+```
 
-5. **在递归组件中小心使用后代选择器!** 对于带有选择器 `.a .b` 的CSS 规则，如果元素 `.a` 包含递归子组件，所有的子组件中的 `.b` 会被匹配。
+有些像 SASS 之类的预处理器无法正确解析 `>>>`。这种情况下你可以使用 `/deep/` 操作符取而代之——这是一个 `>>>` 的别名，同样可以正常工作。
 
-6. 如果 `scoped` 样式中需要嵌套的选择器，你得在 CSS 中使用 `>>>` 操作符，且在 `scss` 中使用 `/deep/`：
+### 动态生成的内容
 
-    ``` html
-    <style scoped>
-    .a >>> .b {
+通过 `v-html` 创建的 DOM 内容不受作用域内的样式影响，但是你仍然可以通过深度作用选择器来为他们设置样式。
 
-    }
-    </style>
+### 还有一些要留意
 
-    <style lang="scss" scoped>
-    .a /deep/ .b {
+- **CSS 作用域不能代替 class**。考虑到浏览器渲染各种 CSS 选择器的方式，当 `p { color: red }` 设置了作用域时 (即与特性选择器组合使用时) 会慢很多倍。如果你使用 class 或者 id 取而代之，比如 `.example { color: red }`，性能影响就会消除。你可以在[这块试验田](https://stevesouders.com/efws/css-selectors/csscreate.php)中测试它们的不同。
 
-    }
-    </style>
-    ```
+- **在递归组件中小心使用后代选择器!** 对选择器 `.a .b` 中的 CSS 规则来说，如果匹配 `.a` 的元素包含一个递归子组件，则所有的子组件中的 `.b` 都将被这个规则匹配。
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index eed23124a..65207f952 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -136,6 +136,22 @@ module.exports = {
 
   如果设置为 `false`，模版中 HTML 标签之前的空格将会被忽略。
 
+### compilerModules
+
+- 类型：`Array<ModuleOptions>`
+- 默认值：`[]`
+
+  为 `vue-template-compiler` 配置 `modules` 选项。相关细节请查阅 `vue-template-compiler` 的 [`modules` 选项](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options)。
+
+### compilerDirectives
+
+- 类型：`{ [tag: string]: Function }`
+- 默认值：`{}` (v13.0.5+)
+
+  > 版本说明：在 v12.x 中，从 v12.2.3+ 开始支持
+
+  为 `vue-template-compiler` 配置 `directives` 选项。相关细节请查阅 `vue-template-compiler` 的 [`modules` 选项](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options)。
+
 ### transformToRequire
 
 - 类型: `{ [tag: string]: string | Array<string> }`

From eea5c17e363e250587aa12288f77a661e35ace28 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 6 Oct 2017 10:23:31 -0400
Subject: [PATCH 711/877] bump theme

---
 package-lock.json | 943 +++++++++++++++++++++++++++++++++++++++++++++-
 package.json      |   5 +-
 2 files changed, 938 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5534d710..75d0ac976 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1331,6 +1331,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.2",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -2798,6 +2799,905 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
     "function-bind": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
@@ -2854,6 +3754,24 @@
         }
       }
     },
+    "gitbook-plugin-edit-link": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz",
+      "integrity": "sha1-2PzZJ+ztgeemYqctWdtgnq/X5y8=",
+      "dev": true
+    },
+    "gitbook-plugin-github": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gitbook-plugin-github/-/gitbook-plugin-github-3.0.0.tgz",
+      "integrity": "sha1-Z0V9+YpX6o75slGLiDQNs3ClMXs=",
+      "dev": true
+    },
+    "gitbook-plugin-theme-vuejs": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gitbook-plugin-theme-vuejs/-/gitbook-plugin-theme-vuejs-1.1.0.tgz",
+      "integrity": "sha512-PxFkLJdhowOP0hQhafSZ05sMegCpr1GSNnMe9RilXNB2Vz2XG2WtHITNGmemM4WpULLhWCT1WTqyLodwBwqFEA==",
+      "dev": true
+    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -4373,6 +5291,13 @@
       "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
       "dev": true
     },
+    "nan": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+      "dev": true,
+      "optional": true
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -7502,15 +8427,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -7522,6 +8438,15 @@
         "strip-ansi": "3.0.1"
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/package.json b/package.json
index d11d4b649..790695d16 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "lint:fix": "eslint lib test --fix",
     "precommit": "lint-staged",
     "test": "eslint lib && mocha --slow 5000 --timeout 10000",
-    "docs": "cd docs && gitbook serve",
+    "docs": "cd docs && gitbook install && gitbook serve",
     "docs:deploy": "bash ./docs/deploy.sh"
   },
   "lint-staged": {
@@ -72,6 +72,9 @@
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
+    "gitbook-plugin-edit-link": "^2.0.2",
+    "gitbook-plugin-github": "^3.0.0",
+    "gitbook-plugin-theme-vuejs": "^1.1.0",
     "husky": "^0.14.3",
     "inject-loader": "^3.0.1",
     "js-yaml": "^3.9.1",

From c8a016aa3a351233ee9dc609d3c690864a3978e4 Mon Sep 17 00:00:00 2001
From: Blake Newman <blake.newman@askattest.com>
Date: Tue, 22 Aug 2017 17:29:16 +0100
Subject: [PATCH 712/877] feat: (wip) support for functional template
 compilation

---
 lib/component-normalizer.js       |   8 +++
 lib/loader.js                     |  20 +++---
 lib/template-compiler/index.js    |  19 ++---
 test/fixtures/functional-root.vue |  18 +++++
 test/fixtures/functional.vue      |  22 ++++++
 test/test.js                      | 114 +++++++++++++++++-------------
 6 files changed, 133 insertions(+), 68 deletions(-)
 create mode 100644 test/fixtures/functional-root.vue
 create mode 100644 test/fixtures/functional.vue

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 12f2db170..d2549b95a 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -6,6 +6,7 @@
 module.exports = function normalizeComponent (
   rawScriptExports,
   compiledTemplate,
+  functionalTemplate,
   injectStyles,
   scopeId,
   moduleIdentifier /* server only */
@@ -29,6 +30,12 @@ module.exports = function normalizeComponent (
   if (compiledTemplate) {
     options.render = compiledTemplate.render
     options.staticRenderFns = compiledTemplate.staticRenderFns
+    options.compiled = true
+  }
+
+  // functional template
+  if (functionalTemplate) {
+    options.functional = true
   }
 
   // scopedId
@@ -69,6 +76,7 @@ module.exports = function normalizeComponent (
     var existing = functional
       ? options.render
       : options.beforeCreate
+
     if (!functional) {
       // inject component registration as beforeCreate hook
       options.beforeCreate = existing
diff --git a/lib/loader.js b/lib/loader.js
index d2ca23b33..590db4ddb 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -90,6 +90,10 @@ module.exports = function (content) {
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
   var hasComment = parts.template && parts.template.attrs && parts.template.attrs.comments
+  var functional = parts.template && parts.template.functional
+  var bubleTemplateOptions = Object.create(options.buble || {})
+  bubleTemplateOptions.transforms = Object.create(bubleTemplateOptions.transforms || {})
+  bubleTemplateOptions.transforms.stripWithFunctional = functional
 
   var templateCompilerOptions = '?' + JSON.stringify({
     id: moduleId,
@@ -97,7 +101,7 @@ module.exports = function (content) {
     hasComment: hasComment,
     transformToRequire: options.transformToRequire,
     preserveWhitespace: options.preserveWhitespace,
-    buble: options.buble,
+    buble: bubleTemplateOptions,
     // only pass compilerModules if it's a path string
     compilerModules: typeof options.compilerModules === 'string'
       ? options.compilerModules
@@ -261,6 +265,10 @@ module.exports = function (content) {
     output += 'var __vue_template__ = null\n'
   }
 
+  // template functional
+  output += '/* template functional */\n  '
+  output += 'var __vue_template_functional__ = ' + ((template && template.functional) ? 'true' : 'null') + '\n'
+
   // style
   output += '/* styles */\n'
   output += 'var __vue_styles__ = ' + (parts.styles.length ? 'injectStyle' : 'null') + '\n'
@@ -277,6 +285,7 @@ module.exports = function (content) {
   output += 'var Component = normalizeComponent(\n' +
     '  __vue_script__,\n' +
     '  __vue_template__,\n' +
+    '  __vue_template_functional__,\n' +
     '  __vue_styles__,\n' +
     '  __vue_scopeId__,\n' +
     '  __vue_module_identifier__\n' +
@@ -293,15 +302,6 @@ module.exports = function (content) {
       '})) {' +
         'console.error("named exports are not supported in *.vue files.")' +
       '}\n'
-    // check functional components used with templates
-    if (template) {
-      output +=
-        'if (Component.options.functional) {' +
-          'console.error("' +
-          '[vue-loader] ' + fileName + ': functional components are not ' +
-          'supported with templates, they should use render functions.' +
-        '")}\n'
-    }
   }
 
   // add requires for customBlocks
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 16309ee32..960360a38 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -52,9 +52,14 @@ module.exports = function (html) {
       : 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
     var bubleOptions = options.buble
+    var stripWithFunctional = bubleOptions.transforms.stripWithFunctional
+    var stripWith = bubleOptions.transforms.stripWith !== false
+
+    var staticRenderFns = compiled.staticRenderFns.map((fn) => toFunction(fn, stripWithFunctional))
+
     code = transpile(
-      'var render = ' + toFunction(compiled.render) + '\n' +
-      'var staticRenderFns = [' + compiled.staticRenderFns.map(toFunction).join(',') + ']',
+      'var render = ' + toFunction(compiled.render, stripWithFunctional) + '\n' +
+      'var staticRenderFns = [' + staticRenderFns.join(',') + ']',
       bubleOptions
     ) + '\n'
 
@@ -64,11 +69,7 @@ module.exports = function (html) {
     }
 
     // mark with stripped (this enables Vue to use correct runtime proxy detection)
-    if (!isProduction && (
-      !bubleOptions ||
-      !bubleOptions.transforms ||
-      bubleOptions.transforms.stripWith !== false
-    )) {
+    if (!isProduction && stripWith) {
       code += `render._withStripped = true\n`
     }
     var exports = `{ render: render, staticRenderFns: staticRenderFns }`
@@ -91,8 +92,8 @@ module.exports = function (html) {
   return code
 }
 
-function toFunction (code) {
-  return 'function () {' + code + '}'
+function toFunction (code, stripWithFunctional) {
+  return 'function (' + (stripWithFunctional ? '_h,_vm' : '') + ') {' + code + '}'
 }
 
 function pad (html) {
diff --git a/test/fixtures/functional-root.vue b/test/fixtures/functional-root.vue
new file mode 100644
index 000000000..e0612e0f1
--- /dev/null
+++ b/test/fixtures/functional-root.vue
@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <functional>
+      <span>hello</span>
+      <div slot="slot2">Second slot</div>
+      <template slot="scoped" scope="scope">{{ scope.msg }}</template>
+    </functional>
+  </div>
+</template>
+
+<script>
+import Functional from './functional.vue'
+export default {
+  components: {
+    Functional
+  }
+}
+</script>
diff --git a/test/fixtures/functional.vue b/test/fixtures/functional.vue
new file mode 100644
index 000000000..67a44b636
--- /dev/null
+++ b/test/fixtures/functional.vue
@@ -0,0 +1,22 @@
+<template functional>
+  <div>
+    <h2 class="red">{{ props.msg }}</h2>
+    <slot></slot>
+    <slot name="slot2"></slot>
+    <slot :msg="props.msg" name="scoped"></slot>
+    <div>Some <span>text</span></div>
+    <div v-if="false">Not exist</div>
+    <div class="clickable" @click="parent.fn"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    msg: {
+      type: String,
+      default: 'hello'
+    }
+  }
+}
+</script>
diff --git a/test/test.js b/test/test.js
index ad5332b9b..e529731f7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -8,6 +8,7 @@ var MemoryFS = require('memory-fs')
 var expect = require('chai').expect
 var hash = require('hash-sum')
 var SSR = require('vue-server-renderer')
+var Vue = require('vue/dist/vue.runtime.js')
 // var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
@@ -86,38 +87,10 @@ function test (options, assert) {
   })
 }
 
-function mockRender (options, data) {
-  function h (tag, data, children) {
-    if (Array.isArray(data)) {
-      children = data
-      data = null
-    }
-    return {
-      tag: tag,
-      data: data,
-      children: children
-    }
-  }
-  function e (text = '') {
-    return {
-      text: text,
-      isComment: true
-    }
-  }
-  return options.render.call(Object.assign({
-    _v (val) {
-      return val
-    },
-    _self: {},
-    _e: e,
-    $createElement: h,
-    _m (index) {
-      return options.staticRenderFns[index].call(this)
-    },
-    _s (str) {
-      return String(str)
-    }
-  }, data), h)
+function mockRender (options, data = {}) {
+  const vm = new Vue(Object.assign({}, options, { data () { return data } }))
+  vm.$mount()
+  return vm._vnode
 }
 
 function interopDefault (module) {
@@ -134,10 +107,11 @@ describe('vue-loader', function () {
       var vnode = mockRender(module, {
         msg: 'hi'
       })
+
       // <h2 class="red">{{msg}}</h2>
       expect(vnode.tag).to.equal('h2')
       expect(vnode.data.staticClass).to.equal('red')
-      expect(vnode.children[0]).to.equal('hi')
+      expect(vnode.children[0].text).to.equal('hi')
 
       expect(module.data().msg).to.contain('Hello from Component A!')
       var style = window.document.querySelector('style').textContent
@@ -222,11 +196,11 @@ describe('vue-loader', function () {
       //   <svg><template><p></p></template></svg>
       // </div>
       expect(vnode.children[0].tag).to.equal('div')
-      expect(vnode.children[1]).to.equal(' ')
+      expect(vnode.children[1].text).to.equal(' ')
       expect(vnode.children[2].tag).to.equal('p')
       expect(vnode.children[2].data.staticClass).to.equal('abc def')
-      expect(vnode.children[4][0].tag).to.equal('p')
-      expect(vnode.children[4][0].data.staticClass).to.equal('test')
+      expect(vnode.children[4].tag).to.equal('p')
+      expect(vnode.children[4].data.staticClass).to.equal('test')
 
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
@@ -264,7 +238,7 @@ describe('vue-loader', function () {
       var vnode = mockRender(module)
       // '<div><h1>hello</h1></div>'
       expect(vnode.children[0].tag).to.equal('h1')
-      expect(vnode.children[0].children[0]).to.equal('hello')
+      expect(vnode.children[0].children[0].text).to.equal('hello')
       done()
     })
   })
@@ -401,7 +375,7 @@ describe('vue-loader', function () {
       // <div class="msg">{{ msg }}</div>
       expect(vnode.tag).to.equal('div')
       expect(vnode.data.staticClass).to.equal('msg')
-      expect(vnode.children[0]).to.equal('Hello from mocked service!')
+      expect(vnode.children[0].text).to.equal('Hello from mocked service!')
       done()
     })
   })
@@ -522,7 +496,7 @@ describe('vue-loader', function () {
         msg: 'success'
       })
       expect(vnode.tag).to.equal('div')
-      expect(vnode.children[0]).to.equal('success')
+      expect(vnode.children[0].text).to.equal('success')
       expect(new Module().msg === 'success')
       done()
     })
@@ -541,7 +515,7 @@ describe('vue-loader', function () {
       })
       expect(vnode.tag).to.equal('h2')
       expect(vnode.data.staticClass).to.equal('red')
-      expect(vnode.children[0]).to.equal('hi')
+      expect(vnode.children[0].text).to.equal('hi')
 
       expect(rawModule.default.data().msg).to.contain('Hello from Component A!')
       done()
@@ -635,7 +609,7 @@ describe('vue-loader', function () {
       // <h2 id="-msg-">{{msg}}</h2>
       expect(vnode.tag).to.equal('h2')
       expect(vnode.data.attrs.id).to.equal('-msg-')
-      expect(vnode.children[0]).to.equal('hi')
+      expect(vnode.children[0].text).to.equal('hi')
       done()
     })
   })
@@ -816,7 +790,7 @@ describe('vue-loader', function () {
       // <h2 class="green">{{msg}}</h2>
       expect(vnode.tag).to.equal('h2')
       expect(vnode.data.staticClass).to.equal('green')
-      expect(vnode.children[0]).to.equal('hi')
+      expect(vnode.children[0].text).to.equal('hi')
 
       expect(module.data().msg).to.contain('Changed!')
       var style = window.document.querySelector('style').textContent
@@ -846,7 +820,7 @@ describe('vue-loader', function () {
         msg: JSON.parse(module.__i18n).en.hello,
         blog: module.__blog
       })
-      expect(vnode.children[0].children[0]).to.equal('hello world')
+      expect(vnode.children[0].children[0].text).to.equal('hello world')
       expect(vnode.children[2].data.domProps.innerHTML).to.equal('<h2 id="foo">foo</h2>')
       done()
     })
@@ -872,10 +846,10 @@ describe('vue-loader', function () {
     }, (window, module) => {
       var results = []
       // var vnode =
-      mockRender(module, {
-        $processStyle: style => results.push(style),
-        transform: 'translateX(10px)'
-      })
+      mockRender(
+        Object.assign(module, { methods: { $processStyle: style => results.push(style) }}),
+        { transform: 'translateX(10px)' }
+      )
       expect(results).to.deep.equal([
         { 'flex-direction': 'row' },
         { 'transform': 'translateX(10px)' }
@@ -931,7 +905,7 @@ describe('vue-loader', function () {
       // <div class="foo">hi</div>
       expect(vnode.tag).to.equal('div')
       expect(vnode.data.class).to.equal('foo')
-      expect(vnode.children[0]).to.equal('functional')
+      expect(vnode.children[0].text).to.equal('functional')
 
       var style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
@@ -951,10 +925,52 @@ describe('vue-loader', function () {
       expect(vnode.tag).to.equal('div')
       expect(vnode.children.length).to.equal(2)
       expect(vnode.children[0].data.staticClass).to.equal('red')
-      expect(vnode.children[0].children[0]).to.equal('hi')
+      expect(vnode.children[0].children[0].text).to.equal('hi')
       expect(vnode.children[1].isComment).to.true
       expect(vnode.children[1].text).to.equal(' comment here ')
       done()
     })
   })
+
+  // Vue required tests for more complete test cases
+  it('should allow functional template', done => {
+    test({
+      entry: './test/fixtures/functional-root.vue',
+      vue: {
+        preserveWhitespace: false
+      }
+    }, (window, module) => {
+      expect(module.components.Functional.compiled).to.equal(true)
+      expect(module.components.Functional.functional).to.equal(true)
+      expect(module.components.Functional.staticRenderFns).to.exist
+      expect(module.components.Functional.render).to.be.a('function')
+
+      const vnode = mockRender(module, {
+        fn () {
+          done()
+        }
+      }).children[0]
+
+      // Basic vnode
+      expect(vnode.children[0].data.staticClass).to.equal('red')
+      expect(vnode.children[0].children[0].text).to.equal('hello')
+      // Default slot vnode
+      expect(vnode.children[1].tag).to.equal('span')
+      expect(vnode.children[1].children[0].text).to.equal('hello')
+      // Named slot vnode
+      expect(vnode.children[2].tag).to.equal('div')
+      expect(vnode.children[2].children[0].text).to.equal('Second slot')
+      // // Scoped slot vnode
+      expect(vnode.children[3].text).to.equal('hello')
+      // // Static content vnode
+      expect(vnode.children[4].tag).to.equal('div')
+      expect(vnode.children[4].children[0].text).to.equal('Some ')
+      expect(vnode.children[4].children[1].tag).to.equal('span')
+      expect(vnode.children[4].children[1].children[0].text).to.equal('text')
+      // // v-if vnode
+      expect(vnode.children[5].text).to.equal('')
+
+      vnode.children[6].data.on.click()
+    })
+  })
 })

From 329eb194d938daca1dfea857ce2902b98519472d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 22:55:50 -0400
Subject: [PATCH 713/877] bump deps

---
 package-lock.json | 1788 ++++++++++++++++++++++++++-------------------
 package.json      |   14 +-
 2 files changed, 1054 insertions(+), 748 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75d0ac976..186e1456f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,15 +5,15 @@
   "requires": true,
   "dependencies": {
     "abab": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz",
-      "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
       "dev": true
     },
     "acorn": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz",
-      "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
+      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -242,9 +242,9 @@
       }
     },
     "assert-plus": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
     "assertion-error": {
@@ -281,10 +281,10 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000718",
+        "caniuse-db": "1.0.30000745",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -300,8 +300,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000718",
-            "electron-to-chromium": "1.3.18"
+            "caniuse-db": "1.0.30000745",
+            "electron-to-chromium": "1.3.24"
           }
         },
         "chalk": {
@@ -332,15 +332,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -355,9 +363,9 @@
       }
     },
     "aws-sign2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
       "dev": true
     },
     "aws4": {
@@ -421,7 +429,7 @@
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
         "convert-source-map": "1.5.0",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "json5": "0.5.1",
         "lodash": "4.17.4",
         "minimatch": "3.0.4",
@@ -429,6 +437,14 @@
         "private": "0.1.7",
         "slash": "1.0.0",
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "babel-generator": {
@@ -445,6 +461,14 @@
         "lodash": "4.17.4",
         "source-map": "0.5.7",
         "trim-right": "1.0.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "babel-helper-builder-binary-assignment-operator-visitor": {
@@ -939,7 +963,7 @@
         "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
         "babel-plugin-transform-exponentiation-operator": "6.24.1",
         "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "2.3.3",
+        "browserslist": "2.5.1",
         "invariant": "2.2.2",
         "semver": "5.4.1"
       }
@@ -952,11 +976,11 @@
       "requires": {
         "babel-core": "6.26.0",
         "babel-runtime": "6.26.0",
-        "core-js": "2.5.0",
+        "core-js": "2.5.1",
         "home-or-tmp": "2.0.0",
         "lodash": "4.17.4",
         "mkdirp": "0.5.1",
-        "source-map-support": "0.4.16"
+        "source-map-support": "0.4.18"
       }
     },
     "babel-runtime": {
@@ -965,7 +989,7 @@
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {
-        "core-js": "2.5.0",
+        "core-js": "2.5.1",
         "regenerator-runtime": "0.11.0"
       }
     },
@@ -993,7 +1017,7 @@
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "globals": "9.18.0",
         "invariant": "2.2.2",
         "lodash": "4.17.4"
@@ -1040,9 +1064,9 @@
       }
     },
     "big.js": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
-      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
     "binary-extensions": {
       "version": "1.10.0",
@@ -1051,9 +1075,9 @@
       "dev": true
     },
     "bluebird": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-      "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
     },
     "bn.js": {
       "version": "4.11.8",
@@ -1062,12 +1086,12 @@
       "dev": true
     },
     "boom": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "brace-expansion": {
@@ -1104,16 +1128,17 @@
       "dev": true
     },
     "browserify-aes": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
-      "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz",
+      "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==",
       "dev": true,
       "requires": {
         "buffer-xor": "1.0.3",
         "cipher-base": "1.0.4",
         "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.2",
-        "inherits": "2.0.3"
+        "evp_bytestokey": "1.0.3",
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "browserify-cipher": {
@@ -1122,9 +1147,9 @@
       "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.0.6",
+        "browserify-aes": "1.0.8",
         "browserify-des": "1.0.0",
-        "evp_bytestokey": "1.0.2"
+        "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
@@ -1173,13 +1198,13 @@
       }
     },
     "browserslist": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.3.3.tgz",
-      "integrity": "sha512-p9hz6FA2H1w1ZUAXKfK3MlIA4Z9fEd56hnZSOecBIITb5j0oZk/tZRwhdE0xG56RGx2x8cc1c5AWJKWVjMLOEQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.5.1.tgz",
+      "integrity": "sha512-jAvM2ku7YDJ+leAq3bFH1DE0Ylw+F+EQDq4GkqZfgPEqpWYw9ofQH85uKSB9r3Tv7XDbfqVtE+sdvKJW7IlPJA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000718",
-        "electron-to-chromium": "1.3.18"
+        "caniuse-lite": "1.0.30000745",
+        "electron-to-chromium": "1.3.24"
       }
     },
     "buffer": {
@@ -1239,7 +1264,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000718",
+        "caniuse-db": "1.0.30000745",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       },
@@ -1250,22 +1275,22 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000718",
-            "electron-to-chromium": "1.3.18"
+            "caniuse-db": "1.0.30000745",
+            "electron-to-chromium": "1.3.24"
           }
         }
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000718",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000718.tgz",
-      "integrity": "sha1-hs3ZeYcwJVSTTGHhBvTkcPFvmTw=",
+      "version": "1.0.30000745",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000745.tgz",
+      "integrity": "sha1-slmmFzej5IxPtLaxvETt6yZM1CI=",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz",
-      "integrity": "sha1-DdJCkL6xExCy2A9rcKgjwqZab60=",
+      "version": "1.0.30000745",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000745.tgz",
+      "integrity": "sha1-INb+3hFXpJNRM1ApRvx+DmuIDaU=",
       "dev": true
     },
     "caseless": {
@@ -1285,14 +1310,14 @@
       }
     },
     "chai": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.1.tgz",
-      "integrity": "sha1-ZuISeebzxkFf+CMYeCJ5AOIXGzk=",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
+      "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
       "dev": true,
       "requires": {
         "assertion-error": "1.0.2",
         "check-error": "1.0.2",
-        "deep-eql": "2.0.2",
+        "deep-eql": "3.0.1",
         "get-func-name": "2.0.0",
         "pathval": "1.1.0",
         "type-detect": "4.0.3"
@@ -1305,7 +1330,7 @@
       "requires": {
         "ansi-styles": "3.2.0",
         "escape-string-regexp": "1.0.5",
-        "supports-color": "4.2.1"
+        "supports-color": "4.4.0"
       }
     },
     "character-parser": {
@@ -1338,12 +1363,29 @@
         "is-glob": "2.0.1",
         "path-is-absolute": "1.0.1",
         "readdirp": "2.1.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "1.0.0"
+          }
+        }
       }
     },
     "ci-info": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz",
-      "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz",
+      "integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==",
       "dev": true
     },
     "cipher-base": {
@@ -1363,9 +1405,9 @@
       "dev": true
     },
     "clap": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz",
-      "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
+      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3"
@@ -1622,7 +1664,7 @@
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz",
       "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
       "requires": {
-        "bluebird": "3.5.0"
+        "bluebird": "3.5.1"
       }
     },
     "constantinople": {
@@ -1662,9 +1704,9 @@
       "dev": true
     },
     "core-js": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz",
-      "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
       "dev": true
     },
     "core-util-is": {
@@ -1679,19 +1721,12 @@
       "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
       "requires": {
         "is-directory": "0.3.1",
-        "js-yaml": "3.9.1",
+        "js-yaml": "3.10.0",
         "minimist": "1.2.0",
         "object-assign": "4.1.1",
         "os-homedir": "1.0.2",
         "parse-json": "2.2.0",
         "require-from-string": "1.2.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
       }
     },
     "create-ecdh": {
@@ -1713,7 +1748,7 @@
         "cipher-base": "1.0.4",
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
-        "sha.js": "2.4.8"
+        "sha.js": "2.4.9"
       }
     },
     "create-hmac": {
@@ -1727,7 +1762,7 @@
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.8"
+        "sha.js": "2.4.9"
       }
     },
     "cross-spawn": {
@@ -1742,12 +1777,23 @@
       }
     },
     "cryptiles": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
       "dev": true,
       "requires": {
-        "boom": "2.10.1"
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
       }
     },
     "crypto-browserify": {
@@ -1763,7 +1809,7 @@
         "create-hmac": "1.1.6",
         "diffie-hellman": "5.0.2",
         "inherits": "2.0.3",
-        "pbkdf2": "3.0.13",
+        "pbkdf2": "3.0.14",
         "public-encrypt": "4.0.0",
         "randombytes": "2.0.5"
       }
@@ -1775,9 +1821,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.5",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.5.tgz",
-      "integrity": "sha512-/FJmsDD8e6xZOBHMFShN/BCjnrEybq0spYaTZ1QoZ10/jhUa1LDDojQELu/JJ1ykZZjt0nSwkYrb2Mfx3bZx3Q==",
+      "version": "0.28.7",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
+      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -1787,7 +1833,7 @@
         "loader-utils": "1.1.0",
         "lodash.camelcase": "4.3.0",
         "object-assign": "4.1.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-modules-extract-imports": "1.1.0",
         "postcss-modules-local-by-default": "1.2.0",
         "postcss-modules-scope": "1.1.0",
@@ -1830,15 +1876,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -1875,7 +1929,7 @@
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
-            "regenerate": "1.3.2",
+            "regenerate": "1.3.3",
             "regjsgen": "0.2.0",
             "regjsparser": "0.1.5"
           }
@@ -1899,7 +1953,7 @@
         "defined": "1.0.0",
         "has": "1.0.1",
         "object-assign": "4.1.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-calc": "5.3.1",
         "postcss-colormin": "2.2.2",
         "postcss-convert-values": "2.6.1",
@@ -1962,15 +2016,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -1990,8 +2052,16 @@
       "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
       "dev": true,
       "requires": {
-        "clap": "1.2.0",
+        "clap": "1.2.3",
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "cssom": {
@@ -2015,7 +2085,7 @@
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.30"
+        "es5-ext": "0.10.31"
       }
     },
     "dashdash": {
@@ -2025,14 +2095,6 @@
       "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "date-fns": {
@@ -2054,9 +2116,9 @@
       "dev": true
     },
     "debug": {
-      "version": "2.6.8",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "requires": {
         "ms": "2.0.0"
@@ -2069,20 +2131,12 @@
       "dev": true
     },
     "deep-eql": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-2.0.2.tgz",
-      "integrity": "sha1-sbrAblbwp2d3aG1Qyf63XC7XZ5o=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
       "dev": true,
       "requires": {
-        "type-detect": "3.0.0"
-      },
-      "dependencies": {
-        "type-detect": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-3.0.0.tgz",
-          "integrity": "sha1-RtDMhVOrt7E6NSsNbeov1Y8tm1U=",
-          "dev": true
-        }
+        "type-detect": "4.0.3"
       }
     },
     "deep-is": {
@@ -2109,7 +2163,7 @@
         "object-assign": "4.1.1",
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.1"
+        "rimraf": "2.6.2"
       }
     },
     "delayed-stream": {
@@ -2138,9 +2192,9 @@
       }
     },
     "diff": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
+      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
       "dev": true
     },
     "diffie-hellman": {
@@ -2150,7 +2204,7 @@
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
-        "miller-rabin": "4.0.0",
+        "miller-rabin": "4.0.1",
         "randombytes": "2.0.5"
       }
     },
@@ -2230,9 +2284,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.18",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz",
-      "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw=",
+      "version": "1.3.24",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz",
+      "integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=",
       "dev": true
     },
     "elegant-spinner": {
@@ -2297,9 +2351,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.30",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz",
-      "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=",
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.31.tgz",
+      "integrity": "sha1-e7k4yVp/G59ygJLcCcQe3MOY7v4=",
       "dev": true,
       "requires": {
         "es6-iterator": "2.0.1",
@@ -2313,7 +2367,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.30",
+        "es5-ext": "0.10.31",
         "es6-symbol": "3.1.1"
       }
     },
@@ -2324,7 +2378,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.30",
+        "es5-ext": "0.10.31",
         "es6-iterator": "2.0.1",
         "es6-set": "0.1.5",
         "es6-symbol": "3.1.1",
@@ -2338,7 +2392,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.30",
+        "es5-ext": "0.10.31",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1",
         "event-emitter": "0.3.5"
@@ -2351,7 +2405,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.30"
+        "es5-ext": "0.10.31"
       }
     },
     "es6-weak-map": {
@@ -2361,7 +2415,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.30",
+        "es5-ext": "0.10.31",
         "es6-iterator": "2.0.1",
         "es6-symbol": "3.1.1"
       }
@@ -2372,39 +2426,30 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
+      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
       "dev": true,
       "requires": {
-        "esprima": "2.7.3",
-        "estraverse": "1.9.3",
+        "esprima": "3.1.3",
+        "estraverse": "4.2.0",
         "esutils": "2.0.2",
         "optionator": "0.8.2",
-        "source-map": "0.2.0"
+        "source-map": "0.5.7"
       },
       "dependencies": {
         "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
           "dev": true
         },
         "source-map": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
+          "optional": true
         }
       }
     },
@@ -2429,22 +2474,22 @@
         "babel-code-frame": "6.26.0",
         "chalk": "1.1.3",
         "concat-stream": "1.6.0",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "doctrine": "2.0.0",
         "escope": "3.6.0",
-        "espree": "3.5.0",
+        "espree": "3.5.1",
         "esquery": "1.0.0",
         "estraverse": "4.2.0",
         "esutils": "2.0.2",
         "file-entry-cache": "2.0.0",
         "glob": "7.1.2",
         "globals": "9.18.0",
-        "ignore": "3.3.4",
+        "ignore": "3.3.5",
         "imurmurhash": "0.1.4",
         "inquirer": "0.12.0",
         "is-my-json-valid": "2.16.1",
         "is-resolvable": "1.0.0",
-        "js-yaml": "3.9.1",
+        "js-yaml": "3.10.0",
         "json-stable-stringify": "1.0.1",
         "levn": "0.3.0",
         "lodash": "4.17.4",
@@ -2509,12 +2554,12 @@
       }
     },
     "espree": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.0.tgz",
-      "integrity": "sha1-mDWGJb3QVYYeon4oZ+pyn69GPY0=",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
+      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
       "dev": true,
       "requires": {
-        "acorn": "5.1.1",
+        "acorn": "5.1.2",
         "acorn-jsx": "3.0.1"
       }
     },
@@ -2561,7 +2606,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.30"
+        "es5-ext": "0.10.31"
       }
     },
     "events": {
@@ -2571,9 +2616,9 @@
       "dev": true
     },
     "evp_bytestokey": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.2.tgz",
-      "integrity": "sha512-ni0r0lrm7AOzsh2qC5mi9sj8S0gmj5fLNjfFpxN05FB4tAVZEKotbkjOtLPqTCX/CXT7NsUr6juZb4IFJeNNdA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
         "md5.js": "1.3.4",
@@ -2638,12 +2683,20 @@
       "dev": true,
       "requires": {
         "is-extglob": "1.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        }
       }
     },
     "extract-text-webpack-plugin": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz",
-      "integrity": "sha1-kMqnkHvESfM1AF46x1MrQbAN5hI=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.1.tgz",
+      "integrity": "sha512-zv0/Cg2mU8uMzeQQ3oyfJvZU4Iv/GbQYUIr/HU+8pZetT/0W3xj6XAbxoG4gsp8SbnYcFd4BOsCAZPl9NvplPw==",
       "dev": true,
       "requires": {
         "async": "2.5.0",
@@ -2692,17 +2745,18 @@
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
       "dev": true,
       "requires": {
-        "flat-cache": "1.2.2",
+        "flat-cache": "1.3.0",
         "object-assign": "4.1.1"
       }
     },
     "file-loader": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
-      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz",
+      "integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0"
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
       }
     },
     "filename-regex": {
@@ -2745,9 +2799,9 @@
       }
     },
     "flat-cache": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
-      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
       "dev": true,
       "requires": {
         "circular-json": "0.3.3",
@@ -2783,14 +2837,14 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
       "dev": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.5",
-        "mime-types": "2.1.16"
+        "mime-types": "2.1.17"
       }
     },
     "fs.realpath": {
@@ -3699,9 +3753,9 @@
       }
     },
     "function-bind": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
-      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
     "generate-function": {
@@ -3731,6 +3785,12 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
       "dev": true
     },
+    "get-own-enumerable-property-symbols": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz",
+      "integrity": "sha512-TtY/sbOemiMKPRUDDanGCSgBYe7Mf0vbRsWnBZ+9yghpZ1MvcpSpuZFjHdEeY/LZjZy0vdLjS77L6HosisFiug==",
+      "dev": true
+    },
     "get-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
@@ -3744,14 +3804,6 @@
       "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "gitbook-plugin-edit-link": {
@@ -3794,6 +3846,23 @@
       "requires": {
         "glob-parent": "2.0.0",
         "is-glob": "2.0.1"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "1.0.0"
+          }
+        }
       }
     },
     "glob-parent": {
@@ -3803,6 +3872,23 @@
       "dev": true,
       "requires": {
         "is-glob": "2.0.1"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "1.0.0"
+          }
+        }
       }
     },
     "globals": {
@@ -3838,25 +3924,39 @@
       "dev": true
     },
     "growl": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
+      "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
       "dev": true
     },
     "har-schema": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true
     },
     "har-validator": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "dev": true,
       "requires": {
-        "ajv": "4.11.8",
-        "har-schema": "1.0.5"
+        "ajv": "5.2.3",
+        "har-schema": "2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        }
       }
     },
     "has": {
@@ -3865,7 +3965,7 @@
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.0"
+        "function-bind": "1.1.1"
       }
     },
     "has-ansi": {
@@ -3907,15 +4007,15 @@
       }
     },
     "hawk": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
       "dev": true,
       "requires": {
-        "boom": "2.10.1",
-        "cryptiles": "2.0.5",
-        "hoek": "2.16.3",
-        "sntp": "1.0.9"
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.0.2"
       }
     },
     "he": {
@@ -3936,9 +4036,9 @@
       }
     },
     "hoek": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
       "dev": true
     },
     "home-or-tmp": {
@@ -3987,12 +4087,12 @@
       }
     },
     "http-signature": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "dev": true,
       "requires": {
-        "assert-plus": "0.2.0",
+        "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
         "sshpk": "1.13.1"
       }
@@ -4032,7 +4132,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.13"
       }
     },
     "ieee754": {
@@ -4042,9 +4142,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.4.tgz",
-      "integrity": "sha512-KjHyHxUgicfgFiTJaIA9DoeY3TIQz5thaKqm35re7RTVVB7zjF1fTMIDMXM4GUUBipR4FW8BvGnA115pZ/AxQQ==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
+      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
       "dev": true
     },
     "imurmurhash": {
@@ -4147,9 +4247,9 @@
       }
     },
     "interpret": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
+      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
       "dev": true
     },
     "invariant": {
@@ -4208,7 +4308,7 @@
       "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
       "dev": true,
       "requires": {
-        "ci-info": "1.0.0"
+        "ci-info": "1.1.1"
       }
     },
     "is-directory": {
@@ -4256,9 +4356,9 @@
       "dev": true
     },
     "is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
     "is-finite": {
@@ -4280,12 +4380,12 @@
       }
     },
     "is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "dev": true,
       "requires": {
-        "is-extglob": "1.0.0"
+        "is-extglob": "2.1.1"
       }
     },
     "is-my-json-valid": {
@@ -4309,6 +4409,12 @@
         "kind-of": "3.2.2"
       }
     },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
     "is-path-cwd": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -4372,6 +4478,12 @@
         "has": "1.0.1"
       }
     },
+    "is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
+      "dev": true
+    },
     "is-resolvable": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
@@ -4429,10 +4541,28 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jest-get-type": {
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz",
+      "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==",
+      "dev": true
+    },
+    "jest-validate": {
+      "version": "21.2.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-21.2.1.tgz",
+      "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.1.0",
+        "jest-get-type": "21.2.0",
+        "leven": "2.1.0",
+        "pretty-format": "21.2.1"
+      }
+    },
     "js-base64": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
-      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
+      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
       "dev": true
     },
     "js-stringify": {
@@ -4448,9 +4578,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz",
-      "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
       "requires": {
         "argparse": "1.0.9",
         "esprima": "4.0.0"
@@ -4469,21 +4599,21 @@
       "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=",
       "dev": true,
       "requires": {
-        "abab": "1.0.3",
+        "abab": "1.0.4",
         "acorn": "4.0.13",
         "acorn-globals": "3.1.0",
         "array-equal": "1.0.0",
         "content-type-parser": "1.0.1",
         "cssom": "0.3.2",
         "cssstyle": "0.2.37",
-        "escodegen": "1.8.1",
+        "escodegen": "1.9.0",
         "html-encoding-sniffer": "1.0.1",
-        "nwmatcher": "1.4.1",
+        "nwmatcher": "1.4.2",
         "parse5": "1.5.1",
-        "request": "2.81.0",
+        "request": "2.83.0",
         "sax": "1.2.4",
         "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "webidl-conversions": "4.0.2",
         "whatwg-encoding": "1.0.1",
         "whatwg-url": "4.8.0",
@@ -4537,12 +4667,6 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
-    },
     "json5": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
@@ -4570,14 +4694,6 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "jstransformer": {
@@ -4614,6 +4730,12 @@
         "invert-kv": "1.0.0"
       }
     },
+    "leven": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
+      "dev": true
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -4625,20 +4747,25 @@
       }
     },
     "lint-staged": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.0.4.tgz",
-      "integrity": "sha1-nKaWizDfv+gTZbenY81PSZKJZVM=",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.2.3.tgz",
+      "integrity": "sha512-Ks1vMyVpp3ldeFDN9sIcHcFDh0v3X6Y6LOdT0Wl86/BSDM2R8PVcuFODkh0Dav7Ni/asUPKONfXRWZM9YO85IQ==",
       "dev": true,
       "requires": {
         "app-root-path": "2.0.1",
+        "chalk": "2.1.0",
         "cosmiconfig": "1.1.0",
         "execa": "0.8.0",
+        "is-glob": "4.0.0",
+        "jest-validate": "21.2.1",
         "listr": "0.12.0",
-        "lodash.chunk": "4.2.0",
+        "lodash": "4.17.4",
+        "log-symbols": "2.1.0",
         "minimatch": "3.0.4",
         "npm-which": "3.0.1",
-        "p-map": "1.1.1",
-        "staged-git-files": "0.0.4"
+        "p-map": "1.2.0",
+        "staged-git-files": "0.0.4",
+        "stringify-object": "3.2.1"
       },
       "dependencies": {
         "cosmiconfig": {
@@ -4648,7 +4775,7 @@
           "dev": true,
           "requires": {
             "graceful-fs": "4.1.11",
-            "js-yaml": "3.9.1",
+            "js-yaml": "3.10.0",
             "minimist": "1.2.0",
             "object-assign": "4.1.1",
             "os-homedir": "1.0.2",
@@ -4656,12 +4783,6 @@
             "pinkie-promise": "2.0.1",
             "require-from-string": "1.2.1"
           }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
         }
       }
     },
@@ -4683,7 +4804,7 @@
         "log-symbols": "1.0.2",
         "log-update": "1.0.2",
         "ora": "0.2.3",
-        "p-map": "1.1.1",
+        "p-map": "1.2.0",
         "rxjs": "5.4.3",
         "stream-to-observable": "0.1.0",
         "strip-ansi": "3.0.1"
@@ -4708,6 +4829,15 @@
             "supports-color": "2.0.0"
           }
         },
+        "log-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+          "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3"
+          }
+        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -4763,6 +4893,15 @@
           "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
           "dev": true
         },
+        "log-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+          "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3"
+          }
+        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -4833,7 +4972,7 @@
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "requires": {
-        "big.js": "3.1.3",
+        "big.js": "3.2.0",
         "emojis-list": "2.1.0",
         "json5": "0.5.1"
       }
@@ -4854,40 +4993,6 @@
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
       "dev": true
     },
-    "lodash._baseassign": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-      "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "3.0.1",
-        "lodash.keys": "3.1.2"
-      }
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
-    },
-    "lodash._basecreate": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-      "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-      "dev": true
-    },
     "lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
@@ -4900,52 +5005,12 @@
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
       "dev": true
     },
-    "lodash.chunk": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz",
-      "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=",
-      "dev": true
-    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.create": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-      "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-      "dev": true,
-      "requires": {
-        "lodash._baseassign": "3.2.0",
-        "lodash._basecreate": "3.0.3",
-        "lodash._isiterateecall": "3.0.9"
-      }
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
-    },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "3.9.1",
-        "lodash.isarguments": "3.1.0",
-        "lodash.isarray": "3.0.4"
-      }
-    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -4978,45 +5043,18 @@
       "dev": true
     },
     "log-symbols": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
+      "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "2.1.0"
+      }
+    },
+    "log-update": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-      "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "log-update": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
-      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
       "dev": true,
       "requires": {
         "ansi-escapes": "1.4.0",
@@ -5133,9 +5171,24 @@
         "normalize-path": "2.1.1",
         "object.omit": "2.0.1",
         "parse-glob": "3.0.4",
-        "regex-cache": "0.4.3"
+        "regex-cache": "0.4.4"
       },
       "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "1.0.0"
+          }
+        },
         "normalize-path": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
@@ -5148,9 +5201,9 @@
       }
     },
     "miller-rabin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
-      "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -5158,24 +5211,24 @@
       }
     },
     "mime": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
-      "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
       "dev": true
     },
     "mime-db": {
-      "version": "1.29.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
-      "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
-      "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "dev": true,
       "requires": {
-        "mime-db": "1.29.0"
+        "mime-db": "1.30.0"
       }
     },
     "mimic-fn": {
@@ -5206,10 +5259,9 @@
       }
     },
     "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "mkdirp": {
       "version": "0.5.1",
@@ -5218,63 +5270,41 @@
       "dev": true,
       "requires": {
         "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
       }
     },
     "mocha": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz",
-      "integrity": "sha512-pIU2PJjrPYvYRqVpjXzj76qltO9uBYI7woYAMoxbSefsa+vqAfptjoeevd6bUgwD0mPIO+hv9f7ltvsNreL2PA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",
+      "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",
       "dev": true,
       "requires": {
         "browser-stdout": "1.3.0",
-        "commander": "2.9.0",
-        "debug": "2.6.8",
-        "diff": "3.2.0",
+        "commander": "2.11.0",
+        "debug": "3.1.0",
+        "diff": "3.3.1",
         "escape-string-regexp": "1.0.5",
-        "glob": "7.1.1",
-        "growl": "1.9.2",
-        "json3": "3.3.2",
-        "lodash.create": "3.1.1",
+        "glob": "7.1.2",
+        "growl": "1.10.3",
+        "he": "1.1.1",
         "mkdirp": "0.5.1",
-        "supports-color": "3.1.2"
+        "supports-color": "4.4.0"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": "1.0.1"
-          }
-        },
-        "glob": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-          "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-          "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "ms": "2.0.0"
           }
         }
       }
@@ -5433,9 +5463,9 @@
       "dev": true
     },
     "nwmatcher": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz",
-      "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.2.tgz",
+      "integrity": "sha512-QMkCGQFYp5p+zwU3INntLmz1HMfSx9dMVJMYKmE1yuSf/22Wjo6VPFa405mCLUuQn9lbQvH2DZN9lt10ZNvtAg==",
       "dev": true
     },
     "oauth-sign": {
@@ -5594,9 +5624,9 @@
       }
     },
     "p-map": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
-      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
     "pako": {
@@ -5612,10 +5642,10 @@
       "dev": true,
       "requires": {
         "asn1.js": "4.9.1",
-        "browserify-aes": "1.0.6",
+        "browserify-aes": "1.0.8",
         "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.2",
-        "pbkdf2": "3.0.13"
+        "evp_bytestokey": "1.0.3",
+        "pbkdf2": "3.0.14"
       }
     },
     "parse-glob": {
@@ -5628,6 +5658,23 @@
         "is-dotfile": "1.0.3",
         "is-extglob": "1.0.0",
         "is-glob": "2.0.1"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "1.0.0"
+          }
+        }
       }
     },
     "parse-json": {
@@ -5695,22 +5742,22 @@
       "dev": true
     },
     "pbkdf2": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz",
-      "integrity": "sha512-+dCHxDH+djNtjgWmvVC/my3SYBAKpKNqKSjLkp+GtWWYe4XPE+e/PSD2aCanlEZZnqPk2uekTKNC/ccbwd2X2Q==",
+      "version": "3.0.14",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
+      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
       "dev": true,
       "requires": {
         "create-hash": "1.1.3",
         "create-hmac": "1.1.6",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.8"
+        "sha.js": "2.4.9"
       }
     },
     "performance-now": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
     "pify": {
@@ -5750,13 +5797,20 @@
       "dev": true
     },
     "postcss": {
-      "version": "6.0.9",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-      "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
+      "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
       "requires": {
         "chalk": "2.1.0",
-        "source-map": "0.5.7",
-        "supports-color": "4.2.1"
+        "source-map": "0.6.1",
+        "supports-color": "4.4.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        }
       }
     },
     "postcss-calc": {
@@ -5765,7 +5819,7 @@
       "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-message-helpers": "2.0.0",
         "reduce-css-calc": "1.3.0"
       },
@@ -5804,15 +5858,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -5833,7 +5895,7 @@
       "dev": true,
       "requires": {
         "colormin": "1.1.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -5871,15 +5933,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -5899,7 +5969,7 @@
       "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -5937,15 +6007,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -5965,7 +6043,7 @@
       "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6002,15 +6080,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6030,7 +6116,7 @@
       "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6067,15 +6153,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6095,7 +6189,7 @@
       "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6132,15 +6226,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6160,7 +6262,7 @@
       "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6197,15 +6299,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6225,7 +6335,7 @@
       "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqs": "2.0.0"
       },
       "dependencies": {
@@ -6263,15 +6373,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6291,7 +6409,7 @@
       "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqid": "4.1.1"
       },
       "dependencies": {
@@ -6329,15 +6447,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6387,7 +6513,7 @@
       "dev": true,
       "requires": {
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -6425,15 +6551,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6453,7 +6587,7 @@
       "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6490,15 +6624,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6520,7 +6662,7 @@
       "requires": {
         "browserslist": "1.7.7",
         "caniuse-api": "1.6.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3",
         "vendors": "1.0.1"
       },
@@ -6537,8 +6679,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000718",
-            "electron-to-chromium": "1.3.18"
+            "caniuse-db": "1.0.30000745",
+            "electron-to-chromium": "1.3.24"
           }
         },
         "chalk": {
@@ -6569,15 +6711,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6604,7 +6754,7 @@
       "dev": true,
       "requires": {
         "object-assign": "4.1.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -6642,15 +6792,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6670,7 +6828,7 @@
       "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -6708,15 +6866,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6737,7 +6903,7 @@
       "dev": true,
       "requires": {
         "alphanum-sort": "1.0.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0",
         "uniqs": "2.0.0"
       },
@@ -6776,15 +6942,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6806,7 +6980,7 @@
       "requires": {
         "alphanum-sort": "1.0.2",
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3"
       },
       "dependencies": {
@@ -6844,15 +7018,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6872,7 +7054,7 @@
       "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.13"
       }
     },
     "postcss-modules-local-by-default": {
@@ -6882,7 +7064,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.13"
       }
     },
     "postcss-modules-scope": {
@@ -6892,7 +7074,7 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.13"
       }
     },
     "postcss-modules-values": {
@@ -6902,7 +7084,7 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.13"
       }
     },
     "postcss-normalize-charset": {
@@ -6911,7 +7093,7 @@
       "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6948,15 +7130,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -6978,7 +7168,7 @@
       "requires": {
         "is-absolute-url": "2.1.0",
         "normalize-url": "1.9.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -7016,15 +7206,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7044,7 +7242,7 @@
       "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -7082,15 +7280,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7110,7 +7316,7 @@
       "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -7148,15 +7354,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7176,7 +7390,7 @@
       "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
       "dev": true,
       "requires": {
-        "postcss": "5.2.17"
+        "postcss": "5.2.18"
       },
       "dependencies": {
         "ansi-styles": {
@@ -7213,15 +7427,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7242,7 +7464,7 @@
       "dev": true,
       "requires": {
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
@@ -7280,15 +7502,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7319,7 +7549,7 @@
       "dev": true,
       "requires": {
         "is-svg": "2.1.0",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0",
         "svgo": "0.7.2"
       },
@@ -7358,15 +7588,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7387,7 +7625,7 @@
       "dev": true,
       "requires": {
         "alphanum-sort": "1.0.2",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqs": "2.0.0"
       },
       "dependencies": {
@@ -7425,15 +7663,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7460,7 +7706,7 @@
       "dev": true,
       "requires": {
         "has": "1.0.1",
-        "postcss": "5.2.17",
+        "postcss": "5.2.18",
         "uniqs": "2.0.0"
       },
       "dependencies": {
@@ -7498,15 +7744,23 @@
           "dev": true
         },
         "postcss": {
-          "version": "5.2.17",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
-          "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
           "dev": true,
           "requires": {
             "chalk": "1.1.3",
-            "js-base64": "2.1.9",
+            "js-base64": "2.3.2",
             "source-map": "0.5.7",
             "supports-color": "3.2.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
           }
         },
         "supports-color": {
@@ -7539,9 +7793,27 @@
       "dev": true
     },
     "prettier": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.7.0.tgz",
-      "integrity": "sha512-kIbA3UE9sYGiVCxlWg92EOHWZqte6EAkC7DS5je6NaL8g3Uw1rWe0eH+UX4Hy5OEiR9aql2vVMHeg6lR4YGxYg=="
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.7.4.tgz",
+      "integrity": "sha1-XoYkrpNjyA+V7GRFhOzfVddPk/o="
+    },
+    "pretty-format": {
+      "version": "21.2.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-21.2.1.tgz",
+      "integrity": "sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "3.0.0",
+        "ansi-styles": "3.2.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        }
+      }
     },
     "private": {
       "version": "0.1.7",
@@ -7601,17 +7873,17 @@
       }
     },
     "pug": {
-      "version": "2.0.0-rc.3",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.3.tgz",
-      "integrity": "sha512-AGEWoQ6SHw7fNiaioEvAEelAYmFTvMTVAUxf4hUCLb5pb2HmN6yLGb/SwPFFaOiqSdxyxSmBVtL/I4VHOF9UPA==",
+      "version": "2.0.0-rc.4",
+      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz",
+      "integrity": "sha512-SL7xovj6E2Loq9N0UgV6ynjMLW4urTFY/L/Fprhvz13Xc5vjzkjZjI1QHKq31200+6PSD8PyU6MqrtCTJj6/XA==",
       "dev": true,
       "requires": {
-        "pug-code-gen": "1.1.1",
-        "pug-filters": "2.1.4",
+        "pug-code-gen": "2.0.0",
+        "pug-filters": "2.1.5",
         "pug-lexer": "3.1.0",
-        "pug-linker": "3.0.2",
-        "pug-load": "2.0.8",
-        "pug-parser": "3.0.1",
+        "pug-linker": "3.0.3",
+        "pug-load": "2.0.9",
+        "pug-parser": "4.0.0",
         "pug-runtime": "2.0.3",
         "pug-strip-comments": "1.0.2"
       }
@@ -7628,9 +7900,9 @@
       }
     },
     "pug-code-gen": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-1.1.1.tgz",
-      "integrity": "sha1-HPcnRO8qA56uajNAyqoRBYcSWOg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz",
+      "integrity": "sha512-E4oiJT+Jn5tyEIloj8dIJQognbiNNp0i0cAJmYtQTFS0soJ917nlIuFtqVss3IXMEyQKUew3F4gIkBpn18KbVg==",
       "dev": true,
       "requires": {
         "constantinople": "3.1.0",
@@ -7650,16 +7922,16 @@
       "dev": true
     },
     "pug-filters": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.4.tgz",
-      "integrity": "sha512-0irOV5M9VhvRBWFGIvkrDDRWnhFpRgedO+yYEKnosgcowTrEnXGhEY/ZXlPM858upi7MqH8ZMXeRz3yTfXEzzQ==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz",
+      "integrity": "sha512-xkw71KtrC4sxleKiq+cUlQzsiLn8pM5+vCgkChW2E6oNOzaqTSIBKIQ5cl4oheuDzvJYCTSYzRaVinMUrV4YLQ==",
       "dev": true,
       "requires": {
         "clean-css": "3.4.28",
         "constantinople": "3.1.0",
         "jstransformer": "1.0.0",
         "pug-error": "1.3.2",
-        "pug-walk": "1.1.4",
+        "pug-walk": "1.1.5",
         "resolve": "1.4.0",
         "uglify-js": "2.8.29"
       }
@@ -7694,29 +7966,29 @@
       }
     },
     "pug-linker": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.2.tgz",
-      "integrity": "sha512-8D+XJs5lF2batwEv7UtS0kSklX+k9HapU9UeBmCAJ+XP82idk8XIBu0aV+L5j8rupdyW3fdfKQ/tznMHvqEg6g==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz",
+      "integrity": "sha512-DCKczglCXOzJ1lr4xUj/lVHYvS+lGmR2+KTCjZjtIpdwaN7lNOoX2SW6KFX5X4ElvW+6ThwB+acSUg08UJFN5A==",
       "dev": true,
       "requires": {
         "pug-error": "1.3.2",
-        "pug-walk": "1.1.4"
+        "pug-walk": "1.1.5"
       }
     },
     "pug-load": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.8.tgz",
-      "integrity": "sha512-1T8GaRSyV4Oc3vEPuxB1VwHE4fpU2iYUK6gPLcxXPAiU1k9sYiuRWwBI2vra1oTTmpqwn1GiYFMg1jO74Eb2fA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz",
+      "integrity": "sha512-BDdZOCru4mg+1MiZwRQZh25+NTRo/R6/qArrdWIf308rHtWA5N9kpoUskRe4H6FslaQujC+DigH9LqlBA4gf6Q==",
       "dev": true,
       "requires": {
         "object-assign": "4.1.1",
-        "pug-walk": "1.1.4"
+        "pug-walk": "1.1.5"
       }
     },
     "pug-parser": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-3.0.1.tgz",
-      "integrity": "sha512-YNcfPtamkJ6Blgdev1keI1rK5UZ5TtYS4r1lZw1/lhFhyEVAwKtzOsv6aqxI0xBWfCia/vNWhdtdaqoMRB2jcQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz",
+      "integrity": "sha512-ocEUFPdLG9awwFj0sqi1uiZLNvfoodCMULZzkRqILryIWc/UUlDlxqrKhKjAIIGPX/1SNsvxy63+ayEGocGhQg==",
       "dev": true,
       "requires": {
         "pug-error": "1.3.2",
@@ -7739,9 +8011,9 @@
       }
     },
     "pug-walk": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.4.tgz",
-      "integrity": "sha512-29oDmQ4Z5nXJnaVQ/PTLdY3pRBCHcb1dvNhvVZ+c1bOv4cKRbwRD6mm0ZDVVzzZmSC8DctqbVtRgLzNJVQFHMw==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz",
+      "integrity": "sha512-rJlH1lXerCIAtImXBze3dtKq/ykZMA4rpO9FnPcIgsWcxZLOvd8zltaoeOVFyBSSqCkhhJWbEbTMga8UxWUUSA==",
       "dev": true
     },
     "punycode": {
@@ -7757,9 +8029,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
       "dev": true
     },
     "query-string": {
@@ -7945,9 +8217,9 @@
       }
     },
     "regenerate": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
-      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
       "dev": true
     },
     "regenerator-runtime": {
@@ -7968,13 +8240,12 @@
       }
     },
     "regex-cache": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
-      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
-        "is-equal-shallow": "0.1.3",
-        "is-primitive": "2.0.0"
+        "is-equal-shallow": "0.1.3"
       }
     },
     "regexpu-core": {
@@ -7983,7 +8254,7 @@
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
       "dev": true,
       "requires": {
-        "regenerate": "1.3.2",
+        "regenerate": "1.3.3",
         "regjsgen": "0.2.0",
         "regjsparser": "0.1.5"
       }
@@ -8039,31 +8310,31 @@
       }
     },
     "request": {
-      "version": "2.81.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
       "dev": true,
       "requires": {
-        "aws-sign2": "0.6.0",
+        "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
         "caseless": "0.12.0",
         "combined-stream": "1.0.5",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.1.4",
-        "har-validator": "4.2.1",
-        "hawk": "3.1.3",
-        "http-signature": "1.1.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.16",
+        "mime-types": "2.1.17",
         "oauth-sign": "0.8.2",
-        "performance-now": "0.2.0",
-        "qs": "6.4.0",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.2",
+        "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.1.0"
       }
@@ -8129,9 +8400,9 @@
       }
     },
     "rimraf": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "dev": true,
       "requires": {
         "glob": "7.1.2"
@@ -8189,13 +8460,13 @@
       "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
       "dev": true,
       "requires": {
-        "ajv": "5.2.2"
+        "ajv": "5.2.3"
       },
       "dependencies": {
         "ajv": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
           "dev": true,
           "requires": {
             "co": "4.6.0",
@@ -8237,12 +8508,13 @@
       "dev": true
     },
     "sha.js": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz",
-      "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=",
+      "version": "2.4.9",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
+      "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "shebang-command": {
@@ -8267,7 +8539,7 @@
       "dev": true,
       "requires": {
         "glob": "7.1.2",
-        "interpret": "1.0.3",
+        "interpret": "1.0.4",
         "rechoir": "0.6.2"
       }
     },
@@ -8299,12 +8571,12 @@
       "dev": true
     },
     "sntp": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
       "dev": true,
       "requires": {
-        "hoek": "2.16.3"
+        "hoek": "4.2.0"
       }
     },
     "sort-keys": {
@@ -8323,17 +8595,25 @@
       "dev": true
     },
     "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-support": {
-      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.16.tgz",
-      "integrity": "sha512-A6vlydY7H/ljr4L2UOhDSajQdZQ6dMD7cLH0pzwcmwLyc9u8PNI4WGtnfDDzX7uzGL6c/T+ORL97Zlh+S4iOrg==",
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "spdx-correct": {
@@ -8376,14 +8656,6 @@
         "getpass": "0.1.7",
         "jsbn": "0.1.1",
         "tweetnacl": "0.14.5"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "staged-git-files": {
@@ -8447,6 +8719,17 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "stringify-object": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.1.tgz",
+      "integrity": "sha512-jPcQYw/52HUPP8uOE4kkjxl5bB9LfHkKCTptIk3qw7ozP5XMIMlHMLjt00GGSwW6DJAf/njY5EU6Vpwl4LlBKQ==",
+      "dev": true,
+      "requires": {
+        "get-own-enumerable-property-symbols": "2.0.1",
+        "is-obj": "1.0.1",
+        "is-regexp": "1.0.0"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@@ -8493,7 +8776,7 @@
       "dev": true,
       "requires": {
         "css-parse": "1.7.0",
-        "debug": "2.6.8",
+        "debug": "2.6.9",
         "glob": "7.0.6",
         "mkdirp": "0.5.1",
         "sax": "0.5.8",
@@ -8548,13 +8831,13 @@
       "integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.13"
       }
     },
     "supports-color": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-      "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
+      "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
       "requires": {
         "has-flag": "2.0.0"
       }
@@ -8724,9 +9007,9 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
       "dev": true,
       "requires": {
         "punycode": "1.4.1"
@@ -8802,6 +9085,14 @@
         "source-map": "0.5.7",
         "uglify-to-browserify": "1.0.2",
         "yargs": "3.10.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "uglify-to-browserify": {
@@ -8820,6 +9111,14 @@
         "source-map": "0.5.7",
         "uglify-js": "2.8.29",
         "webpack-sources": "1.0.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "uniq": {
@@ -8861,13 +9160,14 @@
       }
     },
     "url-loader": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
-      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
+      "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "mime": "1.3.6"
+        "mime": "1.4.1",
+        "schema-utils": "0.3.0"
       }
     },
     "user-home": {
@@ -8933,14 +9233,6 @@
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "1.3.0"
-      },
-      "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
-        }
       }
     },
     "vm-browserify": {
@@ -8959,20 +9251,20 @@
       "dev": true
     },
     "vue": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.2.tgz",
-      "integrity": "sha512-GB5r+CsrCHIB1PoXt4wgBienjF3WGYOIaTK27tDk96sZxpL5RwRrsi9I3ECwFt8x8qAmxT2xk1vsY2Vpcn9nIw==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz",
+      "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==",
       "dev": true
     },
     "vue-hot-reload-api": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz",
-      "integrity": "sha1-nKWKbg35B4VUzhcIaItleHVNht4="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.1.1.tgz",
+      "integrity": "sha512-oHuG8rOJ/b8wKVZJBx3HvLyOk9klqjUpjd6YlJQ1aHy1yGyBgy62BphQ13+Tuzsxl52ZNV5EQSvd385mTPMxdg=="
     },
     "vue-server-renderer": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.2.tgz",
-      "integrity": "sha512-lSkPRn8IhpAsEwMe1adMP9L5FBPsgQ4KeFyLdcD82j/qlR4x1JPJ+hHZsQrza5rdgpW7np5qT/rSwn65AKztMQ==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz",
+      "integrity": "sha512-qSaNqInt4bJLsIFBU7fNgSTvpYzWJWe+zUkbSdKaFhMGhI/GNFUghK4VZX3ETvBNX51DYa4kEmZgSVZ70xWdxQ==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
@@ -9019,18 +9311,18 @@
       }
     },
     "vue-style-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.1.tgz",
-      "integrity": "sha1-yLY5uy8kuvnXgnTcF+TyZMHe2gg=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.3.tgz",
+      "integrity": "sha512-P/ihpaZKU23T1kq3E0y4c+F8sbm1HQO69EFYoLoGMSGVAHroHsGir/WQ9qUavP8dyFYHmXenzHaJ/nqd8vfaxw==",
       "requires": {
         "hash-sum": "1.0.2",
         "loader-utils": "1.1.0"
       }
     },
     "vue-template-compiler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.2.tgz",
-      "integrity": "sha512-sKa2Bdvh+j6V9eQSyJRxsf8fak0FtQkCZ145aYFDVwZBhHOTt1vKrODLo4RelI1dUczKlDCp5aZ9MD7uJOZwvw==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz",
+      "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==",
       "dev": true,
       "requires": {
         "de-indent": "1.0.2",
@@ -9060,19 +9352,19 @@
       "dev": true
     },
     "webpack": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz",
-      "integrity": "sha512-qeUx4nIbeLL53qqNTs3kObPBMkUVDrOjEfp/hTvMlx21qL2MsGNr8/tXCoX/lS12dLl9qtZaXv2qfBEctPScDg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz",
+      "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==",
       "dev": true,
       "requires": {
-        "acorn": "5.1.1",
+        "acorn": "5.1.2",
         "acorn-dynamic-import": "2.0.2",
-        "ajv": "5.2.2",
+        "ajv": "5.2.3",
         "ajv-keywords": "2.1.0",
         "async": "2.5.0",
         "enhanced-resolve": "3.4.1",
         "escope": "3.6.0",
-        "interpret": "1.0.3",
+        "interpret": "1.0.4",
         "json-loader": "0.5.7",
         "json5": "0.5.1",
         "loader-runner": "2.3.0",
@@ -9081,7 +9373,7 @@
         "mkdirp": "0.5.1",
         "node-libs-browser": "2.0.0",
         "source-map": "0.5.7",
-        "supports-color": "4.2.1",
+        "supports-color": "4.4.0",
         "tapable": "0.2.8",
         "uglifyjs-webpack-plugin": "0.4.6",
         "watchpack": "1.4.0",
@@ -9090,9 +9382,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
-          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
           "dev": true,
           "requires": {
             "co": "4.6.0",
@@ -9143,6 +9435,12 @@
             }
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -9201,6 +9499,14 @@
       "requires": {
         "source-list-map": "2.0.0",
         "source-map": "0.5.7"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "whatwg-encoding": {
diff --git a/package.json b/package.json
index 790695d16..30fea33c0 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "postcss-selector-parser": "^2.0.0",
     "prettier": "^1.7.0",
     "resolve": "^1.4.0",
-    "source-map": "^0.5.6",
+    "source-map": "^0.6.1",
     "vue-hot-reload-api": "^2.1.0",
     "vue-style-loader": "^3.0.0",
     "vue-template-es2015-compiler": "^1.5.3"
@@ -71,7 +71,7 @@
     "eslint-plugin-vue-libs": "^1.2.0",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^0.11.2",
+    "file-loader": "^1.1.5",
     "gitbook-plugin-edit-link": "^2.0.2",
     "gitbook-plugin-github": "^3.0.0",
     "gitbook-plugin-theme-vuejs": "^1.1.0",
@@ -83,7 +83,7 @@
     "marked": "^0.3.6",
     "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
-    "mocha": "^3.4.2",
+    "mocha": "^4.0.1",
     "node-libs-browser": "^2.0.0",
     "normalize-newline": "^3.0.0",
     "null-loader": "^0.1.1",
@@ -93,10 +93,10 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
     "sugarss": "^1.0.0",
-    "url-loader": "^0.5.9",
-    "vue": "^2.4.2",
-    "vue-server-renderer": "^2.4.2",
-    "vue-template-compiler": "^2.4.2",
+    "url-loader": "^0.6.2",
+    "vue": "^2.4.4",
+    "vue-server-renderer": "^2.4.4",
+    "vue-template-compiler": "^2.4.4",
     "webpack": "^3.4.1"
   }
 }

From 585b70c262f6bb32f5bb7e0172d6c77a641a3838 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 22:56:02 -0400
Subject: [PATCH 714/877] feat: finish support functional component templates

---
 lib/component-normalizer.js    |  2 +-
 lib/loader.js                  | 13 +++---
 lib/template-compiler/index.js |  2 +-
 test/test.js                   | 81 ++++++++++++++++++----------------
 4 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index d2549b95a..07180b7fa 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -30,7 +30,7 @@ module.exports = function normalizeComponent (
   if (compiledTemplate) {
     options.render = compiledTemplate.render
     options.staticRenderFns = compiledTemplate.staticRenderFns
-    options.compiled = true
+    options._compiled = true
   }
 
   // functional template
diff --git a/lib/loader.js b/lib/loader.js
index 590db4ddb..ccba1a033 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -89,11 +89,12 @@ module.exports = function (content) {
   var output = ''
   var parts = parse(content, fileName, this.sourceMap)
   var hasScoped = parts.styles.some(function (s) { return s.scoped })
-  var hasComment = parts.template && parts.template.attrs && parts.template.attrs.comments
-  var functional = parts.template && parts.template.functional
-  var bubleTemplateOptions = Object.create(options.buble || {})
-  bubleTemplateOptions.transforms = Object.create(bubleTemplateOptions.transforms || {})
-  bubleTemplateOptions.transforms.stripWithFunctional = functional
+  var templateAttrs = parts.template && parts.template.attrs && parts.template.attrs
+  var hasComment = templateAttrs && templateAttrs.comments
+  var functionalTemplate = templateAttrs && templateAttrs.functional
+  var bubleTemplateOptions = Object.assign({}, options.buble)
+  bubleTemplateOptions.transforms = Object.assign({}, bubleTemplateOptions.transforms)
+  bubleTemplateOptions.transforms.stripWithFunctional = functionalTemplate
 
   var templateCompilerOptions = '?' + JSON.stringify({
     id: moduleId,
@@ -267,7 +268,7 @@ module.exports = function (content) {
 
   // template functional
   output += '/* template functional */\n  '
-  output += 'var __vue_template_functional__ = ' + ((template && template.functional) ? 'true' : 'null') + '\n'
+  output += 'var __vue_template_functional__ = ' + (functionalTemplate ? 'true' : 'false') + '\n'
 
   // style
   output += '/* styles */\n'
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 960360a38..459136e44 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -52,8 +52,8 @@ module.exports = function (html) {
       : 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
     var bubleOptions = options.buble
-    var stripWithFunctional = bubleOptions.transforms.stripWithFunctional
     var stripWith = bubleOptions.transforms.stripWith !== false
+    var stripWithFunctional = bubleOptions.transforms.stripWithFunctional
 
     var staticRenderFns = compiled.staticRenderFns.map((fn) => toFunction(fn, stripWithFunctional))
 
diff --git a/test/test.js b/test/test.js
index e529731f7..0e461a40b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -7,8 +7,8 @@ var webpack = require('webpack')
 var MemoryFS = require('memory-fs')
 var expect = require('chai').expect
 var hash = require('hash-sum')
+var Vue = require('vue')
 var SSR = require('vue-server-renderer')
-var Vue = require('vue/dist/vue.runtime.js')
 // var compiler = require('../lib/template-compiler')
 var normalizeNewline = require('normalize-newline')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
@@ -933,44 +933,47 @@ describe('vue-loader', function () {
   })
 
   // Vue required tests for more complete test cases
-  it('should allow functional template', done => {
-    test({
-      entry: './test/fixtures/functional-root.vue',
-      vue: {
-        preserveWhitespace: false
-      }
-    }, (window, module) => {
-      expect(module.components.Functional.compiled).to.equal(true)
-      expect(module.components.Functional.functional).to.equal(true)
-      expect(module.components.Functional.staticRenderFns).to.exist
-      expect(module.components.Functional.render).to.be.a('function')
-
-      const vnode = mockRender(module, {
-        fn () {
-          done()
+  // this test case requires Vue >= 2.5
+  if (Number(Vue.version.split('.')[1]) >= 5) {
+    it('functional template', done => {
+      test({
+        entry: './test/fixtures/functional-root.vue',
+        vue: {
+          preserveWhitespace: false
         }
-      }).children[0]
-
-      // Basic vnode
-      expect(vnode.children[0].data.staticClass).to.equal('red')
-      expect(vnode.children[0].children[0].text).to.equal('hello')
-      // Default slot vnode
-      expect(vnode.children[1].tag).to.equal('span')
-      expect(vnode.children[1].children[0].text).to.equal('hello')
-      // Named slot vnode
-      expect(vnode.children[2].tag).to.equal('div')
-      expect(vnode.children[2].children[0].text).to.equal('Second slot')
-      // // Scoped slot vnode
-      expect(vnode.children[3].text).to.equal('hello')
-      // // Static content vnode
-      expect(vnode.children[4].tag).to.equal('div')
-      expect(vnode.children[4].children[0].text).to.equal('Some ')
-      expect(vnode.children[4].children[1].tag).to.equal('span')
-      expect(vnode.children[4].children[1].children[0].text).to.equal('text')
-      // // v-if vnode
-      expect(vnode.children[5].text).to.equal('')
-
-      vnode.children[6].data.on.click()
+      }, (window, module) => {
+        expect(module.components.Functional._compiled).to.equal(true)
+        expect(module.components.Functional.functional).to.equal(true)
+        expect(module.components.Functional.staticRenderFns).to.exist
+        expect(module.components.Functional.render).to.be.a('function')
+
+        const vnode = mockRender(module, {
+          fn () {
+            done()
+          }
+        }).children[0]
+
+        // Basic vnode
+        expect(vnode.children[0].data.staticClass).to.equal('red')
+        expect(vnode.children[0].children[0].text).to.equal('hello')
+        // Default slot vnode
+        expect(vnode.children[1].tag).to.equal('span')
+        expect(vnode.children[1].children[0].text).to.equal('hello')
+        // Named slot vnode
+        expect(vnode.children[2].tag).to.equal('div')
+        expect(vnode.children[2].children[0].text).to.equal('Second slot')
+        // // Scoped slot vnode
+        expect(vnode.children[3].text).to.equal('hello')
+        // // Static content vnode
+        expect(vnode.children[4].tag).to.equal('div')
+        expect(vnode.children[4].children[0].text).to.equal('Some ')
+        expect(vnode.children[4].children[1].tag).to.equal('span')
+        expect(vnode.children[4].children[1].children[0].text).to.equal('text')
+        // // v-if vnode
+        expect(vnode.children[5].text).to.equal('')
+
+        vnode.children[6].data.on.click()
+      })
     })
-  })
+  }
 })

From 5673319d78342e530a8ef799f1088770a87f92a9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 23:04:36 -0400
Subject: [PATCH 715/877] style: update to ES2015

---
 lib/component-normalizer.js                   |   5 +-
 lib/loader.js                                 | 462 +++++++++++-------
 lib/parser.js                                 |  22 +-
 lib/selector.js                               |  18 +-
 lib/style-compiler/index.js                   | 113 +++--
 lib/style-compiler/load-postcss-config.js     |  23 +-
 lib/style-compiler/plugins/scope-id.js        | 138 +++---
 lib/style-compiler/plugins/trim.js            |  16 +-
 lib/template-compiler/index.js                |  91 ++--
 .../modules/transform-require.js              |  16 +-
 lib/template-compiler/preprocessor.js         |  22 +-
 lib/utils/gen-id.js                           |  18 +-
 lib/utils/normalize.js                        |  16 +-
 lib/utils/try-require.js                      |   6 +-
 14 files changed, 542 insertions(+), 424 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index 07180b7fa..ab3b6a9d6 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -1,7 +1,8 @@
 /* globals __VUE_SSR_CONTEXT__ */
 
-// this module is a runtime utility for cleaner component module output and will
-// be included in the final webpack user bundle
+// IMPORTANT: Do NOT use ES2015 features in this file.
+// This module is a runtime utility for cleaner component module output and will
+// be included in the final webpack user bundle.
 
 module.exports = function normalizeComponent (
   rawScriptExports,
diff --git a/lib/loader.js b/lib/loader.js
index ccba1a033..d92900317 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,30 +1,30 @@
-var path = require('path')
-var hash = require('hash-sum')
-var parse = require('./parser')
-var genId = require('./utils/gen-id')
-var querystring = require('querystring')
-var loaderUtils = require('loader-utils')
-var normalize = require('./utils/normalize')
-var tryRequire = require('./utils/try-require')
+const path = require('path')
+const hash = require('hash-sum')
+const parse = require('./parser')
+const genId = require('./utils/gen-id')
+const querystring = require('querystring')
+const loaderUtils = require('loader-utils')
+const normalize = require('./utils/normalize')
+const tryRequire = require('./utils/try-require')
 
 // internal lib loaders
-var selectorPath = normalize.lib('selector')
-var styleCompilerPath = normalize.lib('style-compiler/index')
-var templateCompilerPath = normalize.lib('template-compiler/index')
-var templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
-var componentNormalizerPath = normalize.lib('component-normalizer')
+const selectorPath = normalize.lib('selector')
+const styleCompilerPath = normalize.lib('style-compiler/index')
+const templateCompilerPath = normalize.lib('template-compiler/index')
+const templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
+const componentNormalizerPath = normalize.lib('component-normalizer')
 
 // dep loaders
-var styleLoaderPath = normalize.dep('vue-style-loader')
-var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
+const styleLoaderPath = normalize.dep('vue-style-loader')
+const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 
 // check whether default js loader exists
-var hasBabel = !!tryRequire('babel-loader')
-var hasBuble = !!tryRequire('buble-loader')
+const hasBabel = !!tryRequire('babel-loader')
+const hasBuble = !!tryRequire('buble-loader')
 
-var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
+const rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
-var defaultLang = {
+const defaultLang = {
   template: 'html',
   styles: 'css',
   script: 'js'
@@ -33,25 +33,32 @@ var defaultLang = {
 // When extracting parts from the source vue file, we want to apply the
 // loaders chained before vue-loader, but exclude some loaders that simply
 // produces side effects such as linting.
-function getRawRequest (context, excludedPreLoaders) {
-  excludedPreLoaders = excludedPreLoaders || /eslint-loader/
+function getRawRequest (
+  { resource, loaderIndex, loaders },
+  excludedPreLoaders = /eslint-loader/
+) {
   return loaderUtils.getRemainingRequest({
-    resource: context.resource,
-    loaderIndex: context.loaderIndex,
-    loaders: context.loaders.filter(loader => !excludedPreLoaders.test(loader.path))
+    resource: resource,
+    loaderIndex: loaderIndex,
+    loaders: loaders.filter(loader => !excludedPreLoaders.test(loader.path))
   })
 }
 
 module.exports = function (content) {
   this.cacheable()
-  var isServer = this.target === 'node'
-  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-
-  var loaderContext = this
-  var query = loaderUtils.getOptions(this) || {}
-  var options = Object.assign({
-    esModule: true
-  }, this.options.vue, this.vue, query)
+  const isServer = this.target === 'node'
+  const isProduction = this.minimize || process.env.NODE_ENV === 'production'
+
+  const loaderContext = this
+  const query = loaderUtils.getOptions(this) || {}
+  const options = Object.assign(
+    {
+      esModule: true
+    },
+    this.options.vue,
+    this.vue,
+    query
+  )
 
   // disable esModule in inject mode
   // because import/export must be top-level
@@ -66,15 +73,20 @@ module.exports = function (content) {
     configurable: true
   })
 
-  var rawRequest = getRawRequest(this, options.excludedPreLoaders)
-  var filePath = this.resourcePath
-  var fileName = path.basename(filePath)
+  const rawRequest = getRawRequest(this, options.excludedPreLoaders)
+  const filePath = this.resourcePath
+  const fileName = path.basename(filePath)
 
-  var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
-  var moduleId = 'data-v-' + genId(filePath, context, options.hashKey)
-  var shortFilePath = path.relative(context, filePath).replace(/^(\.\.\/)+/, '')
+  const context =
+    (this._compiler && this._compiler.context) ||
+    this.options.context ||
+    process.cwd()
+  const moduleId = 'data-v-' + genId(filePath, context, options.hashKey)
+  const shortFilePath = path
+    .relative(context, filePath)
+    .replace(/^(\.\.\/)+/, '')
 
-  var cssLoaderOptions = ''
+  let cssLoaderOptions = ''
   if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
     cssLoaderOptions += '?sourceMap'
   }
@@ -82,82 +94,88 @@ module.exports = function (content) {
     cssLoaderOptions += (cssLoaderOptions ? '&' : '?') + 'minimize'
   }
 
-  var bubleOptions = hasBuble && options.buble
-    ? '?' + JSON.stringify(options.buble)
-    : ''
-
-  var output = ''
-  var parts = parse(content, fileName, this.sourceMap)
-  var hasScoped = parts.styles.some(function (s) { return s.scoped })
-  var templateAttrs = parts.template && parts.template.attrs && parts.template.attrs
-  var hasComment = templateAttrs && templateAttrs.comments
-  var functionalTemplate = templateAttrs && templateAttrs.functional
-  var bubleTemplateOptions = Object.assign({}, options.buble)
-  bubleTemplateOptions.transforms = Object.assign({}, bubleTemplateOptions.transforms)
+  const bubleOptions =
+    hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
+
+  let output = ''
+  const parts = parse(content, fileName, this.sourceMap)
+  const hasScoped = parts.styles.some(({ scoped }) => scoped)
+  const templateAttrs =
+    parts.template && parts.template.attrs && parts.template.attrs
+  const hasComment = templateAttrs && templateAttrs.comments
+  const functionalTemplate = templateAttrs && templateAttrs.functional
+  const bubleTemplateOptions = Object.assign({}, options.buble)
+  bubleTemplateOptions.transforms = Object.assign(
+    {},
+    bubleTemplateOptions.transforms
+  )
   bubleTemplateOptions.transforms.stripWithFunctional = functionalTemplate
 
-  var templateCompilerOptions = '?' + JSON.stringify({
-    id: moduleId,
-    hasScoped: hasScoped,
-    hasComment: hasComment,
-    transformToRequire: options.transformToRequire,
-    preserveWhitespace: options.preserveWhitespace,
-    buble: bubleTemplateOptions,
-    // only pass compilerModules if it's a path string
-    compilerModules: typeof options.compilerModules === 'string'
-      ? options.compilerModules
-      : undefined
-  })
+  const templateCompilerOptions =
+    '?' +
+    JSON.stringify({
+      id: moduleId,
+      hasScoped,
+      hasComment,
+      transformToRequire: options.transformToRequire,
+      preserveWhitespace: options.preserveWhitespace,
+      buble: bubleTemplateOptions,
+      // only pass compilerModules if it's a path string
+      compilerModules:
+        typeof options.compilerModules === 'string'
+          ? options.compilerModules
+          : undefined
+    })
 
-  var defaultLoaders = {
+  const defaultLoaders = {
     html: templateCompilerPath + templateCompilerOptions,
     css: options.extractCSS
       ? getCSSExtractLoader()
       : styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
-    js: hasBuble ? ('buble-loader' + bubleOptions) : hasBabel ? 'babel-loader' : ''
+    js: hasBuble
+      ? 'buble-loader' + bubleOptions
+      : hasBabel ? 'babel-loader' : ''
   }
 
   // check if there are custom loaders specified via
   // webpack config, otherwise use defaults
-  var loaders = Object.assign({}, defaultLoaders, options.loaders)
-  var preLoaders = options.preLoaders || {}
-  var postLoaders = options.postLoaders || {}
-
-  var needsHotReload = (
-    !isServer &&
-    !isProduction &&
-    (parts.script || parts.template)
-  )
+  const loaders = Object.assign({}, defaultLoaders, options.loaders)
+  const preLoaders = options.preLoaders || {}
+  const postLoaders = options.postLoaders || {}
+
+  const needsHotReload =
+    !isServer && !isProduction && (parts.script || parts.template)
 
   if (needsHotReload) {
     output += 'var disposed = false\n'
   }
 
   // add requires for styles
-  var cssModules
+  let cssModules
   if (parts.styles.length) {
-    var styleInjectionCode = 'function injectStyle (ssrContext) {\n'
+    let styleInjectionCode = 'function injectStyle (ssrContext) {\n'
     if (needsHotReload) {
       styleInjectionCode += `  if (disposed) return\n`
     }
     if (isServer) {
       styleInjectionCode += `var i\n`
     }
-    parts.styles.forEach(function (style, i) {
+    parts.styles.forEach((style, i) => {
       // require style
-      var requireString = style.src
+      let requireString = style.src
         ? getRequireForImport('styles', style, style.scoped)
         : getRequire('styles', style, i, style.scoped)
 
-      var hasStyleLoader = requireString.indexOf('style-loader') > -1
-      var hasVueStyleLoader = requireString.indexOf('vue-style-loader') > -1
+      const hasStyleLoader = requireString.indexOf('style-loader') > -1
+      const hasVueStyleLoader = requireString.indexOf('vue-style-loader') > -1
       // vue-style-loader exposes inject functions during SSR so they are
       // always called
-      var invokeStyle = isServer && hasVueStyleLoader
-        ? code => `;(i=${code},i.__inject__&&i.__inject__(ssrContext),i)\n`
-        : code => `  ${code}\n`
+      const invokeStyle =
+        isServer && hasVueStyleLoader
+          ? code => `;(i=${code},i.__inject__&&i.__inject__(ssrContext),i)\n`
+          : code => `  ${code}\n`
 
-      var moduleName = (style.module === true) ? '$style' : style.module
+      const moduleName = style.module === true ? '$style' : style.module
       // setCssModule
       if (moduleName) {
         if (!cssModules) {
@@ -167,7 +185,9 @@ module.exports = function (content) {
           }
         }
         if (moduleName in cssModules) {
-          loaderContext.emitError('CSS module name "' + moduleName + '" is not unique!')
+          loaderContext.emitError(
+            'CSS module name "' + moduleName + '" is not unique!'
+          )
           styleInjectionCode += invokeStyle(requireString)
         } else {
           cssModules[moduleName] = true
@@ -180,7 +200,9 @@ module.exports = function (content) {
           }
 
           if (!needsHotReload) {
-            styleInjectionCode += invokeStyle('this["' + moduleName + '"] = ' + requireString)
+            styleInjectionCode += invokeStyle(
+              'this["' + moduleName + '"] = ' + requireString
+            )
           } else {
             // handle hot reload for CSS modules.
             // we store the exported locals in an object and proxy to it by
@@ -189,7 +211,7 @@ module.exports = function (content) {
               invokeStyle(`cssModules["${moduleName}"] = ${requireString}`) +
               `Object.defineProperty(this, "${moduleName}", { get: function () { return cssModules["${moduleName}"] }})\n`
 
-            var requirePath = style.src
+            const requirePath = style.src
               ? getRequireForImportString('styles', style, style.scoped)
               : getRequireString('styles', style, i, style.scoped)
 
@@ -220,26 +242,31 @@ module.exports = function (content) {
   // normalizeComponent(
   //   scriptExports,
   //   compiledTemplate,
+  //   functionalTemplate,
   //   injectStyles,
   //   scopeId,
   //   moduleIdentifier (server only)
   // )
-  output += 'var normalizeComponent = require(' +
+  output +=
+    'var normalizeComponent = require(' +
     loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-  ')\n'
+    ')\n'
 
   // <script>
   output += '/* script */\n'
-  var script = parts.script
+  const script = parts.script
   if (script) {
     if (options.esModule) {
       output += script.src
         ? getImportForImport('script', script)
         : getImport('script', script) + '\n'
     } else {
-      output += 'var __vue_script__ = ' + (script.src
-        ? getRequireForImport('script', script)
-        : getRequire('script', script)) + '\n'
+      output +=
+        'var __vue_script__ = ' +
+        (script.src
+          ? getRequireForImport('script', script)
+          : getRequire('script', script)) +
+        '\n'
     }
     // inject loader interop
     if (query.inject) {
@@ -251,16 +278,20 @@ module.exports = function (content) {
 
   // <template>
   output += '/* template */\n'
-  var template = parts.template
+  const template = parts.template
   if (template) {
     if (options.esModule) {
-      output += (template.src
-        ? getImportForImport('template', template)
-        : getImport('template', template)) + '\n'
+      output +=
+        (template.src
+          ? getImportForImport('template', template)
+          : getImport('template', template)) + '\n'
     } else {
-      output += 'var __vue_template__ = ' + (template.src
-        ? getRequireForImport('template', template)
-        : getRequire('template', template)) + '\n'
+      output +=
+        'var __vue_template__ = ' +
+        (template.src
+          ? getRequireForImport('template', template)
+          : getRequire('template', template)) +
+        '\n'
     }
   } else {
     output += 'var __vue_template__ = null\n'
@@ -268,22 +299,35 @@ module.exports = function (content) {
 
   // template functional
   output += '/* template functional */\n  '
-  output += 'var __vue_template_functional__ = ' + (functionalTemplate ? 'true' : 'false') + '\n'
+  output +=
+    'var __vue_template_functional__ = ' +
+    (functionalTemplate ? 'true' : 'false') +
+    '\n'
 
   // style
   output += '/* styles */\n'
-  output += 'var __vue_styles__ = ' + (parts.styles.length ? 'injectStyle' : 'null') + '\n'
+  output +=
+    'var __vue_styles__ = ' +
+    (parts.styles.length ? 'injectStyle' : 'null') +
+    '\n'
 
   // scopeId
   output += '/* scopeId */\n'
-  output += 'var __vue_scopeId__ = ' + (hasScoped ? JSON.stringify(moduleId) : 'null') + '\n'
+  output +=
+    'var __vue_scopeId__ = ' +
+    (hasScoped ? JSON.stringify(moduleId) : 'null') +
+    '\n'
 
   // moduleIdentifier (server only)
   output += '/* moduleIdentifier (server only) */\n'
-  output += 'var __vue_module_identifier__ = ' + (isServer ? JSON.stringify(hash(this.request)) : 'null') + '\n'
+  output +=
+    'var __vue_module_identifier__ = ' +
+    (isServer ? JSON.stringify(hash(this.request)) : 'null') +
+    '\n'
 
   // close normalizeComponent call
-  output += 'var Component = normalizeComponent(\n' +
+  output +=
+    'var Component = normalizeComponent(\n' +
     '  __vue_script__,\n' +
     '  __vue_template__,\n' +
     '  __vue_template_functional__,\n' +
@@ -295,25 +339,26 @@ module.exports = function (content) {
   // development-only code
   if (!isProduction) {
     // add filename in dev
-    output += 'Component.options.__file = ' + JSON.stringify(shortFilePath) + '\n'
+    output +=
+      'Component.options.__file = ' + JSON.stringify(shortFilePath) + '\n'
     // check named exports
     output +=
       'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +
-        'return key !== "default" && key.substr(0, 2) !== "__"' +
+      'return key !== "default" && key.substr(0, 2) !== "__"' +
       '})) {' +
-        'console.error("named exports are not supported in *.vue files.")' +
+      'console.error("named exports are not supported in *.vue files.")' +
       '}\n'
   }
 
   // add requires for customBlocks
   if (parts.customBlocks && parts.customBlocks.length) {
-    var addedPrefix = false
+    let addedPrefix = false
 
-    parts.customBlocks.forEach(function (customBlock, i) {
+    parts.customBlocks.forEach((customBlock, i) => {
       if (loaders[customBlock.type]) {
         // require customBlock
         customBlock.src = customBlock.attrs.src
-        var requireString = customBlock.src
+        const requireString = customBlock.src
           ? getRequireForImport(customBlock.type, customBlock)
           : getRequire(customBlock.type, customBlock, i)
 
@@ -323,9 +368,11 @@ module.exports = function (content) {
         }
 
         output +=
-          'var customBlock = ' + requireString + '\n' +
+          'var customBlock = ' +
+          requireString +
+          '\n' +
           'if (typeof customBlock === "function") {' +
-            'customBlock(Component)' +
+          'customBlock(Component)' +
           '}\n'
       }
     })
@@ -339,24 +386,27 @@ module.exports = function (content) {
       output +=
         '\n/* hot reload */\n' +
         'if (module.hot) {(function () {\n' +
-        '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
+        '  var hotAPI = require("' +
+        hotReloadAPIPath +
+        '")\n' +
         '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
         '  module.hot.accept()\n' +
         '  if (!module.hot.data) {\n' +
         // initial insert
-        '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
+        '    hotAPI.createRecord("' +
+        moduleId +
+        '", Component.options)\n' +
         '  } else {\n'
       // update
       if (cssModules) {
         output +=
-        '    if (module.hot.data.cssModules && Object.keys(module.hot.data.cssModules) !== Object.keys(cssModules)) {\n' +
-        '      delete Component.options._Ctor\n' +
-        '    }\n'
+          '    if (module.hot.data.cssModules && Object.keys(module.hot.data.cssModules) !== Object.keys(cssModules)) {\n' +
+          '      delete Component.options._Ctor\n' +
+          '    }\n'
       }
       output +=
-        '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
-        '  }\n'
+        '    hotAPI.reload("' + moduleId + '", Component.options)\n' + '  }\n'
       // dispose
       output +=
         '  module.hot.dispose(function (data) {\n' +
@@ -375,7 +425,9 @@ module.exports = function (content) {
     // inject-loader support
     output =
       '\n/* dependency injection */\n' +
-      'module.exports = function (injections) {\n' + output + '\n' +
+      'module.exports = function (injections) {\n' +
+      output +
+      '\n' +
       '\nreturn Component.exports\n}'
   }
 
@@ -385,60 +437,66 @@ module.exports = function (content) {
   // --- helpers ---
 
   function getRequire (type, part, index, scoped) {
-    return 'require(' +
-      getRequireString(type, part, index, scoped) +
-    ')'
+    return 'require(' + getRequireString(type, part, index, scoped) + ')'
   }
 
   function getImport (type, part, index, scoped) {
-    return 'import __vue_' + type + '__ from ' + getRequireString(type, part, index, scoped)
+    return (
+      'import __vue_' +
+      type +
+      '__ from ' +
+      getRequireString(type, part, index, scoped)
+    )
   }
 
   function getRequireString (type, part, index, scoped) {
-    return loaderUtils.stringifyRequest(loaderContext,
+    return loaderUtils.stringifyRequest(
+      loaderContext,
       // disable all configuration loaders
       '!!' +
-      // get loader string for pre-processors
-      getLoaderString(type, part, index, scoped) +
-      // select the corresponding part from the vue file
-      getSelectorString(type, index || 0) +
-      // the url to the actual vue file, including remaining requests
-      rawRequest
+        // get loader string for pre-processors
+        getLoaderString(type, part, index, scoped) +
+        // select the corresponding part from the vue file
+        getSelectorString(type, index || 0) +
+        // the url to the actual vue file, including remaining requests
+        rawRequest
     )
   }
 
   function getRequireForImport (type, impt, scoped) {
-    return 'require(' +
-      getRequireForImportString(type, impt, scoped) +
-    ')'
+    return 'require(' + getRequireForImportString(type, impt, scoped) + ')'
   }
 
   function getImportForImport (type, impt, scoped) {
-    return 'import __vue_' + type + '__ from ' + getRequireForImportString(type, impt, scoped)
+    return (
+      'import __vue_' +
+      type +
+      '__ from ' +
+      getRequireForImportString(type, impt, scoped)
+    )
   }
 
   function getRequireForImportString (type, impt, scoped) {
-    return loaderUtils.stringifyRequest(loaderContext,
-      '!!' +
-      getLoaderString(type, impt, -1, scoped) +
-      impt.src
+    return loaderUtils.stringifyRequest(
+      loaderContext,
+      '!!' + getLoaderString(type, impt, -1, scoped) + impt.src
     )
   }
 
   function addCssModulesToLoader (loader, part, index) {
     if (!part.module) return loader
-    var option = options.cssModules || {}
-    var DEFAULT_OPTIONS = {
+    const option = options.cssModules || {}
+    const DEFAULT_OPTIONS = {
       modules: true,
       importLoaders: true
     }
-    var OPTIONS = {
+    const OPTIONS = {
       localIdentName: '[hash:base64]'
     }
-    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, function (m, $1, $2) {
+    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, (m, $1, $2) => {
       // $1: !css-loader
       // $2: ?a=b
-      var query = loaderUtils.parseQuery($2 || '?')
+      const query = loaderUtils.parseQuery($2 || '?')
       Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
       if (index !== -1) {
         // Note:
@@ -452,24 +510,28 @@ module.exports = function (content) {
   }
 
   function buildCustomBlockLoaderString (attrs) {
-    var noSrcAttrs = Object.assign({}, attrs)
+    const noSrcAttrs = Object.assign({}, attrs)
     delete noSrcAttrs.src
-    var qs = querystring.stringify(noSrcAttrs)
+    const qs = querystring.stringify(noSrcAttrs)
     return qs ? '?' + qs : qs
   }
 
   // stringify an Array of loader objects
   function stringifyLoaders (loaders) {
-    return loaders.map(function (obj) {
-      return obj && typeof obj === 'object' && typeof obj.loader === 'string'
-        ? obj.loader + (obj.options ? '?' + JSON.stringify(obj.options) : '')
-        : obj
-    }).join('!')
+    return loaders
+      .map(
+        obj =>
+          obj && typeof obj === 'object' && typeof obj.loader === 'string'
+            ? obj.loader +
+              (obj.options ? '?' + JSON.stringify(obj.options) : '')
+            : obj
+      )
+      .join('!')
   }
 
   function getLoaderString (type, part, index, scoped) {
-    var loader = getRawLoaderString(type, part, index, scoped)
-    var lang = getLangString(type, part)
+    let loader = getRawLoaderString(type, part, index, scoped)
+    const lang = getLangString(type, part)
     if (preLoaders[lang]) {
       loader = loader + ensureBang(preLoaders[lang])
     }
@@ -479,27 +541,31 @@ module.exports = function (content) {
     return loader
   }
 
-  function getLangString (type, part) {
+  function getLangString (type, { lang }) {
     if (type === 'script' || type === 'template' || type === 'styles') {
-      return part.lang || defaultLang[type]
+      return lang || defaultLang[type]
     } else {
       return type
     }
   }
 
   function getRawLoaderString (type, part, index, scoped) {
-    var lang = part.lang || defaultLang[type]
+    let lang = part.lang || defaultLang[type]
 
-    var styleCompiler = ''
+    let styleCompiler = ''
     if (type === 'styles') {
       // style compiler that needs to be applied for all styles
-      styleCompiler = styleCompilerPath + '?' + JSON.stringify({
-        // a marker for vue-style-loader to know that this is an import from a vue file
-        vue: true,
-        id: moduleId,
-        scoped: !!scoped,
-        hasInlineConfig: !!query.postcss
-      }) + '!'
+      styleCompiler =
+        styleCompilerPath +
+        '?' +
+        JSON.stringify({
+          // a marker for vue-style-loader to know that this is an import from a vue file
+          vue: true,
+          id: moduleId,
+          scoped: !!scoped,
+          hasInlineConfig: !!query.postcss
+        }) +
+        '!'
       // normalize scss/sass if no specific loaders have been provided
       if (!loaders[lang]) {
         if (lang === 'sass') {
@@ -510,13 +576,13 @@ module.exports = function (content) {
       }
     }
 
-    var loader = options.extractCSS && type === 'styles'
-      ? loaders[lang] || getCSSExtractLoader(lang)
-      : loaders[lang]
+    let loader =
+      options.extractCSS && type === 'styles'
+        ? loaders[lang] || getCSSExtractLoader(lang)
+        : loaders[lang]
 
-    var injectString = (type === 'script' && query.inject)
-      ? 'inject-loader!'
-      : ''
+    const injectString =
+      type === 'script' && query.inject ? 'inject-loader!' : ''
 
     if (loader != null) {
       if (Array.isArray(loader)) {
@@ -529,9 +595,10 @@ module.exports = function (content) {
         loader = addCssModulesToLoader(loader, part, index)
         // inject rewriter before css loader for extractTextPlugin use cases
         if (rewriterInjectRE.test(loader)) {
-          loader = loader.replace(rewriterInjectRE, function (m, $1) {
-            return ensureBang($1) + styleCompiler
-          })
+          loader = loader.replace(
+            rewriterInjectRE,
+            (m, $1) => ensureBang($1) + styleCompiler
+          )
         } else {
           loader = ensureBang(loader) + styleCompiler
         }
@@ -545,7 +612,14 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templatePreprocessorPath + '?engine=' + lang + '!'
+          return (
+            defaultLoaders.html +
+            '!' +
+            templatePreprocessorPath +
+            '?engine=' +
+            lang +
+            '!'
+          )
         case 'styles':
           loader = addCssModulesToLoader(defaultLoaders.css, part, index)
           return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
@@ -565,17 +639,29 @@ module.exports = function (content) {
   // sass-loader => sass-loader
   // sass?indentedSyntax!css => sass-loader?indentedSyntax!css-loader
   function ensureLoader (lang) {
-    return lang.split('!').map(function (loader) {
-      return loader.replace(/^([\w-]+)(\?.*)?/, function (_, name, query) {
-        return (/-loader$/.test(name) ? name : (name + '-loader')) + (query || '')
-      })
-    }).join('!')
+    return lang
+      .split('!')
+      .map(loader =>
+        loader.replace(
+          /^([\w-]+)(\?.*)?/,
+          (_, name, query) =>
+            (/-loader$/.test(name) ? name : name + '-loader') + (query || '')
+        )
+      )
+      .join('!')
   }
 
   function getSelectorString (type, index) {
-    return selectorPath +
-      '?type=' + ((type === 'script' || type === 'template' || type === 'styles') ? type : 'customBlocks') +
-      '&index=' + index + '!'
+    return (
+      selectorPath +
+      '?type=' +
+      (type === 'script' || type === 'template' || type === 'styles'
+        ? type
+        : 'customBlocks') +
+      '&index=' +
+      index +
+      '!'
+    )
   }
 
   function ensureBang (loader) {
@@ -587,8 +673,8 @@ module.exports = function (content) {
   }
 
   function getCSSExtractLoader (lang) {
-    var extractor
-    var op = options.extractCSS
+    let extractor
+    const op = options.extractCSS
     // extractCSS option is an instance of ExtractTextPlugin
     if (typeof op.extract === 'function') {
       extractor = op
@@ -597,13 +683,11 @@ module.exports = function (content) {
       if (!extractor) {
         throw new Error(
           '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
-          'as a peer dependency.'
+            'as a peer dependency.'
         )
       }
     }
-    var langLoader = lang
-      ? ensureBang(ensureLoader(lang))
-      : ''
+    const langLoader = lang ? ensureBang(ensureLoader(lang)) : ''
     return extractor.extract({
       use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
       fallback: 'vue-style-loader'
diff --git a/lib/parser.js b/lib/parser.js
index 55db356cd..8e71760a2 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -1,16 +1,16 @@
-var compiler = require('vue-template-compiler')
-var cache = require('lru-cache')(100)
-var hash = require('hash-sum')
-var SourceMapGenerator = require('source-map').SourceMapGenerator
+const compiler = require('vue-template-compiler')
+const cache = require('lru-cache')(100)
+const hash = require('hash-sum')
+const SourceMapGenerator = require('source-map').SourceMapGenerator
 
-var splitRE = /\r?\n/g
-var emptyRE = /^(?:\/\/)?\s*$/
+const splitRE = /\r?\n/g
+const emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = function (content, filename, needMap, sourceRoot) {
-  var cacheKey = hash(filename + content)
+module.exports = (content, filename, needMap, sourceRoot) => {
+  const cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
-  var filenameWithHash = filename + '?' + cacheKey
-  var output = cache.get(cacheKey)
+  const filenameWithHash = filename + '?' + cacheKey
+  let output = cache.get(cacheKey)
   if (output) return output
   output = compiler.parseComponent(content, { pad: 'line' })
   if (needMap) {
@@ -40,7 +40,7 @@ module.exports = function (content, filename, needMap, sourceRoot) {
 }
 
 function generateSourceMap (filename, source, generated, sourceRoot) {
-  var map = new SourceMapGenerator({ sourceRoot })
+  const map = new SourceMapGenerator({ sourceRoot })
   map.setSourceContent(filename, source)
   generated.split(splitRE).forEach((line, index) => {
     if (!emptyRE.test(line)) {
diff --git a/lib/selector.js b/lib/selector.js
index 75c32b2d8..e344d42e8 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -2,19 +2,19 @@
 // the requested language block, e.g. the content inside <template>, for
 // further processing.
 
-var path = require('path')
-var parse = require('./parser')
-var loaderUtils = require('loader-utils')
+const path = require('path')
+const parse = require('./parser')
+const loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   this.cacheable()
-  var query = loaderUtils.getOptions(this) || {}
-  var context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
-  var filename = path.basename(this.resourcePath)
+  const query = loaderUtils.getOptions(this) || {}
+  const context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
+  let filename = path.basename(this.resourcePath)
   filename = filename.substring(0, filename.lastIndexOf(path.extname(filename))) + '.vue'
-  var sourceRoot = path.dirname(path.relative(context, this.resourcePath))
-  var parts = parse(content, filename, this.sourceMap, sourceRoot)
-  var part = parts[query.type]
+  const sourceRoot = path.dirname(path.relative(context, this.resourcePath))
+  const parts = parse(content, filename, this.sourceMap, sourceRoot)
+  let part = parts[query.type]
   if (Array.isArray(part)) {
     part = part[query.index]
   }
diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index a2c9bf354..f886b0971 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -1,74 +1,79 @@
-var postcss = require('postcss')
-var loaderUtils = require('loader-utils')
-var loadPostcssConfig = require('./load-postcss-config')
+const postcss = require('postcss')
+const loaderUtils = require('loader-utils')
+const loadPostcssConfig = require('./load-postcss-config')
 
-var trim = require('./plugins/trim')
-var scopeId = require('./plugins/scope-id')
+const trim = require('./plugins/trim')
+const scopeId = require('./plugins/scope-id')
 
 module.exports = function (css, map) {
   this.cacheable()
-  var cb = this.async()
+  const cb = this.async()
 
-  var query = loaderUtils.getOptions(this) || {}
-  var vueOptions = this.options.__vueOptions__
+  const query = loaderUtils.getOptions(this) || {}
+  let vueOptions = this.options.__vueOptions__
 
   if (!vueOptions) {
     if (query.hasInlineConfig) {
       this.emitError(
         `\n  [vue-loader] It seems you are using HappyPack with inline postcss ` +
-        `options for vue-loader. This is not supported because loaders running ` +
-        `in different threads cannot share non-serializable options. ` +
-        `It is recommended to use a postcss config file instead.\n` +
-        `\n  See http://vue-loader.vuejs.org/en/features/postcss.html#using-a-config-file for more details.\n`
+          `options for vue-loader. This is not supported because loaders running ` +
+          `in different threads cannot share non-serializable options. ` +
+          `It is recommended to use a postcss config file instead.\n` +
+          `\n  See http://vue-loader.vuejs.org/en/features/postcss.html#using-a-config-file for more details.\n`
       )
     }
     vueOptions = Object.assign({}, this.options.vue, this.vue)
   }
 
-  loadPostcssConfig(this, vueOptions.postcss).then(config => {
-    var plugins = [trim].concat(config.plugins)
-    var options = Object.assign({
-      to: this.resourcePath,
-      from: this.resourcePath,
-      map: false
-    }, config.options)
-
-    // add plugin for vue-loader scoped css rewrite
-    if (query.scoped) {
-      plugins.push(scopeId({ id: query.id }))
-    }
+  loadPostcssConfig(this, vueOptions.postcss)
+    .then(config => {
+      const plugins = [trim].concat(config.plugins)
+      const options = Object.assign(
+        {
+          to: this.resourcePath,
+          from: this.resourcePath,
+          map: false
+        },
+        config.options
+      )
 
-    // source map
-    if (
-      this.sourceMap &&
-      !this.minimize &&
-      vueOptions.cssSourceMap !== false &&
-      process.env.NODE_ENV !== 'production' &&
-      !options.map
-    ) {
-      options.map = {
-        inline: false,
-        annotation: false,
-        prev: map
+      // add plugin for vue-loader scoped css rewrite
+      if (query.scoped) {
+        plugins.push(scopeId({ id: query.id }))
       }
-    }
 
-    return postcss(plugins)
-      .process(css, options)
-      .then(result => {
-        if (result.messages) {
-          result.messages.forEach(m => {
-            if (m.type === 'dependency') {
-              this.addDependency(m.file)
-            }
-          })
+      // source map
+      if (
+        this.sourceMap &&
+        !this.minimize &&
+        vueOptions.cssSourceMap !== false &&
+        process.env.NODE_ENV !== 'production' &&
+        !options.map
+      ) {
+        options.map = {
+          inline: false,
+          annotation: false,
+          prev: map
         }
-        var map = result.map && result.map.toJSON()
-        cb(null, result.css, map)
-        return null // silence bluebird warning
-      })
-  }).catch(e => {
-    console.error(e)
-    cb(e)
-  })
+      }
+
+      return postcss(plugins)
+        .process(css, options)
+        .then(result => {
+          if (result.messages) {
+            result.messages.forEach(({ type, file }) => {
+              if (type === 'dependency') {
+                this.addDependency(file)
+              }
+            })
+          }
+          const map = result.map && result.map.toJSON()
+          cb(null, result.css, map)
+          return null // silence bluebird warning
+        })
+    })
+    .catch(e => {
+      console.error(e)
+      cb(e)
+    })
 }
diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index df80076ff..ff5a994cb 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -1,6 +1,6 @@
-var load = require('postcss-load-config')
+const load = require('postcss-load-config')
 
-var loaded
+let loaded
 
 function isObject (val) {
   return val && typeof val === 'object'
@@ -8,17 +8,19 @@ function isObject (val) {
 
 module.exports = function loadPostcssConfig (loaderContext, inlineConfig) {
   if (process.env.VUE_LOADER_TEST || !loaded) {
-    loaded = load({
-      webpack: loaderContext
-    }, null, { argv: false }).catch(() => {
+    loaded = load(
+      { webpack: loaderContext },
+      null,
+      { argv: false }
+    ).catch(() => {
       // postcss-load-config throws error when no config file is found,
       // but for us it's optional.
     })
   }
 
   return loaded.then(config => {
-    var plugins = []
-    var options = {}
+    let plugins = []
+    let options = {}
 
     // inline postcss options for vue-loader
     if (typeof inlineConfig === 'function') {
@@ -27,9 +29,10 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig) {
     if (Array.isArray(inlineConfig)) {
       plugins = inlineConfig
     } else if (isObject(inlineConfig)) {
-      plugins = (typeof inlineConfig.plugins === 'function')
-        ? inlineConfig.plugins.call(this, this)
-        : inlineConfig.plugins || []
+      plugins =
+        typeof inlineConfig.plugins === 'function'
+          ? inlineConfig.plugins.call(this, this)
+          : inlineConfig.plugins || []
       options = inlineConfig.options || {}
     }
 
diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index c2f2c2566..814f488a2 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -1,80 +1,78 @@
-var postcss = require('postcss')
-var selectorParser = require('postcss-selector-parser')
+const postcss = require('postcss')
+const selectorParser = require('postcss-selector-parser')
 
-module.exports = postcss.plugin('add-id', function (opts) {
-  return function (root) {
-    var keyframes = Object.create(null)
+module.exports = postcss.plugin('add-id', ({ id }) => root => {
+  const keyframes = Object.create(null)
 
-    root.each(function rewriteSelector (node) {
-      if (!node.selector) {
-        // handle media queries
-        if (node.type === 'atrule') {
-          if (node.name === 'media' || node.name === 'supports') {
-            node.each(rewriteSelector)
-          } else if (/-?keyframes$/.test(node.name)) {
-            // register keyframes
-            keyframes[node.params] = node.params = node.params + '-' + opts.id
-          }
+  root.each(function rewriteSelector (node) {
+    if (!node.selector) {
+      // handle media queries
+      if (node.type === 'atrule') {
+        if (node.name === 'media' || node.name === 'supports') {
+          node.each(rewriteSelector)
+        } else if (/-?keyframes$/.test(node.name)) {
+          // register keyframes
+          keyframes[node.params] = node.params = node.params + '-' + id
         }
-        return
       }
-      node.selector = selectorParser(function (selectors) {
-        selectors.each(function (selector) {
-          var node = null
-          selector.each(function (n) {
-            // ">>>" combinator
-            if (n.type === 'combinator' && n.value === '>>>') {
-              n.value = ' '
-              n.spaces.before = n.spaces.after = ''
-              return false
-            }
-            // /deep/ alias for >>>, since >>> doesn't work in SASS
-            if (n.type === 'tag' && n.value === '/deep/') {
-              var next = n.next()
-              if (next.type === 'combinator' && next.value === ' ') {
-                next.remove()
-              }
-              n.remove()
-              return false
+      return
+    }
+    node.selector = selectorParser(selectors => {
+      selectors.each(selector => {
+        let node = null
+        selector.each(n => {
+          // ">>>" combinator
+          if (n.type === 'combinator' && n.value === '>>>') {
+            n.value = ' '
+            n.spaces.before = n.spaces.after = ''
+            return false
+          }
+          // /deep/ alias for >>>, since >>> doesn't work in SASS
+          if (n.type === 'tag' && n.value === '/deep/') {
+            const next = n.next()
+            if (next.type === 'combinator' && next.value === ' ') {
+              next.remove()
             }
-            if (n.type !== 'pseudo' && n.type !== 'combinator') {
-              node = n
+            n.remove()
+            return false
+          }
+          if (n.type !== 'pseudo' && n.type !== 'combinator') {
+            node = n
+          }
+        })
+        selector.insertAfter(node, selectorParser.attribute({
+          attribute: id
+        }))
+      })
+    }).process(node.selector).result
+  })
+
+  // If keyframes are found in this <style>, find and rewrite animation names
+  // in declarations.
+  // Caveat: this only works for keyframes and animation rules in the same
+  // <style> element.
+  if (Object.keys(keyframes).length) {
+    root.walkDecls(decl => {
+      // individual animation-name declaration
+      if (/-?animation-name$/.test(decl.prop)) {
+        decl.value = decl.value.split(',')
+          .map(v => keyframes[v.trim()] || v.trim())
+          .join(',')
+      }
+      // shorthand
+      if (/-?animation$/.test(decl.prop)) {
+        decl.value = decl.value.split(',')
+          .map(v => {
+            const vals = v.split(/\s+/)
+            const name = vals[0]
+            if (keyframes[name]) {
+              return [keyframes[name]].concat(vals.slice(1)).join(' ')
+            } else {
+              return v
             }
           })
-          selector.insertAfter(node, selectorParser.attribute({
-            attribute: opts.id
-          }))
-        })
-      }).process(node.selector).result
+          .join(',')
+      }
     })
-
-    // If keyframes are found in this <style>, find and rewrite animation names
-    // in declarations.
-    // Caveat: this only works for keyframes and animation rules in the same
-    // <style> element.
-    if (Object.keys(keyframes).length) {
-      root.walkDecls(decl => {
-        // individual animation-name declaration
-        if (/-?animation-name$/.test(decl.prop)) {
-          decl.value = decl.value.split(',')
-            .map(v => keyframes[v.trim()] || v.trim())
-            .join(',')
-        }
-        // shorthand
-        if (/-?animation$/.test(decl.prop)) {
-          decl.value = decl.value.split(',')
-            .map(v => {
-              var vals = v.split(/\s+/)
-              var name = vals[0]
-              if (keyframes[name]) {
-                return [keyframes[name]].concat(vals.slice(1)).join(' ')
-              } else {
-                return v
-              }
-            })
-            .join(',')
-        }
-      })
-    }
   }
 })
diff --git a/lib/style-compiler/plugins/trim.js b/lib/style-compiler/plugins/trim.js
index 57163d8da..1eea568bc 100644
--- a/lib/style-compiler/plugins/trim.js
+++ b/lib/style-compiler/plugins/trim.js
@@ -1,11 +1,9 @@
-var postcss = require('postcss')
+const postcss = require('postcss')
 
-module.exports = postcss.plugin('trim', function (opts) {
-  return function (css) {
-    css.walk(function (node) {
-      if (node.type === 'rule' || node.type === 'atrule') {
-        node.raws.before = node.raws.after = '\n'
-      }
-    })
-  }
+module.exports = postcss.plugin('trim', opts => css => {
+  css.walk(({ type, raws }) => {
+    if (type === 'rule' || type === 'atrule') {
+      raws.before = raws.after = '\n'
+    }
+  })
 })
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 459136e44..0546d1383 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -1,38 +1,40 @@
-var prettier = require('prettier')
-var loaderUtils = require('loader-utils')
-var normalize = require('../utils/normalize')
-var compiler = require('vue-template-compiler')
-var transpile = require('vue-template-es2015-compiler')
-var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
-var transformRequire = require('./modules/transform-require')
+const prettier = require('prettier')
+const loaderUtils = require('loader-utils')
+const normalize = require('../utils/normalize')
+const compiler = require('vue-template-compiler')
+const transpile = require('vue-template-es2015-compiler')
+const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
+const transformRequire = require('./modules/transform-require')
 
 module.exports = function (html) {
   this.cacheable()
-  var isServer = this.target === 'node'
-  var isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  var vueOptions = this.options.__vueOptions__ || {}
-  var options = loaderUtils.getOptions(this) || {}
+  const isServer = this.target === 'node'
+  const isProduction = this.minimize || process.env.NODE_ENV === 'production'
+  const vueOptions = this.options.__vueOptions__ || {}
+  const options = loaderUtils.getOptions(this) || {}
 
-  var defaultModules = [transformRequire(options.transformToRequire)]
-  var userModules = vueOptions.compilerModules || options.compilerModules
+  const defaultModules = [transformRequire(options.transformToRequire)]
+  let userModules = vueOptions.compilerModules || options.compilerModules
   // for HappyPack cross-process use cases
   if (typeof userModules === 'string') {
     userModules = require(userModules)
   }
 
-  var compilerOptions = {
+  const compilerOptions = {
     preserveWhitespace: options.preserveWhitespace,
     modules: defaultModules.concat(userModules || []),
-    directives: vueOptions.compilerDirectives || options.compilerDirectives || {},
+    directives:
+      vueOptions.compilerDirectives || options.compilerDirectives || {},
     scopeId: options.hasScoped ? options.id : null,
     comments: options.hasComment
   }
 
-  var compile = isServer && compiler.ssrCompile && vueOptions.optimizeSSR !== false
-    ? compiler.ssrCompile
-    : compiler.compile
+  const compile =
+    isServer && compiler.ssrCompile && vueOptions.optimizeSSR !== false
+      ? compiler.ssrCompile
+      : compiler.compile
 
-  var compiled = compile(html, compilerOptions)
+  const compiled = compile(html, compilerOptions)
 
   // tips
   if (compiled.tips && compiled.tips.length) {
@@ -41,27 +43,35 @@ module.exports = function (html) {
     })
   }
 
-  var code
+  let code
   if (compiled.errors && compiled.errors.length) {
     this.emitError(
       `\n  Error compiling template:\n${pad(html)}\n` +
-      compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
+        compiled.errors.map(e => `  - ${e}`).join('\n') +
+        '\n'
     )
     code = vueOptions.esModule
       ? `var esExports = {render:function(){},staticRenderFns: []}\nexport default esExports`
       : 'module.exports={render:function(){},staticRenderFns:[]}'
   } else {
-    var bubleOptions = options.buble
-    var stripWith = bubleOptions.transforms.stripWith !== false
-    var stripWithFunctional = bubleOptions.transforms.stripWithFunctional
+    const bubleOptions = options.buble
+    const stripWith = bubleOptions.transforms.stripWith !== false
+    const stripWithFunctional = bubleOptions.transforms.stripWithFunctional
 
-    var staticRenderFns = compiled.staticRenderFns.map((fn) => toFunction(fn, stripWithFunctional))
+    const staticRenderFns = compiled.staticRenderFns.map(fn =>
+      toFunction(fn, stripWithFunctional)
+    )
 
-    code = transpile(
-      'var render = ' + toFunction(compiled.render, stripWithFunctional) + '\n' +
-      'var staticRenderFns = [' + staticRenderFns.join(',') + ']',
-      bubleOptions
-    ) + '\n'
+    code =
+      transpile(
+        'var render = ' +
+          toFunction(compiled.render, stripWithFunctional) +
+          '\n' +
+          'var staticRenderFns = [' +
+          staticRenderFns.join(',') +
+          ']',
+        bubleOptions
+      ) + '\n'
 
     // prettify render fn
     if (!isProduction) {
@@ -72,19 +82,25 @@ module.exports = function (html) {
     if (!isProduction && stripWith) {
       code += `render._withStripped = true\n`
     }
-    var exports = `{ render: render, staticRenderFns: staticRenderFns }`
+    const exports = `{ render: render, staticRenderFns: staticRenderFns }`
     code += vueOptions.esModule
       ? `var esExports = ${exports}\nexport default esExports`
       : `module.exports = ${exports}`
   }
   // hot-reload
   if (!isServer && !isProduction) {
-    var exportsName = vueOptions.esModule ? 'esExports' : 'module.exports'
+    const exportsName = vueOptions.esModule ? 'esExports' : 'module.exports'
     code +=
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", ' + exportsName + ')\n' +
+      '     require("' +
+      hotReloadAPIPath +
+      '").rerender("' +
+      options.id +
+      '", ' +
+      exportsName +
+      ')\n' +
       '  }\n' +
       '}'
   }
@@ -93,9 +109,14 @@ module.exports = function (html) {
 }
 
 function toFunction (code, stripWithFunctional) {
-  return 'function (' + (stripWithFunctional ? '_h,_vm' : '') + ') {' + code + '}'
+  return (
+    'function (' + (stripWithFunctional ? '_h,_vm' : '') + ') {' + code + '}'
+  )
 }
 
 function pad (html) {
-  return html.split(/\r?\n/).map(line => `  ${line}`).join('\n')
+  return html
+    .split(/\r?\n/)
+    .map(line => `  ${line}`)
+    .join('\n')
 }
diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index 7d9be15f0..f22d846c3 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -1,12 +1,12 @@
 // vue compiler module for transforming `<tag>:<attribute>` to `require`
 
-var defaultOptions = {
+const defaultOptions = {
   img: 'src',
   image: 'xlink:href'
 }
 
 module.exports = userOptions => {
-  var options = userOptions
+  const options = userOptions
     ? Object.assign({}, defaultOptions, userOptions)
     : defaultOptions
 
@@ -18,9 +18,9 @@ module.exports = userOptions => {
 }
 
 function transform (node, options) {
-  for (var tag in options) {
+  for (const tag in options) {
     if (node.tag === tag && node.attrs) {
-      var attributes = options[tag]
+      const attributes = options[tag]
       if (typeof attributes === 'string') {
         node.attrs.some(attr => rewrite(attr, attributes))
       } else if (Array.isArray(attributes)) {
@@ -32,15 +32,15 @@ function transform (node, options) {
 
 function rewrite (attr, name) {
   if (attr.name === name) {
-    var value = attr.value
-    var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
+    let value = attr.value
+    const isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
     if (!isStatic) {
       return
     }
-    var firstChar = value.charAt(1)
+    const firstChar = value.charAt(1)
     if (firstChar === '.' || firstChar === '~') {
       if (firstChar === '~') {
-        var secondChar = value.charAt(2)
+        const secondChar = value.charAt(2)
         value = '"' + value.slice(secondChar === '/' ? 3 : 2)
       }
       attr.value = `require(${value})`
diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index dd87e858c..abdd7d093 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -1,18 +1,22 @@
 // loader for pre-processing templates with e.g. pug
 
-var cons = require('consolidate')
-var loaderUtils = require('loader-utils')
+const cons = require('consolidate')
+const loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
   this.cacheable && this.cacheable()
-  var callback = this.async()
-  var opt = loaderUtils.getOptions(this) || {}
+  const callback = this.async()
+  const opt = loaderUtils.getOptions(this) || {}
 
   if (!cons[opt.engine]) {
-    return callback(new Error(
-      'Template engine \'' + opt.engine + '\' ' +
-      'isn\'t available in Consolidate.js'
-    ))
+    return callback(
+      new Error(
+        "Template engine '" +
+          opt.engine +
+          "' " +
+          "isn't available in Consolidate.js"
+      )
+    )
   }
 
   // allow passing options to the template preprocessor via `template` option
@@ -23,7 +27,7 @@ module.exports = function (content) {
   // for relative includes
   opt.filename = this.resourcePath
 
-  cons[opt.engine].render(content, opt, function (err, html) {
+  cons[opt.engine].render(content, opt, (err, html) => {
     if (err) {
       return callback(err)
     }
diff --git a/lib/utils/gen-id.js b/lib/utils/gen-id.js
index e09733d47..77504c653 100644
--- a/lib/utils/gen-id.js
+++ b/lib/utils/gen-id.js
@@ -1,13 +1,17 @@
 // utility for generating a uid for each component file
 // used in scoped CSS rewriting
-var path = require('path')
-var hash = require('hash-sum')
-var cache = Object.create(null)
-var sepRE = new RegExp(path.sep.replace('\\', '\\\\'), 'g')
+const path = require('path')
+const hash = require('hash-sum')
+const cache = Object.create(null)
+const sepRE = new RegExp(path.sep.replace('\\', '\\\\'), 'g')
 
 module.exports = function genId (file, context, key) {
-  var contextPath = context.split(path.sep)
-  var rootId = contextPath[contextPath.length - 1]
-  file = rootId + '/' + path.relative(context, file).replace(sepRE, '/') + (key || '')
+  const contextPath = context.split(path.sep)
+  const rootId = contextPath[contextPath.length - 1]
+  file =
+    rootId +
+    '/' +
+    path.relative(context, file).replace(sepRE, '/') +
+    (key || '')
   return cache[file] || (cache[file] = hash(file))
 }
diff --git a/lib/utils/normalize.js b/lib/utils/normalize.js
index dda06ce5d..d0090fdcc 100644
--- a/lib/utils/normalize.js
+++ b/lib/utils/normalize.js
@@ -1,15 +1,15 @@
-var IS_TEST = !!process.env.VUE_LOADER_TEST
-var fs = require('fs')
-var path = require('path')
+const IS_TEST = !!process.env.VUE_LOADER_TEST
+const fs = require('fs')
+const path = require('path')
 
-exports.lib = function (file) {
-  return path.resolve(__dirname, '../', file)
-}
+exports.lib = file => path.resolve(__dirname, '../', file)
 
-exports.dep = function (dep) {
+exports.dep = dep => {
   if (IS_TEST) {
     return dep
-  } else if (fs.existsSync(path.resolve(__dirname, '../../node_modules', dep))) {
+  } else if (
+    fs.existsSync(path.resolve(__dirname, '../../node_modules', dep))
+  ) {
     // npm 2 or npm linked
     return 'vue-loader/node_modules/' + dep
   } else {
diff --git a/lib/utils/try-require.js b/lib/utils/try-require.js
index ccc3f4de5..7a3031328 100644
--- a/lib/utils/try-require.js
+++ b/lib/utils/try-require.js
@@ -1,10 +1,10 @@
-var cwd = process.cwd()
-var resolve = require('resolve')
+const cwd = process.cwd()
+const resolve = require('resolve')
 
 // attempts to first require a dep using projects cwd (when vue-loader is linked)
 // then try a normal require.
 module.exports = function tryRequire (dep) {
-  var fromCwd
+  let fromCwd
   try {
     fromCwd = resolve.sync(dep, { basedir: cwd })
   } catch (e) {}

From 1594dbf222cbb5538ab497fd602fdc45fe1ffd9b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 23:09:00 -0400
Subject: [PATCH 716/877] style: tweaks

---
 lib/loader.js                  | 18 ++++++------------
 lib/template-compiler/index.js |  9 ++-------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index d92900317..a4166fa90 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -344,9 +344,9 @@ module.exports = function (content) {
     // check named exports
     output +=
       'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +
-      'return key !== "default" && key.substr(0, 2) !== "__"' +
+      '  return key !== "default" && key.substr(0, 2) !== "__"' +
       '})) {' +
-      'console.error("named exports are not supported in *.vue files.")' +
+      '  console.error("named exports are not supported in *.vue files.")' +
       '}\n'
   }
 
@@ -368,11 +368,9 @@ module.exports = function (content) {
         }
 
         output +=
-          'var customBlock = ' +
-          requireString +
-          '\n' +
+          'var customBlock = ' + requireString + '\n' +
           'if (typeof customBlock === "function") {' +
-          'customBlock(Component)' +
+          '  customBlock(Component)' +
           '}\n'
       }
     })
@@ -442,9 +440,7 @@ module.exports = function (content) {
 
   function getImport (type, part, index, scoped) {
     return (
-      'import __vue_' +
-      type +
-      '__ from ' +
+      'import __vue_' + type + '__ from ' +
       getRequireString(type, part, index, scoped)
     )
   }
@@ -469,9 +465,7 @@ module.exports = function (content) {
 
   function getImportForImport (type, impt, scoped) {
     return (
-      'import __vue_' +
-      type +
-      '__ from ' +
+      'import __vue_' + type + '__ from ' +
       getRequireForImportString(type, impt, scoped)
     )
   }
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 0546d1383..1dbfffe77 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -94,13 +94,8 @@ module.exports = function (html) {
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("' +
-      hotReloadAPIPath +
-      '").rerender("' +
-      options.id +
-      '", ' +
-      exportsName +
-      ')\n' +
+      '    require("' + hotReloadAPIPath + '")' +
+      '      .rerender("' + options.id + '", ' + exportsName + ')\n' +
       '  }\n' +
       '}'
   }

From 3d8238c9efdde235ab92d2edf8237ea54789ac5b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 23:10:44 -0400
Subject: [PATCH 717/877] bump minumum vue-template-es2015-compiler version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 30fea33c0..73bca2ad8 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "source-map": "^0.6.1",
     "vue-hot-reload-api": "^2.1.0",
     "vue-style-loader": "^3.0.0",
-    "vue-template-es2015-compiler": "^1.5.3"
+    "vue-template-es2015-compiler": "^1.6.0"
   },
   "peerDependencies": {
     "css-loader": "*",

From 94c863cacda80c2b287eb89c7e2e03ff4318f071 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 23:11:21 -0400
Subject: [PATCH 718/877] 13.1.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 186e1456f..453114d88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.5",
+  "version": "13.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 73bca2ad8..4459b6ae4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.0.5",
+  "version": "13.1.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From d4098b77e21dfb00d124bb2ae8a7dd380ba14df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= <t.luenborg@googlemail.com>
Date: Wed, 11 Oct 2017 05:14:56 +0200
Subject: [PATCH 719/877] use chai syntax for mock test example (#864)

since we use mocha&chai in our webpack template, it makes sense that the test examples use that syntax as well.
---
 docs/en/workflow/testing-with-mocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
index 645d81aa5..7cff72e85 100644
--- a/docs/en/workflow/testing-with-mocks.md
+++ b/docs/en/workflow/testing-with-mocks.md
@@ -65,6 +65,6 @@ it('should render', () => {
       'test': ExampleWithMocks
     }
   }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
+  expect(vm.$el.querySelector('.msg').textContent).to.equal('Hello from a mocked service!')
 })
 ```

From 06e97ba37130fc9a94c84a2cef626e658488c731 Mon Sep 17 00:00:00 2001
From: vanhoavn <vanhoa@vhn.vn>
Date: Wed, 11 Oct 2017 10:17:44 +0700
Subject: [PATCH 720/877] remove importLoaders from css modules default options
 (#932)

* remove DEFAULT_OPTIONS

* revert back DEFAULT_OPTIONS for modules option
---
 lib/loader.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index a4166fa90..654e6a11b 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -481,11 +481,11 @@ module.exports = function (content) {
     if (!part.module) return loader
     const option = options.cssModules || {}
     const DEFAULT_OPTIONS = {
-      modules: true,
-      importLoaders: true
+      modules: true
     }
     const OPTIONS = {
-      localIdentName: '[hash:base64]'
+      localIdentName: '[hash:base64]',
+      importLoaders: true
     }
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, (m, $1, $2) => {
       // $1: !css-loader

From 69fd7b02fbf8eeeac8513420364db6d8b65946bb Mon Sep 17 00:00:00 2001
From: AndreKR <haensel@creations.de>
Date: Wed, 11 Oct 2017 05:19:48 +0200
Subject: [PATCH 721/877] Support for srcset (#953)

* Convert img:srcset to require, similar to img:src

* fix srcset import when attribute uses whitespace

covers cases like:
```
<img srcset="
    ../image.jpg 1x,
    ../image.2x.jpg 2x,
    ../image.1920x1280.jpg 1920w
" alt="srcset on multiple lines and with extra whitespace">
```

* Further fixes for whitespace handling

Also added a test for srcset.
---
 lib/template-compiler/index.js                |  4 +-
 .../modules/transform-srcset.js               | 54 +++++++++++++++++++
 test/fixtures/transform.vue                   |  8 +++
 test/test.js                                  | 10 ++++
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 lib/template-compiler/modules/transform-srcset.js

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 1dbfffe77..7eed3a1b4 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -5,6 +5,7 @@ const compiler = require('vue-template-compiler')
 const transpile = require('vue-template-es2015-compiler')
 const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 const transformRequire = require('./modules/transform-require')
+const transformSrcset = require('./modules/transform-srcset')
 
 module.exports = function (html) {
   this.cacheable()
@@ -13,8 +14,9 @@ module.exports = function (html) {
   const vueOptions = this.options.__vueOptions__ || {}
   const options = loaderUtils.getOptions(this) || {}
 
-  const defaultModules = [transformRequire(options.transformToRequire)]
+  const defaultModules = [transformRequire(options.transformToRequire), transformSrcset()]
   let userModules = vueOptions.compilerModules || options.compilerModules
+
   // for HappyPack cross-process use cases
   if (typeof userModules === 'string') {
     userModules = require(userModules)
diff --git a/lib/template-compiler/modules/transform-srcset.js b/lib/template-compiler/modules/transform-srcset.js
new file mode 100644
index 000000000..7e44a60f3
--- /dev/null
+++ b/lib/template-compiler/modules/transform-srcset.js
@@ -0,0 +1,54 @@
+// vue compiler module for transforming `img:srcset` to a number of `require`s
+
+module.exports = function () {
+  return {
+    postTransformNode: node => {
+      transform(node)
+    }
+  }
+}
+
+function transform (node) {
+  const tags = ['img', 'source']
+
+  if (tags.indexOf(node.tag) !== -1 && node.attrs) {
+    node.attrs.forEach(attr => {
+      if (attr.name === 'srcset') {
+        // same logic as in transform-require.js
+        var value = attr.value
+        var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
+        if (!isStatic) {
+          return
+        }
+
+        // http://w3c.github.io/html/semantics-embedded-content.html#ref-for-image-candidate-string-5
+        const escapedSpaceCharacters = /( |\\t|\\n|\\f|\\r)+/g
+
+        const imageCandidates = value.substr(1, value.length - 2).split(',').map(s => {
+          // The attribute value arrives here with all whitespace, except normal spaces, represented by escape sequences
+          const [url, descriptor] = s.replace(escapedSpaceCharacters, ' ').trim().split(' ', 2)
+          return { require: urlToRequire(url), descriptor: descriptor }
+        })
+
+        let code = ''
+        imageCandidates.forEach((o, i, a) => {
+          code += o.require + ' + " ' + o.descriptor + (i < a.length - 1 ? ', " + ' : '"')
+        })
+
+        attr.value = code
+      }
+    })
+  }
+}
+
+function urlToRequire (url) {
+  // same logic as in transform-require.js
+  var firstChar = url.charAt(0)
+  if (firstChar === '.' || firstChar === '~') {
+    if (firstChar === '~') {
+      var secondChar = url.charAt(1)
+      url = '"' + url.slice(secondChar === '/' ? 2 : 1)
+    }
+    return `require("${url}")`
+  }
+}
diff --git a/test/fixtures/transform.vue b/test/fixtures/transform.vue
index 33442c644..1e358f890 100644
--- a/test/fixtures/transform.vue
+++ b/test/fixtures/transform.vue
@@ -4,6 +4,14 @@
   <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink= "http://www.w3.org/1999/xlink">
     <image xlink:href="./logo.png" />
   </svg>
+  <img src="./logo.png" srcset="./logo.png 2x">
+  <img src="./logo.png" srcset="./logo.png 2x, ./logo.png 3x">
+  <img
+    src="./logo.png"
+    srcset="
+      ./logo.png 2x,
+      ./logo.png 3x
+  ">
 </div>
 </template>
 
diff --git a/test/test.js b/test/test.js
index 0e461a40b..9e921e811 100644
--- a/test/test.js
+++ b/test/test.js
@@ -434,6 +434,16 @@ describe('vue-loader', function () {
       // image tag (SVG)
       expect(includeDataURL(vnode.children[2].children[0].data.attrs['xlink:href'])).to.equal(true)
       var style = window.document.querySelector('style').textContent
+
+      let dataURL = vnode.children[0].data.attrs.src
+
+      // image tag with srcset
+      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL + " 2x")
+      // image tag with srcset with two candidates
+      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + " 2x, " + dataURL + " 3x")
+      // image tag with multiline srcset
+      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + " 2x, " + dataURL + " 3x")
+
       // style
       expect(includeDataURL(style)).to.equal(true)
       done()

From 60d7dcd665f9ccf91de51cb5bae74e5d6fd2c34e Mon Sep 17 00:00:00 2001
From: Constantine Genchevsky <const.gen@gmail.com>
Date: Wed, 11 Oct 2017 06:22:19 +0300
Subject: [PATCH 722/877] Trim styles after all postcss plugins (#939)

---
 lib/style-compiler/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index f886b0971..42dae638f 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -27,7 +27,7 @@ module.exports = function (css, map) {
 
   loadPostcssConfig(this, vueOptions.postcss)
     .then(config => {
-      const plugins = [trim].concat(config.plugins)
+      const plugins = config.plugins.concat(trim)
       const options = Object.assign(
         {
           to: this.resourcePath,

From 94d374b318be33c91306631d0f1482f61a00e63d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 10 Oct 2017 23:43:22 -0400
Subject: [PATCH 723/877] feat: support configuring postcss config root path

---
 lib/style-compiler/load-postcss-config.js |  2 +-
 test/test.js                              | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index ff5a994cb..ba109f8f6 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -10,7 +10,7 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig) {
   if (process.env.VUE_LOADER_TEST || !loaded) {
     loaded = load(
       { webpack: loaderContext },
-      null,
+      isObject(inlineConfig) && inlineConfig.configRoot,
       { argv: false }
     ).catch(() => {
       // postcss-load-config throws error when no config file is found,
diff --git a/test/test.js b/test/test.js
index 9e921e811..44fbeaa0d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -481,6 +481,24 @@ describe('vue-loader', function () {
     })
   })
 
+  it('load postcss config file by path', done => {
+    fs.writeFileSync('test/.postcssrc', JSON.stringify({ parser: 'sugarss' }))
+    test({
+      entry: './test/fixtures/postcss.vue',
+      vue: {
+        postcss: {
+          configRoot: path.resolve('test')
+        }
+      }
+    }, (window) => {
+      var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      fs.unlinkSync('test/.postcssrc')
+      done()
+    })
+  })
+
   it('transpile ES2015 features in template', done => {
     test({
       entry: './test/fixtures/es2015.vue'

From 1123b12c8a917459127afc6118a132bc9fa9c834 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 00:19:20 -0400
Subject: [PATCH 724/877] feat: cacheBusting opiton (close #987)

---
 lib/loader.js   |  8 +++++---
 lib/parser.js   |  6 ++++--
 lib/selector.js |  2 +-
 test/test.js    | 32 ++++++++++++++++++++++++++++----
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 654e6a11b..2cca97f06 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -81,6 +81,7 @@ module.exports = function (content) {
     (this._compiler && this._compiler.context) ||
     this.options.context ||
     process.cwd()
+  const sourceRoot = path.dirname(path.relative(context, filePath))
   const moduleId = 'data-v-' + genId(filePath, context, options.hashKey)
   const shortFilePath = path
     .relative(context, filePath)
@@ -98,7 +99,8 @@ module.exports = function (content) {
     hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
 
   let output = ''
-  const parts = parse(content, fileName, this.sourceMap)
+  const bustCache = !isProduction && options.cacheBusting !== false
+  const parts = parse(content, fileName, this.sourceMap, sourceRoot, bustCache)
   const hasScoped = parts.styles.some(({ scoped }) => scoped)
   const templateAttrs =
     parts.template && parts.template.attrs && parts.template.attrs
@@ -652,8 +654,8 @@ module.exports = function (content) {
       (type === 'script' || type === 'template' || type === 'styles'
         ? type
         : 'customBlocks') +
-      '&index=' +
-      index +
+      '&index=' + index +
+      (bustCache ? '&bustCache' : '') +
       '!'
     )
   }
diff --git a/lib/parser.js b/lib/parser.js
index 8e71760a2..d26cc76a1 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -6,10 +6,12 @@ const SourceMapGenerator = require('source-map').SourceMapGenerator
 const splitRE = /\r?\n/g
 const emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = (content, filename, needMap, sourceRoot) => {
+module.exports = (content, filename, needMap, sourceRoot, bustCache) => {
   const cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
-  const filenameWithHash = filename + '?' + cacheKey
+  const filenameWithHash = bustCache
+    ? filename + '?' + cacheKey
+    : filename
   let output = cache.get(cacheKey)
   if (output) return output
   output = compiler.parseComponent(content, { pad: 'line' })
diff --git a/lib/selector.js b/lib/selector.js
index e344d42e8..f6739a4e1 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -13,7 +13,7 @@ module.exports = function (content) {
   let filename = path.basename(this.resourcePath)
   filename = filename.substring(0, filename.lastIndexOf(path.extname(filename))) + '.vue'
   const sourceRoot = path.dirname(path.relative(context, this.resourcePath))
-  const parts = parse(content, filename, this.sourceMap, sourceRoot)
+  const parts = parse(content, filename, this.sourceMap, sourceRoot, query.bustCache)
   let part = parts[query.type]
   if (Array.isArray(part)) {
     part = part[query.index]
diff --git a/test/test.js b/test/test.js
index 44fbeaa0d..3ee73f736 100644
--- a/test/test.js
+++ b/test/test.js
@@ -435,14 +435,14 @@ describe('vue-loader', function () {
       expect(includeDataURL(vnode.children[2].children[0].data.attrs['xlink:href'])).to.equal(true)
       var style = window.document.querySelector('style').textContent
 
-      let dataURL = vnode.children[0].data.attrs.src
+      const dataURL = vnode.children[0].data.attrs.src
 
       // image tag with srcset
-      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL + " 2x")
+      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL + ' 2x')
       // image tag with srcset with two candidates
-      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + " 2x, " + dataURL + " 3x")
+      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
       // image tag with multiline srcset
-      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + " 2x, " + dataURL + " 3x")
+      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
 
       // style
       expect(includeDataURL(style)).to.equal(true)
@@ -960,6 +960,30 @@ describe('vue-loader', function () {
     })
   })
 
+  it('cacheBusting: false', done => {
+    test({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        cacheBusting: false
+      }
+    }, (window, module, rawModule) => {
+      var vnode = mockRender(module, {
+        msg: 'hi'
+      })
+
+      // <h2 class="red">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('red')
+      expect(vnode.children[0].text).to.equal('hi')
+
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      var style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
+      done()
+    })
+  })
+
   // Vue required tests for more complete test cases
   // this test case requires Vue >= 2.5
   if (Number(Vue.version.split('.')[1]) >= 5) {

From 5eb192d3d587fa5efa98195df58c171e5443d353 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 00:20:08 -0400
Subject: [PATCH 725/877] 13.2.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 453114d88..b7c5eb710 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4459b6ae4..1739b5c13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.1.0",
+  "version": "13.2.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 19c5414f54f8f0f75d39142a74652c333e3c63f6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 00:34:45 -0400
Subject: [PATCH 726/877] docs: document new features in 13.1.0 & 13.2.0

---
 docs/en/features/functioanl-template.md | 13 +++++++++++++
 docs/en/options.md                      | 24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 docs/en/features/functioanl-template.md

diff --git a/docs/en/features/functioanl-template.md b/docs/en/features/functioanl-template.md
new file mode 100644
index 000000000..9610390a9
--- /dev/null
+++ b/docs/en/features/functioanl-template.md
@@ -0,0 +1,13 @@
+# Template for Functional Components
+
+> New in 13.1.0, requires Vue >= 2.5.0
+
+To denote a template that should be compiled as a functional component, add the `functional` attribute to the template block. This also allows omitting the `functional` option in the `<script>` block.
+
+Expressions in the template are evaluated in the [functional render context](https://vuejs.org/v2/guide/render-function.html#Functional-Components). This means props need to be accessed as `props.xxx` in the template:
+
+``` html
+<template functional>
+  <div>{{ props.foo }}</div>
+</template>
+```
diff --git a/docs/en/options.md b/docs/en/options.md
index fde81e4e2..117c1a2af 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -112,6 +112,21 @@ module.exports = {
   }
   ```
 
+### postcss.configRoot
+
+> New in 13.2.0
+
+- type: `string`
+- default: `process.cwd()`
+
+  Specify an alternative root directory for [postcss-load-config](https://github.com/michael-ciniawsky/postcss-load-config) to search for PostCSS config files in.
+
+  ``` js
+  postcss: {
+    configRoot: path.resolve('./src')
+  }
+  ```
+
 ### cssSourceMap
 
 - type: `boolean`
@@ -276,3 +291,12 @@ module.exports = {
 - default: `true` when the webpack config has `target: 'node'` and `vue-template-compiler` is at version 2.4.0 or above.
 
 Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees returned by render functions into plain strings, which improves SSR performance. In some cases you might want to explicitly turn it off because the resulting render functions can only be used for SSR and cannot be used for client-side rendering or testing.
+
+### cacheBusting
+
+> New in 13.2.0
+
+- type: `boolean`
+- default: `true` in development mode, `false` in production mode.
+
+Whether generate source maps with cache busting by appending a hash query to the file name. Turning this off can help with source map debugging.

From 37de90a39be114f2aa77d43835b067a1dbb158a6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 00:59:27 -0400
Subject: [PATCH 727/877] align postcss config API with postcss-loader

---
 docs/LANGS.md                             |  5 ----
 docs/en/SUMMARY.md                        |  2 ++
 docs/en/options.md                        | 30 +++++++++++++++--------
 lib/style-compiler/load-postcss-config.js | 18 ++++++++------
 test/test.js                              |  4 ++-
 5 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/docs/LANGS.md b/docs/LANGS.md
index e8bff3d04..25b60e8a0 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1,6 +1 @@
 * [English](en/)
-* [한국어](kr/)
-* [Русский](ru/)
-* [Português](pt_BR/)
-* [日本語](ja/)
-* [中文](zh-cn/)
diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index c2d08b1b7..d179c5e02 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -23,6 +23,7 @@
   - [preLoaders](options.md#preloaders)
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
+  - [postcss.config](options.md#postcssconfig)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
@@ -32,3 +33,4 @@
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
   - [optimizeSSR](options.md#optimizessr)
+  - [cacheBusting](options.md#cachebusting)
diff --git a/docs/en/options.md b/docs/en/options.md
index 117c1a2af..dde4eb721 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -112,20 +112,30 @@ module.exports = {
   }
   ```
 
-### postcss.configRoot
+### postcss.config
 
-> New in 13.2.0
+> New in 13.2.1
 
-- type: `string`
-- default: `process.cwd()`
+- type: `Object`
+- default: `undefined`
 
-  Specify an alternative root directory for [postcss-load-config](https://github.com/michael-ciniawsky/postcss-load-config) to search for PostCSS config files in.
+  This field allows customizing PostCSS config in the same way as [postcss-loader](https://github.com/postcss/postcss-loader#config-1).
 
-  ``` js
-  postcss: {
-    configRoot: path.resolve('./src')
-  }
-  ```
+  - **postcss.config.path**
+
+    Specify a path (file or directory) to load the PostCSS config file from.
+
+    ``` js
+    postcss: {
+      config: {
+        path: path.resolve('./src')
+      }
+    }
+    ```
+
+  - **postcss.config.ctx**
+
+    Provide context to PostCSS plugins. See [postcss-loader docs](https://github.com/postcss/postcss-loader#context-ctx) for more details.
 
 ### cssSourceMap
 
diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index ba109f8f6..3cc5eccd3 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -6,15 +6,19 @@ function isObject (val) {
   return val && typeof val === 'object'
 }
 
-module.exports = function loadPostcssConfig (loaderContext, inlineConfig) {
+module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
   if (process.env.VUE_LOADER_TEST || !loaded) {
-    loaded = load(
-      { webpack: loaderContext },
-      isObject(inlineConfig) && inlineConfig.configRoot,
-      { argv: false }
-    ).catch(() => {
+    const config = inlineConfig.config || {}
+    const ctx = { webpack: loaderContext }
+    if (config.ctx) {
+      ctx.options = config.ctx
+    }
+    loaded = load(ctx, config.path, { argv: false }).catch(err => {
       // postcss-load-config throws error when no config file is found,
-      // but for us it's optional.
+      // but for us it's optional. only emit other errors
+      if (err.message.indexOf('No PostCSS Config found') < 0) {
+        loaderContext.emitError(err)
+      }
     })
   }
 
diff --git a/test/test.js b/test/test.js
index 3ee73f736..36202f0fc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -487,7 +487,9 @@ describe('vue-loader', function () {
       entry: './test/fixtures/postcss.vue',
       vue: {
         postcss: {
-          configRoot: path.resolve('test')
+          config: {
+            path: path.resolve('test')
+          }
         }
       }
     }, (window) => {

From b1010d454c8a4b785b7b68ba6643d812ed6b20cc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 00:59:39 -0400
Subject: [PATCH 728/877] 13.2.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b7c5eb710..5993e8f1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.2.0",
+  "version": "13.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1739b5c13..c6eef3b7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.2.0",
+  "version": "13.2.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From f5b944b3f7bc68d7e4afe7abbb4a8036301f76c0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 01:02:15 -0400
Subject: [PATCH 729/877] docs: restore langs

---
 docs/LANGS.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/LANGS.md b/docs/LANGS.md
index 25b60e8a0..e8bff3d04 100644
--- a/docs/LANGS.md
+++ b/docs/LANGS.md
@@ -1 +1,6 @@
 * [English](en/)
+* [한국어](kr/)
+* [Русский](ru/)
+* [Português](pt_BR/)
+* [日本語](ja/)
+* [中文](zh-cn/)

From c7b53769c9810fee05a6b3037a6cb3ce3484643f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 13:08:36 -0400
Subject: [PATCH 730/877] improve hot-reload support for functional components
 and bump vue-hot-reload-api version

---
 lib/component-normalizer.js |  3 +++
 lib/loader.js               | 12 +++++-------
 package.json                |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/component-normalizer.js b/lib/component-normalizer.js
index ab3b6a9d6..e6b13fc04 100644
--- a/lib/component-normalizer.js
+++ b/lib/component-normalizer.js
@@ -84,6 +84,9 @@ module.exports = function normalizeComponent (
         ? [].concat(existing, hook)
         : [hook]
     } else {
+      // for template-only hot-reload because in that case the render fn doesn't
+      // go through the normalizer
+      options._injectStyles = hook
       // register for functioal component in vue file
       options.render = function renderWithStyleInjection (h, context) {
         hook.call(context)
diff --git a/lib/loader.js b/lib/loader.js
index 2cca97f06..a39155a47 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -386,17 +386,13 @@ module.exports = function (content) {
       output +=
         '\n/* hot reload */\n' +
         'if (module.hot) {(function () {\n' +
-        '  var hotAPI = require("' +
-        hotReloadAPIPath +
-        '")\n' +
+        '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
         '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
         '  module.hot.accept()\n' +
         '  if (!module.hot.data) {\n' +
         // initial insert
-        '    hotAPI.createRecord("' +
-        moduleId +
-        '", Component.options)\n' +
+        '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
         '  } else {\n'
       // update
       if (cssModules) {
@@ -406,7 +402,9 @@ module.exports = function (content) {
           '    }\n'
       }
       output +=
-        '    hotAPI.reload("' + moduleId + '", Component.options)\n' + '  }\n'
+        `    hotAPI.${
+          functionalTemplate ? 'rerender' : 'reload'
+        }("${moduleId}", Component.options)\n' + '  }\n`
       // dispose
       output +=
         '  module.hot.dispose(function (data) {\n' +
diff --git a/package.json b/package.json
index c6eef3b7f..d398c124a 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "prettier": "^1.7.0",
     "resolve": "^1.4.0",
     "source-map": "^0.6.1",
-    "vue-hot-reload-api": "^2.1.0",
+    "vue-hot-reload-api": "^2.2.0",
     "vue-style-loader": "^3.0.0",
     "vue-template-es2015-compiler": "^1.6.0"
   },

From be36c018beae7fbb8779b8b0f1730c1f57c6d0b4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 11 Oct 2017 13:09:40 -0400
Subject: [PATCH 731/877] 13.3.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5993e8f1c..ba7a2603c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.2.1",
+  "version": "13.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d398c124a..4abd45807 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.2.1",
+  "version": "13.3.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 250ba3aff7299dd7fe20972959da52b92188cd0b Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Thu, 12 Oct 2017 11:36:53 +0300
Subject: [PATCH 732/877] Rename functioanl-template.md to
 functional-template.md (#999)

---
 .../features/{functioanl-template.md => functional-template.md}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/en/features/{functioanl-template.md => functional-template.md} (100%)

diff --git a/docs/en/features/functioanl-template.md b/docs/en/features/functional-template.md
similarity index 100%
rename from docs/en/features/functioanl-template.md
rename to docs/en/features/functional-template.md

From e6d5e3d6b2c35bea57e88cd2251ff8a93add16c8 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Thu, 12 Oct 2017 11:37:33 +0300
Subject: [PATCH 733/877] [RU] Translation update (#1000)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён
---
 docs/ru/SUMMARY.md                      |  2 ++
 docs/ru/features/functional-template.md | 13 +++++++++
 docs/ru/options.md                      | 36 ++++++++++++++++++++++++-
 docs/ru/workflow/testing-with-mocks.md  |  2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 docs/ru/features/functional-template.md

diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index cc830c1a7..978eeea32 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -23,6 +23,7 @@
   - [preLoaders](options.md#preloaders)
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
+  - [postcss.config](options.md#postcssconfig)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
@@ -32,3 +33,4 @@
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
   - [optimizeSSR](options.md#optimizessr)
+  - [cacheBusting](options.md#cachebusting)
\ No newline at end of file
diff --git a/docs/ru/features/functional-template.md b/docs/ru/features/functional-template.md
new file mode 100644
index 000000000..cc1e9dcb7
--- /dev/null
+++ b/docs/ru/features/functional-template.md
@@ -0,0 +1,13 @@
+# Шаблоны для функциональных компонентов
+
+> Добавлено в версии 13.1.0, требует версии Vue 2.5.0+
+
+Чтобы обозначить шаблон, который должен быть скомпилирован как функциональный компонент, добавьте атрибут `functional` в тег шаблона. Это также позволяет опустить опцию `functional` в теге `<script>`.
+
+Выражения в шаблоне исполняются в [контексте функционального рендеринга](https://ru.vuejs.org/v2/guide/render-function.html#Функциональные-компоненты). Это означает, что обращаться к входным параметрам в шаблоне следует через `props.xxx`:
+
+``` html
+<template functional>
+  <div>{{ props.foo }}</div>
+</template>
+```
diff --git a/docs/ru/options.md b/docs/ru/options.md
index d39930d90..0f371327b 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -112,6 +112,31 @@ module.exports = {
   }
   ```
 
+### postcss.config
+
+> Добавлено в версии 13.2.1
+
+- Тип: `Object`
+- По умолчанию: `undefined`
+
+  Эта опция позволяет настроить конфигурацию PostCSS, таким же образом как и [postcss-loader](https://github.com/postcss/postcss-loader#config-1).
+
+  - **postcss.config.path**
+
+    Указывает путь (файл или каталог) для загрузки конфигурационного файла PostCSS.
+
+    ```js
+    postcss: {
+      config: {
+        path: path.resolve('./src')
+      }
+    }
+    ```
+
+  - **postcss.config.ctx**
+
+    Предоставляет контекст для плагинов PostCSS. См. подробнее в [документации postcss-loader](https://github.com/postcss/postcss-loader#context-ctx).
+
 ### cssSourceMap
 
 - Тип: `boolean`
@@ -275,4 +300,13 @@ module.exports = {
 - Тип: `boolean`
 - По умолчанию: `true` когда конфигурация Webpack имеет `target: 'node'` и версия `vue-template-compiler` 2.4.0 или выше.
 
-Включает оптимизацию компиляции в Vue 2.4 SSR, которая компилирует в простые строки часть деревьев vdom возвращаемых render-функциями, что улучшает производительность SSR. В некоторых случаях вам может потребоваться явно отключить оптимизацию, поскольку результирующие render-функции могут быть использованы только для SSR и не могут использоваться для рендеринга на стороне клиента или тестирования.
\ No newline at end of file
+Включает оптимизацию компиляции в Vue 2.4 SSR, которая компилирует в простые строки часть деревьев vdom возвращаемых render-функциями, что улучшает производительность SSR. В некоторых случаях вам может потребоваться явно отключить оптимизацию, поскольку результирующие render-функции могут быть использованы только для SSR и не могут использоваться для рендеринга на стороне клиента или тестирования.
+
+### cacheBusting
+
+> Добавлено в версии 13.2.0
+
+- Тип: `boolean`
+- По умолчанию: `true` в режиме разработки, `false` в режиме production.
+
+Генерировать ли source maps при перезагрузке кэша, добавив хэш-запрос в имени файла. Выключение этой опции может помочь при отладке с использованием source map.
\ No newline at end of file
diff --git a/docs/ru/workflow/testing-with-mocks.md b/docs/ru/workflow/testing-with-mocks.md
index 1b7b7a6ff..57b4e6cd5 100644
--- a/docs/ru/workflow/testing-with-mocks.md
+++ b/docs/ru/workflow/testing-with-mocks.md
@@ -67,6 +67,6 @@ it('should render', () => {
       'test': ExampleWithMocks
     }
   }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).toBe('Привет от мок-сервиса!')
+  expect(vm.$el.querySelector('.msg').textContent).to.equal('Привет от мок-сервиса!')
 })
 ```

From dfbd07d3140557429c1eab9d3cda455c9743b47b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 12 Oct 2017 12:33:40 -0400
Subject: [PATCH 734/877] docs: include functional support in summary

---
 docs/en/SUMMARY.md                                         | 1 +
 docs/en/features/{functional-template.md => functioanl.md} | 2 ++
 2 files changed, 3 insertions(+)
 rename docs/en/features/{functional-template.md => functioanl.md} (75%)

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index d179c5e02..0fd34890f 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -7,6 +7,7 @@
   - [CSS Modules](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [Hot Reload](features/hot-reload.md)
+  - [Functional Components](features/functional.md)
 - Configurations
   - [Pre-Processors](configurations/pre-processors.md)
   - [Asset URL Handling](configurations/asset-url.md)
diff --git a/docs/en/features/functional-template.md b/docs/en/features/functioanl.md
similarity index 75%
rename from docs/en/features/functional-template.md
rename to docs/en/features/functioanl.md
index 9610390a9..a0c619453 100644
--- a/docs/en/features/functional-template.md
+++ b/docs/en/features/functioanl.md
@@ -2,6 +2,8 @@
 
 > New in 13.1.0, requires Vue >= 2.5.0
 
+With `vue-loader >= 13.3.0`, functional components defined as a Single-File Component in a `*.vue` file now enjoys proper template compilation, Scoped CSS and hot-reloading support.
+
 To denote a template that should be compiled as a functional component, add the `functional` attribute to the template block. This also allows omitting the `functional` option in the `<script>` block.
 
 Expressions in the template are evaluated in the [functional render context](https://vuejs.org/v2/guide/render-function.html#Functional-Components). This means props need to be accessed as `props.xxx` in the template:

From 60b8e5e49e4aa904f6d62266c5108c224b2e3139 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 12 Oct 2017 12:36:39 -0400
Subject: [PATCH 735/877] docs: rename

---
 docs/ru/features/{functional-template.md => functional.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/ru/features/{functional-template.md => functional.md} (100%)

diff --git a/docs/ru/features/functional-template.md b/docs/ru/features/functional.md
similarity index 100%
rename from docs/ru/features/functional-template.md
rename to docs/ru/features/functional.md

From dffe2a0695c0c717ad5a9f570fd2e0c9ade0438f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 12 Oct 2017 23:15:46 -0400
Subject: [PATCH 736/877] docs: fix file name

---
 docs/en/features/{functioanl.md => functional.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/en/features/{functioanl.md => functional.md} (100%)

diff --git a/docs/en/features/functioanl.md b/docs/en/features/functional.md
similarity index 100%
rename from docs/en/features/functioanl.md
rename to docs/en/features/functional.md

From 91a6426d18939066e6124283025c50841b61277a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 13 Oct 2017 00:40:56 -0400
Subject: [PATCH 737/877] chore: bump vue

---
 package-lock.json | 36 ++++++++++-----------
 package.json      |  8 ++---
 test/test.js      | 80 ++++++++++++++++++++++-------------------------
 3 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ba7a2603c..05d2c9d96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9251,20 +9251,20 @@
       "dev": true
     },
     "vue": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz",
-      "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.0.tgz",
+      "integrity": "sha512-KngZQLLe/N2Bvl3qu0xgqQHemm9MNz9y73D7yJ5tVavOKyhSgCLARYzrXJzYtoeadUSrItzV36VrHywLGVUx7w==",
       "dev": true
     },
     "vue-hot-reload-api": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.1.1.tgz",
-      "integrity": "sha512-oHuG8rOJ/b8wKVZJBx3HvLyOk9klqjUpjd6YlJQ1aHy1yGyBgy62BphQ13+Tuzsxl52ZNV5EQSvd385mTPMxdg=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz",
+      "integrity": "sha512-Hn0jdFiNfNx4+Nxz1vokYUsP3mwpn9r/XomLrXA+KafYaiR7LNQG1fxtpVklD4KxD5GluXRiSoWNDf0H9BdsJw=="
     },
     "vue-server-renderer": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz",
-      "integrity": "sha512-qSaNqInt4bJLsIFBU7fNgSTvpYzWJWe+zUkbSdKaFhMGhI/GNFUghK4VZX3ETvBNX51DYa4kEmZgSVZ70xWdxQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.5.0.tgz",
+      "integrity": "sha512-MtezRePHgGvof90VfBL3GkdYc8ZFYLvk7IDJ4JP8g7PcBZ3im+yn1edYGBeYdN15T9UFlZnROSf/1M6fBBnP1Q==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
@@ -9320,9 +9320,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz",
-      "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.0.tgz",
+      "integrity": "sha512-W4hDoXXpCwfilO1MRTDM4EHm1DC1mU1wS8WyvEo119cUtxdaPuq/dD0OJbSEIkeW8fdT07qGCSnLOfPlmrKRqw==",
       "dev": true,
       "requires": {
         "de-indent": "1.0.2",
@@ -9330,9 +9330,9 @@
       }
     },
     "vue-template-es2015-compiler": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz",
-      "integrity": "sha512-j3TBDtjqz7pC9XUzeSeqF5oekqPahxyUHsdG+kZKDH/V/DTexq5inYdLGstnqCUljoLC9LTj3H/5hmyToeSd1A=="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz",
+      "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg=="
     },
     "watchpack": {
       "version": "1.4.0",
@@ -9352,9 +9352,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz",
-      "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.7.1.tgz",
+      "integrity": "sha512-8MR+gVfxsvtx4J1UlbRGkUJEpDQUBFmisRmpPO5cVLgF21R8UMChX39OOjDz63a+m/iswGoqATszdZB2VCsYuA==",
       "dev": true,
       "requires": {
         "acorn": "5.1.2",
diff --git a/package.json b/package.json
index 4abd45807..376ad79d1 100644
--- a/package.json
+++ b/package.json
@@ -94,9 +94,9 @@
     "stylus-loader": "^3.0.1",
     "sugarss": "^1.0.0",
     "url-loader": "^0.6.2",
-    "vue": "^2.4.4",
-    "vue-server-renderer": "^2.4.4",
-    "vue-template-compiler": "^2.4.4",
-    "webpack": "^3.4.1"
+    "vue": "^2.5.0",
+    "vue-server-renderer": "^2.5.0",
+    "vue-template-compiler": "^2.5.0",
+    "webpack": "^3.7.1"
   }
 }
diff --git a/test/test.js b/test/test.js
index 36202f0fc..bef9fd082 100644
--- a/test/test.js
+++ b/test/test.js
@@ -986,48 +986,44 @@ describe('vue-loader', function () {
     })
   })
 
-  // Vue required tests for more complete test cases
-  // this test case requires Vue >= 2.5
-  if (Number(Vue.version.split('.')[1]) >= 5) {
-    it('functional template', done => {
-      test({
-        entry: './test/fixtures/functional-root.vue',
-        vue: {
-          preserveWhitespace: false
+  it('functional template', done => {
+    test({
+      entry: './test/fixtures/functional-root.vue',
+      vue: {
+        preserveWhitespace: false
+      }
+    }, (window, module) => {
+      expect(module.components.Functional._compiled).to.equal(true)
+      expect(module.components.Functional.functional).to.equal(true)
+      expect(module.components.Functional.staticRenderFns).to.exist
+      expect(module.components.Functional.render).to.be.a('function')
+
+      const vnode = mockRender(module, {
+        fn () {
+          done()
         }
-      }, (window, module) => {
-        expect(module.components.Functional._compiled).to.equal(true)
-        expect(module.components.Functional.functional).to.equal(true)
-        expect(module.components.Functional.staticRenderFns).to.exist
-        expect(module.components.Functional.render).to.be.a('function')
-
-        const vnode = mockRender(module, {
-          fn () {
-            done()
-          }
-        }).children[0]
-
-        // Basic vnode
-        expect(vnode.children[0].data.staticClass).to.equal('red')
-        expect(vnode.children[0].children[0].text).to.equal('hello')
-        // Default slot vnode
-        expect(vnode.children[1].tag).to.equal('span')
-        expect(vnode.children[1].children[0].text).to.equal('hello')
-        // Named slot vnode
-        expect(vnode.children[2].tag).to.equal('div')
-        expect(vnode.children[2].children[0].text).to.equal('Second slot')
-        // // Scoped slot vnode
-        expect(vnode.children[3].text).to.equal('hello')
-        // // Static content vnode
-        expect(vnode.children[4].tag).to.equal('div')
-        expect(vnode.children[4].children[0].text).to.equal('Some ')
-        expect(vnode.children[4].children[1].tag).to.equal('span')
-        expect(vnode.children[4].children[1].children[0].text).to.equal('text')
-        // // v-if vnode
-        expect(vnode.children[5].text).to.equal('')
-
-        vnode.children[6].data.on.click()
-      })
+      }).children[0]
+
+      // Basic vnode
+      expect(vnode.children[0].data.staticClass).to.equal('red')
+      expect(vnode.children[0].children[0].text).to.equal('hello')
+      // Default slot vnode
+      expect(vnode.children[1].tag).to.equal('span')
+      expect(vnode.children[1].children[0].text).to.equal('hello')
+      // Named slot vnode
+      expect(vnode.children[2].tag).to.equal('div')
+      expect(vnode.children[2].children[0].text).to.equal('Second slot')
+      // // Scoped slot vnode
+      expect(vnode.children[3].text).to.equal('hello')
+      // // Static content vnode
+      expect(vnode.children[4].tag).to.equal('div')
+      expect(vnode.children[4].children[0].text).to.equal('Some ')
+      expect(vnode.children[4].children[1].tag).to.equal('span')
+      expect(vnode.children[4].children[1].children[0].text).to.equal('text')
+      // // v-if vnode
+      expect(vnode.children[5].text).to.equal('')
+
+      vnode.children[6].data.on.click()
     })
-  }
+  })
 })

From 07fb6c1e3c609b3f5128e51cdcce90e868a99b84 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Sat, 14 Oct 2017 01:44:36 +0900
Subject: [PATCH 738/877] docs(ja): update ja docs (#1006)

---
 docs/ja/SUMMARY.md             |  3 +++
 docs/ja/features/functional.md | 15 +++++++++++++++
 docs/ja/options.md             | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 docs/ja/features/functional.md

diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
index 12babb1ac..cf00a72aa 100644
--- a/docs/ja/SUMMARY.md
+++ b/docs/ja/SUMMARY.md
@@ -7,6 +7,7 @@
   - [CSS モジュール](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [ホットリロード](features/hot-reload.md)
+  - [関数型コンポーネント](features/functional.md)
 - 構成
   - [プリプロセッサの使用](configurations/pre-processors.md)
   - [アセット URL ハンドリング](configurations/asset-url.md)
@@ -23,6 +24,7 @@
   - [preLoaders](options.md#preloaders)
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
+  - [postcss.config](options.md#postcssconfig)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
@@ -32,3 +34,4 @@
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
   - [optimizeSSR](options.md#optimizessr)
+  - [cacheBusting](options.md#cachebusting)
diff --git a/docs/ja/features/functional.md b/docs/ja/features/functional.md
new file mode 100644
index 000000000..8e2f42699
--- /dev/null
+++ b/docs/ja/features/functional.md
@@ -0,0 +1,15 @@
+# 関数型コンポーネント向けのテンプレート
+
+> 13.1.0 で新規, Vue >= 2.5.0 必須
+
+`vue-loader >= 13.3.0` によって、`*.vue` 内で単一ファイルコンポーネントとして定義された関数型コンポーネントは適切なテンプレートコンパイルを楽しむことができ、スコープ付き CSS そしてホットリロードをサポートします。
+
+関数型コンポーネントとしてコンパイルする必要があるテンプレートを示すには、テンプレートブロックに `functional` 属性を追加します。これにより、`<script>` ブロックの `functional` オプションを省略することもできます。
+
+テンプレート内の式は、[関数型の描画コンテキスト](https://jp.vuejs.org/v2/guide/render-function.html#関数型コンポーネント)で評価されます。これは、プロパティはテンプレートで `props.xxx` としてアクセスする必要があるということを意味します:
+
+``` html
+<template functional>
+  <div>{{ props.foo }}</div>
+</template>
+```
diff --git a/docs/ja/options.md b/docs/ja/options.md
index cd38ef9d6..d6982b265 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -111,6 +111,31 @@ module.exports = {
   }
   ```
 
+### postcss.config
+
+> 13.2.1 で新規追加
+
+- 型: `Object`
+- デフォルト: `undefined`
+
+  このフィールドは、[postcss-loader](https://github.com/postcss/postcss-loader#config-1) と同じ方法で PostCSS の設定をカスタマイズできます。
+
+  - **postcss.config.path**
+
+    PostCSS 設定ファイルを読み込むパス(ファイルまたはディレクトリ)を指定します。
+
+    ``` js
+    postcss: {
+      config: {
+        path: path.resolve('./src')
+      }
+    }
+    ```
+
+  - **postcss.config.ctx**
+
+    PostCSS プラグインにコンテキストを提供します。より詳細については、[postcss-loader のドキュメント](https://github.com/postcss/postcss-loader#context-ctx) を参照してください。
+
 ### cssSourceMap
 
 - 型: `boolean`
@@ -120,6 +145,15 @@ module.exports = {
 
   注意: もしメインの Webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
 
+### cacheBusting
+
+> 13.2.0 で新規追加
+
+- 型: `boolean`
+- デフォルト: 開発モードで `true`、プロダクションモードで `false`
+
+ファイル名にハッシュクエリを追加することによってキャッシュを破損を伴うソースマップを生成するかどうか。これをオフにするとソースマップデバッギングにも役に立ちます。
+
 ### esModule
 
 - 型: `boolean`

From 5e549cb76f8667deb5ef85b4b68a9e1fecd346d9 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Sun, 15 Oct 2017 04:37:37 +0300
Subject: [PATCH 739/877] [RU] Translation update (#1002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки
---
 docs/ru/SUMMARY.md             | 1 +
 docs/ru/features/functional.md | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index 978eeea32..b19128686 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -7,6 +7,7 @@
   - [CSS модули](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [Горячая замена](features/hot-reload.md)
+  - [Функциональные компоненты](features/functional.md)
 - Настройка
   - [Пре-процессоры](configurations/pre-processors.md)
   - [Обработка вложенных URL](configurations/asset-url.md)
diff --git a/docs/ru/features/functional.md b/docs/ru/features/functional.md
index cc1e9dcb7..4e206e360 100644
--- a/docs/ru/features/functional.md
+++ b/docs/ru/features/functional.md
@@ -2,6 +2,8 @@
 
 > Добавлено в версии 13.1.0, требует версии Vue 2.5.0+
 
+C `vue-loader 13.3.0+`, функциональные компоненты определяются как однофайловые компоненты в `*.vue` файле с поддержкой компиляции шаблона, локальным CSS и поддержкой горячей перезагрузки.
+
 Чтобы обозначить шаблон, который должен быть скомпилирован как функциональный компонент, добавьте атрибут `functional` в тег шаблона. Это также позволяет опустить опцию `functional` в теге `<script>`.
 
 Выражения в шаблоне исполняются в [контексте функционального рендеринга](https://ru.vuejs.org/v2/guide/render-function.html#Функциональные-компоненты). Это означает, что обращаться к входным параметрам в шаблоне следует через `props.xxx`:

From f5a6e26e0b09691ab907e90d980ee1cc3ad884ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Fri, 20 Oct 2017 08:47:29 +0800
Subject: [PATCH 740/877] [zh-cn] synced from #eb748f2 to #5e549cb (#1011)

* [zh-cn] sync

* [zh-cn] translation
---
 docs/zh-cn/SUMMARY.md                     |  3 ++
 docs/zh-cn/options.md                     | 34 +++++++++++++++++++++++
 docs/zh-cn/workflow/testing-with-mocks.md |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index 7b9a44a95..1874ba71c 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -7,6 +7,7 @@
   - [CSS Modules](features/css-modules.md)
   - [PostCSS](features/postcss.md)
   - [热重载](features/hot-reload.md)
+  - [函数式组件](features/functional.md)
 - 配置
   - [预处理器](configurations/pre-processors.md)
   - [资源路径处理](configurations/asset-url.md)
@@ -23,6 +24,7 @@
   - [preLoaders](options.md#preloaders)
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
+  - [postcss.config](options.md#postcssconfig)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
@@ -32,3 +34,4 @@
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
   - [optimizeSSR](options.md#optimizessr)
+  - [cacheBusting](options.md#cachebusting)
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 65207f952..615324ea0 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -113,6 +113,31 @@ module.exports = {
   }
   ```
 
+### postcss.config
+
+> 13.2.1 新增
+
+- 类型：`Object`
+- 默认值：`undefined`
+
+  这个字段允许用 [postcss-loader](https://github.com/postcss/postcss-loader#config-1) 同样的方式自定义 PostCSS 插件。
+
+  - **postcss.config.path**
+
+    指定一个加载 PostCSS 配置文件的路径 (文件或目录)。
+
+    ``` js
+    postcss: {
+      config: {
+        path: path.resolve('./src')
+      }
+    }
+    ```
+
+  - **postcss.config.ctx**
+
+    向 PostCSS 插件提供上下文。详见 [postcss-loader 文档](https://github.com/postcss/postcss-loader#context-ctx)。
+
 ### cssSourceMap
 
 - 类型: `Boolean`
@@ -272,3 +297,12 @@ module.exports = {
 - 默认值: 当 webpack 配置中包含 `target: 'node'` 且 `vue-template-compiler` 版本号大于等于 2.4.0 时为 `true`。
 
 开启 Vue 2.4 服务端渲染的编译优化之后，渲染函数将会把返回的 vdom 树的一部分编译为字符串，以提升服务端渲染的性能。在一些情况下，你可能想要明确的将其关掉，因为该渲染函数只能用于服务端渲染，而不能用于客户端渲染或测试环境。
+
+### cacheBusting
+
+> 13.2.0 新增
+
+- 类型：`boolean`
+- 默认值：在开发环境下是 `true`，在生产环境下是 `false`。
+
+是否通过给文件名后加哈希查询值来避免生成的 source map 被缓存。关掉这一选项有益于 source map 调试。
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
index 00a793013..4203bd146 100644
--- a/docs/zh-cn/workflow/testing-with-mocks.md
+++ b/docs/zh-cn/workflow/testing-with-mocks.md
@@ -65,6 +65,6 @@ it('should render', () => {
       'test': ExampleWithMocks
     }
   }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
+  expect(vm.$el.querySelector('.msg').textContent).to.equal('Hello from a mocked service!')
 })
 ```

From d8c82d5f6e61b5510178d60f07a6263e4ba7d69c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Oct 2017 21:30:26 +0200
Subject: [PATCH 741/877] feat: use file content for generating scoped id

---
 lib/loader.js       |   3 +-
 lib/utils/gen-id.js |  17 -----
 test/test.js        | 175 ++++++++++++++++++++++----------------------
 3 files changed, 89 insertions(+), 106 deletions(-)
 delete mode 100644 lib/utils/gen-id.js

diff --git a/lib/loader.js b/lib/loader.js
index a39155a47..311ea3593 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,7 +1,6 @@
 const path = require('path')
 const hash = require('hash-sum')
 const parse = require('./parser')
-const genId = require('./utils/gen-id')
 const querystring = require('querystring')
 const loaderUtils = require('loader-utils')
 const normalize = require('./utils/normalize')
@@ -82,7 +81,7 @@ module.exports = function (content) {
     this.options.context ||
     process.cwd()
   const sourceRoot = path.dirname(path.relative(context, filePath))
-  const moduleId = 'data-v-' + genId(filePath, context, options.hashKey)
+  const moduleId = 'data-v-' + hash(content)
   const shortFilePath = path
     .relative(context, filePath)
     .replace(/^(\.\.\/)+/, '')
diff --git a/lib/utils/gen-id.js b/lib/utils/gen-id.js
deleted file mode 100644
index 77504c653..000000000
--- a/lib/utils/gen-id.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// utility for generating a uid for each component file
-// used in scoped CSS rewriting
-const path = require('path')
-const hash = require('hash-sum')
-const cache = Object.create(null)
-const sepRE = new RegExp(path.sep.replace('\\', '\\\\'), 'g')
-
-module.exports = function genId (file, context, key) {
-  const contextPath = context.split(path.sep)
-  const rootId = contextPath[contextPath.length - 1]
-  file =
-    rootId +
-    '/' +
-    path.relative(context, file).replace(sepRE, '/') +
-    (key || '')
-  return cache[file] || (cache[file] = hash(file))
-}
diff --git a/test/test.js b/test/test.js
index bef9fd082..cc29b9b09 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,23 +1,23 @@
 process.env.VUE_LOADER_TEST = true
 
-var fs = require('fs')
-var path = require('path')
-var jsdom = require('jsdom')
-var webpack = require('webpack')
-var MemoryFS = require('memory-fs')
-var expect = require('chai').expect
-var hash = require('hash-sum')
-var Vue = require('vue')
-var SSR = require('vue-server-renderer')
+const fs = require('fs')
+const path = require('path')
+const jsdom = require('jsdom')
+const webpack = require('webpack')
+const MemoryFS = require('memory-fs')
+const expect = require('chai').expect
+const hash = require('hash-sum')
+const Vue = require('vue')
+const SSR = require('vue-server-renderer')
 // var compiler = require('../lib/template-compiler')
-var normalizeNewline = require('normalize-newline')
-var ExtractTextPlugin = require('extract-text-webpack-plugin')
-var SourceMapConsumer = require('source-map').SourceMapConsumer
-
-var rawLoaderPath = path.resolve(__dirname, '../index.js')
-var loaderPath = 'expose-loader?vueModule!' + rawLoaderPath
-var mfs = new MemoryFS()
-var globalConfig = {
+const normalizeNewline = require('normalize-newline')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const SourceMapConsumer = require('source-map').SourceMapConsumer
+
+const rawLoaderPath = path.resolve(__dirname, '../index.js')
+const loaderPath = 'expose-loader?vueModule!' + rawLoaderPath
+const mfs = new MemoryFS()
+const globalConfig = {
   output: {
     path: '/',
     filename: 'test.build.js'
@@ -35,10 +35,14 @@ var globalConfig = {
   ]
 }
 
+function genId (file) {
+  return hash(fs.readFileSync(path.resolve(__dirname, './fixtures', file), 'utf-8'))
+}
+
 function bundle (options, cb) {
-  var vueOptions = options.vue
+  const vueOptions = options.vue
   delete options.vue
-  var config = Object.assign({}, globalConfig, options)
+  const config = Object.assign({}, globalConfig, options)
 
   // assign vue Options
   if (vueOptions) {
@@ -47,7 +51,7 @@ function bundle (options, cb) {
     }))
   }
 
-  var webpackCompiler = webpack(config)
+  const webpackCompiler = webpack(config)
   webpackCompiler.outputFileSystem = mfs
   webpackCompiler.run((err, stats) => {
     expect(err).to.be.null
@@ -99,12 +103,12 @@ function interopDefault (module) {
     : module
 }
 
-describe('vue-loader', function () {
+describe('vue-loader', () => {
   it('basic', done => {
     test({
       entry: './test/fixtures/basic.vue'
     }, (window, module, rawModule) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: 'hi'
       })
 
@@ -114,7 +118,7 @@ describe('vue-loader', function () {
       expect(vnode.children[0].text).to.equal('hi')
 
       expect(module.data().msg).to.contain('Hello from Component A!')
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
       done()
@@ -134,7 +138,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/pre.vue'
     }, (window, module) => {
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
       // div
       //   h1 This is the app
       //   comp-a
@@ -144,7 +148,7 @@ describe('vue-loader', function () {
       expect(vnode.children[2].tag).to.equal('comp-b')
 
       expect(module.data().msg).to.contain('Hello from coffee!')
-      var style = window.document.querySelector('style').textContent
+      const style = window.document.querySelector('style').textContent
       expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
       done()
     })
@@ -160,7 +164,7 @@ describe('vue-loader', function () {
         new ExtractTextPlugin('test.output.css')
       ]
     }, (window, module) => {
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
 
       expect(vnode.children[0].tag).to.equal('h1')
       expect(vnode.children[1].tag).to.equal('comp-a')
@@ -168,7 +172,7 @@ describe('vue-loader', function () {
 
       expect(module.data().msg).to.contain('Hello from coffee!')
 
-      var css = mfs.readFileSync('/test.output.css').toString()
+      let css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
       expect(css).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
 
@@ -178,15 +182,12 @@ describe('vue-loader', function () {
 
   it('scoped style', done => {
     test({
-      entry: './test/fixtures/scoped-css.vue',
-      vue: {
-        hashKey: 'foo'
-      }
+      entry: './test/fixtures/scoped-css.vue'
     }, (window, module) => {
-      var id = 'data-v-' + hash('vue-loader/test/fixtures/scoped-css.vue' + 'foo')
+      const id = 'data-v-' + genId('scoped-css.vue')
       expect(module._scopeId).to.equal(id)
 
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         ok: true
       })
       // <div>
@@ -202,7 +203,7 @@ describe('vue-loader', function () {
       expect(vnode.children[4].tag).to.equal('p')
       expect(vnode.children[4].data.staticClass).to.equal('test')
 
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain(`.test[${id}] {\n  color: yellow;\n}`)
       expect(style).to.contain(`.test[${id}]:after {\n  content: \'bye!\';\n}`)
@@ -222,10 +223,10 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/style-import.vue'
     }, (window) => {
-      var styles = window.document.querySelectorAll('style')
+      const styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
       // import with scoped
-      var id = 'data-v-' + hash('vue-loader/test/fixtures/style-import.vue')
+      const id = 'data-v-' + genId('style-import.vue')
       expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
       done()
     })
@@ -235,7 +236,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/template-import.vue'
     }, (window, module) => {
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
       // '<div><h1>hello</h1></div>'
       expect(vnode.children[0].tag).to.equal('h1')
       expect(vnode.children[0].children[0].text).to.equal('hello')
@@ -257,11 +258,11 @@ describe('vue-loader', function () {
       entry: './test/fixtures/basic.vue',
       devtool: '#source-map'
     }, (code, warnings) => {
-      var map = mfs.readFileSync('/test.build.js.map').toString()
-      var smc = new SourceMapConsumer(JSON.parse(map))
-      var line
-      var col
-      var targetRE = /^\s+msg: 'Hello from Component A!'/
+      const map = mfs.readFileSync('/test.build.js.map').toString()
+      const smc = new SourceMapConsumer(JSON.parse(map))
+      let line
+      let col
+      const targetRE = /^\s+msg: 'Hello from Component A!'/
       code.split(/\r?\n/g).some((l, i) => {
         if (targetRE.test(l)) {
           line = i + 1
@@ -269,7 +270,7 @@ describe('vue-loader', function () {
           return true
         }
       })
-      var pos = smc.originalPositionFor({
+      const pos = smc.originalPositionFor({
         line: line,
         column: col
       })
@@ -283,9 +284,9 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/media-query.vue'
     }, (window) => {
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
-      var id = 'data-v-' + hash('vue-loader/test/fixtures/media-query.vue')
+      const id = 'data-v-' + genId('media-query.vue')
       expect(style).to.contain('@media print {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
       done()
     })
@@ -295,9 +296,9 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/supports-query.vue'
     }, (window) => {
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
-      var id = 'data-v-' + hash('vue-loader/test/fixtures/supports-query.vue')
+      const id = 'data-v-' + genId('supports-query.vue')
       expect(style).to.contain('@supports ( color: #000 ) {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
       done()
     })
@@ -316,7 +317,7 @@ describe('vue-loader', function () {
         new ExtractTextPlugin('test.output.css')
       ]
     }, (code, warnings) => {
-      var css = mfs.readFileSync('/test.output.css').toString()
+      let css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
       expect(css).to.contain('h1 {\n  color: #f00;\n}')
       expect(css).to.contain('h2 {\n  color: green;\n}')
@@ -334,7 +335,7 @@ describe('vue-loader', function () {
         new ExtractTextPlugin('test.output.css')
       ]
     }, (code, warnings) => {
-      var css = mfs.readFileSync('/test.output.css').toString()
+      let css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
       expect(css).to.contain('h1 {\n  color: #f00;\n}')
       expect(css).to.contain('h2 {\n  color: green;\n}')
@@ -353,7 +354,7 @@ describe('vue-loader', function () {
         plugin
       ]
     }, (code, warnings) => {
-      var css = mfs.readFileSync('/test.output.css').toString()
+      let css = mfs.readFileSync('/test.output.css').toString()
       css = normalizeNewline(css)
       expect(css).to.contain('h1 {\n  color: #f00;\n}')
       expect(css).to.contain('h2 {\n  color: green;\n}')
@@ -366,12 +367,12 @@ describe('vue-loader', function () {
       entry: './test/fixtures/inject.js'
     }, (window) => {
       // console.log(window.injector.toString())
-      var module = interopDefault(window.injector({
+      const module = interopDefault(window.injector({
         './service': {
           msg: 'Hello from mocked service!'
         }
       }))
-      var vnode = mockRender(module, module.data())
+      const vnode = mockRender(module, module.data())
       // <div class="msg">{{ msg }}</div>
       expect(vnode.tag).to.equal('div')
       expect(vnode.data.staticClass).to.equal('msg')
@@ -395,7 +396,7 @@ describe('vue-loader', function () {
         ]
       }
     }, (window, module) => {
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
       // <div>
       //   <img src="logo.c9e00e.png">
       //   <img src="logo.c9e00e.png">
@@ -405,7 +406,7 @@ describe('vue-loader', function () {
       expect(vnode.children[2].tag).to.equal('img')
       expect(vnode.children[2].data.attrs.src).to.equal('logo.c9e00e.png')
 
-      var style = window.document.querySelector('style').textContent
+      const style = window.document.querySelector('style').textContent
       expect(style).to.contain('html { background-image: url(logo.c9e00e.png);\n}')
       expect(style).to.contain('body { background-image: url(logo.c9e00e.png);\n}')
       done()
@@ -428,12 +429,12 @@ describe('vue-loader', function () {
       function includeDataURL (s) {
         return !!s.match(/\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*/i)
       }
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
       // img tag
       expect(includeDataURL(vnode.children[0].data.attrs.src)).to.equal(true)
       // image tag (SVG)
       expect(includeDataURL(vnode.children[2].children[0].data.attrs['xlink:href'])).to.equal(true)
-      var style = window.document.querySelector('style').textContent
+      const style = window.document.querySelector('style').textContent
 
       const dataURL = vnode.children[0].data.attrs.src
 
@@ -461,7 +462,7 @@ describe('vue-loader', function () {
         }
       }
     }, (window) => {
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
       done()
@@ -473,7 +474,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/postcss.vue'
     }, (window) => {
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
       fs.unlinkSync('.postcssrc')
@@ -493,7 +494,7 @@ describe('vue-loader', function () {
         }
       }
     }, (window) => {
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
       fs.unlinkSync('test/.postcssrc')
@@ -505,7 +506,7 @@ describe('vue-loader', function () {
     test({
       entry: './test/fixtures/es2015.vue'
     }, (window, module) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         a: 'hello',
         b: true
       })
@@ -522,7 +523,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/extend.vue'
     }, (window, Module) => {
       // extend.vue should export Vue constructor
-      var vnode = mockRender(Module.options, {
+      const vnode = mockRender(Module.options, {
         msg: 'success'
       })
       expect(vnode.tag).to.equal('div')
@@ -540,7 +541,7 @@ describe('vue-loader', function () {
       }
     }, (window, module, rawModule) => {
       expect(rawModule.__esModule).to.equal(true)
-      var vnode = mockRender(rawModule.default, {
+      const vnode = mockRender(rawModule.default, {
         msg: 'hi'
       })
       expect(vnode.tag).to.equal('h2')
@@ -563,27 +564,27 @@ describe('vue-loader', function () {
         }
       }, (window, module, raw, instance) => {
         // get local class name
-        var className = instance.style.red
+        const className = instance.style.red
         expect(className).to.match(regexToMatch)
 
         // class name in style
-        var style = [].slice.call(window.document.querySelectorAll('style')).map((style) => {
+        let style = [].slice.call(window.document.querySelectorAll('style')).map((style) => {
           return style.textContent
         }).join('\n')
         style = normalizeNewline(style)
         expect(style).to.contain('.' + className + ' {\n  color: red;\n}')
 
         // animation name
-        var match = style.match(/@keyframes\s+(\S+)\s+{/)
+        const match = style.match(/@keyframes\s+(\S+)\s+{/)
         expect(match).to.have.length(2)
-        var animationName = match[1]
+        const animationName = match[1]
         expect(animationName).to.not.equal('fade')
         expect(style).to.contain('animation: ' + animationName + ' 1s;')
 
         // default module + pre-processor + scoped
-        var anotherClassName = instance.$style.red
+        const anotherClassName = instance.$style.red
         expect(anotherClassName).to.match(regexToMatch).and.not.equal(className)
-        var id = 'data-v-' + hash('vue-loader/test/fixtures/css-modules.vue')
+        const id = 'data-v-' + genId('css-modules.vue')
         expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
 
         cb()
@@ -592,8 +593,8 @@ describe('vue-loader', function () {
     // default localIdentName
     testWithIdent(undefined, /^\w{23}/, () => {
       // specified localIdentName
-      var ident = '[path][name]---[local]---[hash:base64:5]'
-      var regex = /^test-fixtures-css-modules---red---\w{5}/
+      const ident = '[path][name]---[local]---[hash:base64:5]'
+      const regex = /^test-fixtures-css-modules---red---\w{5}/
       testWithIdent(ident, regex, done)
     })
   })
@@ -608,14 +609,14 @@ describe('vue-loader', function () {
     }, (code, warnings) => {
       // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
       function requireFromString (src, filename) {
-        var Module = module.constructor
-        var m = new Module()
+        const Module = module.constructor
+        const m = new Module()
         m._compile(src, filename)
         return m.exports
       }
 
-      var output = interopDefault(requireFromString(code, './test.build.js'))
-      var mockInstance = {}
+      const output = interopDefault(requireFromString(code, './test.build.js'))
+      const mockInstance = {}
 
       output.beforeCreate.forEach(hook => hook.call(mockInstance))
       expect(mockInstance.style.red).to.exist
@@ -633,7 +634,7 @@ describe('vue-loader', function () {
         }
       }
     }, (window, module) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: 'hi'
       })
       // <h2 id="-msg-">{{msg}}</h2>
@@ -713,7 +714,7 @@ describe('vue-loader', function () {
         new ExtractTextPlugin('doc.md')
       ]
     }, (code, warnings) => {
-      var unitTest = mfs.readFileSync('/doc.md').toString()
+      let unitTest = mfs.readFileSync('/doc.md').toString()
       unitTest = normalizeNewline(unitTest)
       expect(unitTest).to.contain('This is example documentation for a component.')
       done()
@@ -814,7 +815,7 @@ describe('vue-loader', function () {
         }
       }
     }, (window, module) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: 'hi'
       })
       // <h2 class="green">{{msg}}</h2>
@@ -823,7 +824,7 @@ describe('vue-loader', function () {
       expect(vnode.children[0].text).to.equal('hi')
 
       expect(module.data().msg).to.contain('Changed!')
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('comp-a h2 {\n  color: #00f;\n}')
       done()
@@ -846,7 +847,7 @@ describe('vue-loader', function () {
         }
       }
     }, (window, module) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: JSON.parse(module.__i18n).en.hello,
         blog: module.__blog
       })
@@ -874,7 +875,7 @@ describe('vue-loader', function () {
         ]
       }
     }, (window, module) => {
-      var results = []
+      const results = []
       // var vnode =
       mockRender(
         Object.assign(module, { methods: { $processStyle: style => results.push(style) }}),
@@ -895,7 +896,7 @@ describe('vue-loader', function () {
         compilerModules: require.resolve('./fixtures/custom-module')
       }
     }, (window, module) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: 'hi'
       })
       expect(vnode.data.staticClass).to.equal('red blue')
@@ -920,7 +921,7 @@ describe('vue-loader', function () {
         }
       }
     }, (window, module) => {
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
       expect(vnode.data.domProps.textContent).to.equal('keypath')
       done()
     })
@@ -931,13 +932,13 @@ describe('vue-loader', function () {
       entry: './test/fixtures/functional-style.vue'
     }, (window, module, rawModule) => {
       expect(module.functional).to.equal(true)
-      var vnode = mockRender(module)
+      const vnode = mockRender(module)
       // <div class="foo">hi</div>
       expect(vnode.tag).to.equal('div')
       expect(vnode.data.class).to.equal('foo')
       expect(vnode.children[0].text).to.equal('functional')
 
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('.foo { color: red;\n}')
       done()
@@ -949,7 +950,7 @@ describe('vue-loader', function () {
       entry: './test/fixtures/template-comment.vue'
     }, (window, module, rawModule) => {
       expect(module.comments).to.equal(true)
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: 'hi'
       })
       expect(vnode.tag).to.equal('div')
@@ -969,7 +970,7 @@ describe('vue-loader', function () {
         cacheBusting: false
       }
     }, (window, module, rawModule) => {
-      var vnode = mockRender(module, {
+      const vnode = mockRender(module, {
         msg: 'hi'
       })
 
@@ -979,7 +980,7 @@ describe('vue-loader', function () {
       expect(vnode.children[0].text).to.equal('hi')
 
       expect(module.data().msg).to.contain('Hello from Component A!')
-      var style = window.document.querySelector('style').textContent
+      let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
       expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
       done()

From 5ace31ccd2edc05e867d87144be4b3750c57e3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Wed, 25 Oct 2017 17:00:50 +0800
Subject: [PATCH 742/877] [zh-cn] improved #1012 (#1015)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 新增functional.md的中文翻译

* [zh-cn] improved #1012
---
 docs/zh-cn/features/functional.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 docs/zh-cn/features/functional.md

diff --git a/docs/zh-cn/features/functional.md b/docs/zh-cn/features/functional.md
new file mode 100644
index 000000000..6177c40bb
--- /dev/null
+++ b/docs/zh-cn/features/functional.md
@@ -0,0 +1,15 @@
+# 函数式组件的模板
+
+> 新增于 13.1.0，需要 Vue 版本 >= 2.5.0
+
+从 `vue-loader >= 13.3.0` 开始，在一个 `*.vue` 文件中以单文件形式定义的函数式组件，现在在模板编译、有作用域的 CSS 和热重载也有了良好的支持。
+
+要声明一个应该编译为函数式组件的模板，请将 `functional` 特性添加到模板块中。这样做以后就可以省略 `<script>` 块中的 `functional` 选项。
+
+模板中的表达式会在[函数式渲染上下文](https://cn.vuejs.org/v2/guide/render-function.html#函数式组件)中求值。这意味着在模板中，prop 需要以 `props.xxx` 的形式访问：
+
+```html
+<template functional>
+  <div>{{ props.foo }}</div>
+</template>
+```

From 3ba6c257d5fc641e17e6e59d1553aabb5ccd03cc Mon Sep 17 00:00:00 2001
From: nazikorl <nazar.orlovsky@gmail.com>
Date: Wed, 25 Oct 2017 22:11:53 +0300
Subject: [PATCH 743/877] Fix rus documentation (features/scoped-css.md)
 (#1023)

---
 docs/ru/features/scoped-css.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
index d77cbb992..b561ce807 100644
--- a/docs/ru/features/scoped-css.md
+++ b/docs/ru/features/scoped-css.md
@@ -32,7 +32,7 @@
 
 ### Использование локальных и глобальных стилей
 
-Вы можете сочетать использование в компоненте локальных и глобальных стили одновременно:
+Вы можете сочетать использование в компоненте локальных и глобальных стилей одновременно:
 
 ``` html
 <style>
@@ -74,4 +74,4 @@ DOM-содержимое, создаваемое с помощью `v-html` не
 
 - **Локальные стили не устраняют необходимость классов**. Из-за того как браузеры рендерят различные CSS-селекторы, `p { color: red }` может быть в разы медленнее при использовании в локальных стилях (например, когда комбинируется с селектором по атрибуту). Если же вы используете классы или ID, такие как `.example { color: red }`, тогда вы практически полностью исключаете ухудшение производительности. [Вот пример](https://stevesouders.com/efws/css-selectors/csscreate.php) где вы можете проверить разницу самостоятельно.
 
-- **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.
\ No newline at end of file
+- **Будьте внимательны с селекторами потомков в рекурсивных компонентах!** Для CSS-правила с селектором `.a .b`, если элемент, который соответствует `.a` содержит рекурсивный компонент потомок, тогда все `.b` в этом компоненте потомке будут также соответствовать правилу.

From 7b729b90bb22278743a3761762c05f6e07a4e2c4 Mon Sep 17 00:00:00 2001
From: nazikorl <nazar.orlovsky@gmail.com>
Date: Wed, 25 Oct 2017 22:12:17 +0300
Subject: [PATCH 744/877] Fix rus docs (features/css-modules.md) (#1024)

---
 docs/ru/features/css-modules.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/features/css-modules.md b/docs/ru/features/css-modules.md
index d73760a90..778b1e482 100644
--- a/docs/ru/features/css-modules.md
+++ b/docs/ru/features/css-modules.md
@@ -29,7 +29,7 @@
 </template>
 ```
 
-Поскольку это вычисляемое свойство, оно также будет работает с объектом/массивом в `:class`:
+Поскольку это вычисляемое свойство, оно также будет работать с объектом/массивом в `:class`:
 
 ``` html
 <template>

From ff1555b2f4dadd08bd8737fc845380b5ea80ab98 Mon Sep 17 00:00:00 2001
From: nazikorl <nazar.orlovsky@gmail.com>
Date: Wed, 25 Oct 2017 22:12:33 +0300
Subject: [PATCH 745/877] Fix rus docs (configurations/custom-blocks.md)
 (#1025)

---
 docs/ru/configurations/custom-blocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index e5895f366..ae27b8680 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -2,7 +2,7 @@
 
 > Доступно в версиях 10.2.0+
 
-Вы можете определять пользовательски блоки внутри `*.vue` файлов. Содержимое пользовательских блоков будет обрабатываться загрузчиками, указанными в объекте `loaders` настроек `vue-loader` и затем подключено модулем к компоненту. Конфигурация аналогична тому, что описано в разделе [продвинутой конфигурации загрузчиков](../configurations/advanced.md), за исключением совпадений по имени тега, вместо атрибута `lang`.
+Вы можете определять пользовательские блоки внутри `*.vue` файлов. Содержимое пользовательских блоков будет обрабатываться загрузчиками, указанными в объекте `loaders` настроек `vue-loader` и затем подключено модулем к компоненту. Конфигурация аналогична тому, что описано в разделе [продвинутой конфигурации загрузчиков](../configurations/advanced.md), за исключением совпадений по имени тега, вместо атрибута `lang`.
 
 Если подходящий загрузчик будет найден для пользовательского блока, он будет обработан; в противном случае пользовательский блок будет просто проигнорирован. Кроме того, если найденный загрузчик возвращает функцию, эта функция будет вызываться с компонентом из файла `*.vue` в качестве параметра.
 

From 069bc3142a3d7bfbe5db36377b4abf2c81c32909 Mon Sep 17 00:00:00 2001
From: 2hu <zhulongzheng@gmail.com>
Date: Thu, 2 Nov 2017 23:34:03 +0800
Subject: [PATCH 746/877] Update postcss.md (#1034)

Just add quotes for PostCSS option value to make it valid.
---
 docs/en/features/postcss.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index d4d16beff..d97f07379 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -62,7 +62,7 @@ In addition to providing an Array of plugins, the `postcss` option also accepts:
   postcss: {
     plugins: [...], // list of plugins
     options: {
-      parser: sugarss // use sugarss parser
+      parser: 'sugarss' // use sugarss parser
     }
   }
   ```

From 7c6939977000c94b3b93969c10555cebaf5bd2d7 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Fri, 3 Nov 2017 16:07:22 +0300
Subject: [PATCH 747/877] [RU] Translation update (#1039)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример
---
 docs/ru/features/postcss.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
index 5229e69ac..f486b0e21 100644
--- a/docs/ru/features/postcss.md
+++ b/docs/ru/features/postcss.md
@@ -62,7 +62,7 @@ module.exports = {
   postcss: {
     plugins: [...], // список плагинов
     options: {
-      parser: sugarss // использование парсера sugarss
+      parser: 'sugarss' // использование парсера sugarss
     }
   }
   ```

From 153d237adc5b6c1e5b2c1ebb19870ed9708aaa44 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Nov 2017 14:21:19 -0400
Subject: [PATCH 748/877] fix: only use file content for scopeId generation in
 production build

---
 lib/loader.js | 6 ++----
 test/test.js  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 311ea3593..e0c8205e8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -81,10 +81,8 @@ module.exports = function (content) {
     this.options.context ||
     process.cwd()
   const sourceRoot = path.dirname(path.relative(context, filePath))
-  const moduleId = 'data-v-' + hash(content)
-  const shortFilePath = path
-    .relative(context, filePath)
-    .replace(/^(\.\.\/)+/, '')
+  const shortFilePath = path.relative(context, filePath).replace(/^(\.\.[\\\/])+/, '')
+  const moduleId = 'data-v-' + hash(isProduction ? content : shortFilePath)
 
   let cssLoaderOptions = ''
   if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
diff --git a/test/test.js b/test/test.js
index cc29b9b09..b78dfc776 100644
--- a/test/test.js
+++ b/test/test.js
@@ -36,7 +36,7 @@ const globalConfig = {
 }
 
 function genId (file) {
-  return hash(fs.readFileSync(path.resolve(__dirname, './fixtures', file), 'utf-8'))
+  return hash(`test/fixtures/${file}`)
 }
 
 function bundle (options, cb) {

From c30331259f332d2d0e7688b0dccec4ad02899343 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Nov 2017 14:31:43 -0400
Subject: [PATCH 749/877] fix: avoid removing space after /deep/ when used
 directly (close #1035)

---
 lib/style-compiler/plugins/scope-id.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index 814f488a2..b2a53ff8a 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -29,9 +29,9 @@ module.exports = postcss.plugin('add-id', ({ id }) => root => {
           }
           // /deep/ alias for >>>, since >>> doesn't work in SASS
           if (n.type === 'tag' && n.value === '/deep/') {
-            const next = n.next()
-            if (next.type === 'combinator' && next.value === ' ') {
-              next.remove()
+            const prev = n.prev()
+            if (prev && prev.type === 'combinator' && prev.value === ' ') {
+              prev.remove()
             }
             n.remove()
             return false

From 405a7c4a58422da984f07546e28a35ee5d50436d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Nov 2017 14:33:56 -0400
Subject: [PATCH 750/877] test: fix tests for windows

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index b78dfc776..8baaa8f59 100644
--- a/test/test.js
+++ b/test/test.js
@@ -36,7 +36,7 @@ const globalConfig = {
 }
 
 function genId (file) {
-  return hash(`test/fixtures/${file}`)
+  return hash(path.join('test', 'fixtures', file))
 }
 
 function bundle (options, cb) {

From bcd54d20c49428abb33280815907bfeece6d9909 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Nov 2017 14:46:11 -0400
Subject: [PATCH 751/877] fix: fix srcset transform for absolute urls (fix
 #1005)

---
 .../modules/transform-srcset.js               | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/template-compiler/modules/transform-srcset.js b/lib/template-compiler/modules/transform-srcset.js
index 7e44a60f3..49a15585b 100644
--- a/lib/template-compiler/modules/transform-srcset.js
+++ b/lib/template-compiler/modules/transform-srcset.js
@@ -1,12 +1,10 @@
 // vue compiler module for transforming `img:srcset` to a number of `require`s
 
-module.exports = function () {
-  return {
-    postTransformNode: node => {
-      transform(node)
-    }
+module.exports = () => ({
+  postTransformNode: node => {
+    transform(node)
   }
-}
+})
 
 function transform (node) {
   const tags = ['img', 'source']
@@ -15,8 +13,8 @@ function transform (node) {
     node.attrs.forEach(attr => {
       if (attr.name === 'srcset') {
         // same logic as in transform-require.js
-        var value = attr.value
-        var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
+        const value = attr.value
+        const isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
         if (!isStatic) {
           return
         }
@@ -43,12 +41,14 @@ function transform (node) {
 
 function urlToRequire (url) {
   // same logic as in transform-require.js
-  var firstChar = url.charAt(0)
+  const firstChar = url.charAt(0)
   if (firstChar === '.' || firstChar === '~') {
     if (firstChar === '~') {
-      var secondChar = url.charAt(1)
-      url = '"' + url.slice(secondChar === '/' ? 2 : 1)
+      const secondChar = url.charAt(1)
+      url = url.slice(secondChar === '/' ? 2 : 1)
     }
     return `require("${url}")`
+  } else {
+    return `"${url}"`
   }
 }

From c58945483fd97ee0049653c910a065f55d16138f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Nov 2017 14:53:08 -0400
Subject: [PATCH 752/877] feat: support wildcard tag in transformToRequire
 (close #978)

---
 lib/template-compiler/modules/transform-require.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index f22d846c3..820275927 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -19,7 +19,7 @@ module.exports = userOptions => {
 
 function transform (node, options) {
   for (const tag in options) {
-    if (node.tag === tag && node.attrs) {
+    if ((tag === '*' || node.tag === tag) && node.attrs) {
       const attributes = options[tag]
       if (typeof attributes === 'string') {
         node.attrs.some(attr => rewrite(attr, attributes))

From e17a5b1cbe89c89a09efe38662299e875d74fdd2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 3 Nov 2017 14:54:18 -0400
Subject: [PATCH 753/877] 13.4.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 05d2c9d96..a63274ff8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 376ad79d1..4e69e8495 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 5f49ca6e9d459eca705d0f2580400680a53ca3b3 Mon Sep 17 00:00:00 2001
From: Masaya Nasu <masaya.nasu@crowdworks.co.jp>
Date: Mon, 6 Nov 2017 17:07:13 +0900
Subject: [PATCH 754/877] add comma (#1042)

Fixed because forget the comma.
---
 docs/ja/configurations/pre-processors.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
index 7d41a2abc..a15c5d624 100644
--- a/docs/ja/configurations/pre-processors.md
+++ b/docs/ja/configurations/pre-processors.md
@@ -28,7 +28,7 @@ npm install sass-loader node-sass --save-dev
   loader: 'vue-loader',
   options: {
     loaders: {
-      scss: 'vue-style-loader!css-loader!sass-loader' // <style lang="scss">
+      scss: 'vue-style-loader!css-loader!sass-loader', // <style lang="scss">
       sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax' // <style lang="sass">
     }
   }

From 14921e4a92cf3d515ffc8bba9bfb56ce887f4281 Mon Sep 17 00:00:00 2001
From: Piotr Gejgalis <piotr@gejgalis.com>
Date: Mon, 6 Nov 2017 22:30:45 +0100
Subject: [PATCH 755/877] feat: disable Hot Reload option (#1036) (#1037)

---
 docs/en/features/hot-reload.md | 24 ++++++++++++++++++++++++
 docs/en/options.md             | 11 +++++++++++
 lib/loader.js                  |  3 +--
 lib/template-compiler/index.js |  4 ++--
 test/test.js                   | 24 ++++++++++++++++++++++++
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/docs/en/features/hot-reload.md b/docs/en/features/hot-reload.md
index 1004c9617..71e77f7d3 100644
--- a/docs/en/features/hot-reload.md
+++ b/docs/en/features/hot-reload.md
@@ -19,3 +19,27 @@ When scaffolding the project with `vue-cli`, Hot Reload is enabled out-of-the-bo
 When manually setting up your project, hot-reload is enabled automatically when you serve your project with `webpack-dev-server --hot`.
 
 Advanced users may want to check out [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api), which is used internally by `vue-loader`.
+
+## Disabling Hot Reload
+
+Hot Reload is always enabled except following situations:
+
+ * Webpack `target` is `node` (SSR)
+ * Webpack minifies the code
+ * `process.env.NODE_ENV === 'production'`
+  
+You may use `hotReload: false` option to disable the Hot Reload explicitly:
+
+``` js
+module: {
+  rules: [
+    {
+      test: /\.vue$/,
+      loader: 'vue-loader',
+      options: {
+        hotReload: false // disables Hot Reload
+      }
+    }
+  ]
+}
+```
\ No newline at end of file
diff --git a/docs/en/options.md b/docs/en/options.md
index dde4eb721..55eb290b2 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -310,3 +310,14 @@ Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees
 - default: `true` in development mode, `false` in production mode.
 
 Whether generate source maps with cache busting by appending a hash query to the file name. Turning this off can help with source map debugging.
+
+### hotReload
+
+> New in 13.5.0
+
+- type: `boolean`
+- default: `true` in development mode, `false` in production mode or when the webpack config has `target: 'node'`.
+- allowed value: `false` (`true` will not force Hot Reload neither in production mode nor when `target: 'node'`)
+
+Whether to use Webpack [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/) to apply changes in the browser **without reloading the page**.
+Use this option (value `false`) to disable the Hot Reload feature in development mode.     
diff --git a/lib/loader.js b/lib/loader.js
index e0c8205e8..e9ca890cd 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -143,8 +143,7 @@ module.exports = function (content) {
   const postLoaders = options.postLoaders || {}
 
   const needsHotReload =
-    !isServer && !isProduction && (parts.script || parts.template)
-
+    !isServer && !isProduction && (parts.script || parts.template) && options.hotReload !== false
   if (needsHotReload) {
     output += 'var disposed = false\n'
   }
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 7eed3a1b4..95d8ff00b 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -13,7 +13,7 @@ module.exports = function (html) {
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
   const vueOptions = this.options.__vueOptions__ || {}
   const options = loaderUtils.getOptions(this) || {}
-
+  const needsHotReload = !isServer && !isProduction && vueOptions.hotReload !== false
   const defaultModules = [transformRequire(options.transformToRequire), transformSrcset()]
   let userModules = vueOptions.compilerModules || options.compilerModules
 
@@ -90,7 +90,7 @@ module.exports = function (html) {
       : `module.exports = ${exports}`
   }
   // hot-reload
-  if (!isServer && !isProduction) {
+  if (needsHotReload) {
     const exportsName = vueOptions.esModule ? 'esExports' : 'module.exports'
     code +=
       '\nif (module.hot) {\n' +
diff --git a/test/test.js b/test/test.js
index 8baaa8f59..c596b7a9a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1027,4 +1027,28 @@ describe('vue-loader', () => {
       vnode.children[6].data.on.click()
     })
   })
+
+  it('hot reload enabled', done => {
+    bundle({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        hotReload: true
+      }
+    }, (code) => {
+      expect(code).to.contains('require("vue-hot-reload-api")')
+      done()
+    })
+  })
+
+  it('hot reload disabled', done => {
+    bundle({
+      entry: './test/fixtures/basic.vue',
+      vue: {
+        hotReload: false
+      }
+    }, (code) => {
+      expect(code).not.to.contains('require("vue-hot-reload-api")')
+      done()
+    })
+  })
 })

From c6ede08334b18129e7f27ccd7d4ada5e64b08601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Tue, 7 Nov 2017 15:48:28 +0800
Subject: [PATCH 756/877] [doc] added loader suffix: 'vue' -> 'vue-loader'
 (#1043)

---
 docs/en/configurations/custom-blocks.md    | 12 ++++++------
 docs/ja/configurations/custom-blocks.md    |  6 +++---
 docs/kr/configurations/custom-blocks.md    |  4 ++--
 docs/kr/features/css-modules.md            |  2 +-
 docs/kr/options.md                         |  6 +++---
 docs/pt_BR/configurations/custom-blocks.md | 16 ++++++++--------
 docs/ru/configurations/custom-blocks.md    | 10 +++++-----
 docs/zh-cn/configurations/custom-blocks.md |  4 ++--
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index c9ee19831..ffd6013bf 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -4,7 +4,7 @@
 
 You can define custom language blocks inside `*.vue` files. The content of a custom block will be processed by the loaders specified in the `loaders` object of `vue-loader` options and then required by the component module. The configuration is similar to what is described in [Advanced Loader Configuration](../configurations/advanced.md), except the matching uses the tag name instead of the `lang` attribute.
 
-If a matching loader is found for a custom block, it will be processed; otherwise the custom block will simply be ignored. Additionally, if the found loader returns a function, that function will be called with the component of the `*.vue` file as a parameter. 
+If a matching loader is found for a custom block, it will be processed; otherwise the custom block will simply be ignored. Additionally, if the found loader returns a function, that function will be called with the component of the `*.vue` file as a parameter.
 
 ## Single docs file example
 
@@ -49,7 +49,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             // extract all <docs> content as raw text
@@ -70,9 +70,9 @@ module.exports = {
 
 Here's an example of injecting the `<docs>` custom blocks into the component so that it's available during runtime.
 
-#### docs-loader.js 
+#### docs-loader.js
 
-In order for the custom block content to be injected, we'll need a custom loader: 
+In order for the custom block content to be injected, we'll need a custom loader:
 
 ``` js
 module.exports = function (source, map) {
@@ -94,7 +94,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             'docs': docsLoader
@@ -108,7 +108,7 @@ module.exports = {
 
 #### component.vue
 
-We are now able to access the `<docs>` block's content of imported components during runtime. 
+We are now able to access the `<docs>` block's content of imported components during runtime.
 
 ``` html
 <template>
diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
index 7c4a7ece8..4021ecdfe 100644
--- a/docs/ja/configurations/custom-blocks.md
+++ b/docs/ja/configurations/custom-blocks.md
@@ -49,7 +49,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             // 全ての <docs> の内容は raw text として展開されます
@@ -70,7 +70,7 @@ module.exports = {
 
 `<docs>`カスタムブロックをコンポーネントに注入して実行時に利用できるようにする例です。
 
-#### docs-loader.js 
+#### docs-loader.js
 
 カスタムブロックコンテンツを注入するためには、カスタム loader が必要です:
 
@@ -94,7 +94,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             'docs': docsLoader
diff --git a/docs/kr/configurations/custom-blocks.md b/docs/kr/configurations/custom-blocks.md
index 3837e4bed..57adc5134 100644
--- a/docs/kr/configurations/custom-blocks.md
+++ b/docs/kr/configurations/custom-blocks.md
@@ -49,7 +49,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             // 모든 <docs>의 내용을 원문 그대로 추출합니다
@@ -94,7 +94,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             'docs': docsLoader
diff --git a/docs/kr/features/css-modules.md b/docs/kr/features/css-modules.md
index c1c8edbf2..35db4f1a6 100644
--- a/docs/kr/features/css-modules.md
+++ b/docs/kr/features/css-modules.md
@@ -104,7 +104,7 @@ module: {
   rules: [
     {
       test: '\.vue$',
-      loader: 'vue',
+      loader: 'vue-loader',
       options: {
         cssModules: {
           localIdentName: '[path][name]---[local]---[hash:base64:5]',
diff --git a/docs/kr/options.md b/docs/kr/options.md
index 3c7572fa0..0368b0f99 100644
--- a/docs/kr/options.md
+++ b/docs/kr/options.md
@@ -11,7 +11,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           // vue-loader 옵션
         }
@@ -65,14 +65,14 @@ module: {
 
 - 타입: `{ [lang: string]: string }`
 - only supported in >=10.3.0
-- 10.3.0 버전 이후 지원 
+- 10.3.0 버전 이후 지원
 
   `loaders` 설정의 포맷과 동일하지만, `preLoaders`는 기본 로더보다 우선하여 language block에 적용됩니다. 이를 사용하면 language block을 미리 처리할 수 있습니다. (일반적인 사용 사례는 빌드 타임에 국제화를 적용하는 경우입니다.)
 
 ### postLoaders
 
 - 타입: `{ [lang: string]: string }`
-- 10.3.0 버전 이후 지원 
+- 10.3.0 버전 이후 지원
 
 `loaders` 설정의 포맷과 동일하지만, `preLoaders`는 기본 로더보다 나중에 적용됩니다. 이를 사용하면 language block에 대한 사후 처리를 할 수 있습니다. 약간 복잡합니다.
 
diff --git a/docs/pt_BR/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
index 18a23ae4e..20595aa64 100644
--- a/docs/pt_BR/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -49,7 +49,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             // extrai todo conteúdo de <docs> em texto bruto
@@ -88,13 +88,13 @@ Agora, vamos configurar o webpack para usar o nosso carregador personalizado par
 
 ``` js
  const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
- 
+
  module.exports = {
    module: {
      rules: [
        {
          test: /\.vue$/,
-         loader: 'vue',
+         loader: 'vue-loader',
          options: {
            loaders: {
              'docs': docsLoader
@@ -105,11 +105,11 @@ Agora, vamos configurar o webpack para usar o nosso carregador personalizado par
    }
  }
  ```
- 
+
  #### component.vue
- 
+
  Agora podemos acessar o conteúdo do bloco `<docs>` de componentes importados durante o tempo de execução.
- 
+
  ``` html
  <template>
    <div>
@@ -117,10 +117,10 @@ Agora, vamos configurar o webpack para usar o nosso carregador personalizado par
      <p>{{ docs }}</p>
    </div>
  </template>
- 
+
  <script>
  import componentB from 'componentB';
- 
+
  export default = {
    data () {
      return {
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index ae27b8680..dc9fbea68 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -49,7 +49,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             // извлечь всё содержимое тегов <docs> как обычный текст
@@ -70,9 +70,9 @@ module.exports = {
 
 Вот пример того, как можно встроить пользовательские блоки `<docs>` в компонент, чтобы он был доступен во время выполнения.
 
-#### docs-loader.js 
+#### docs-loader.js
 
-Для инъекции содержимого пользовательского блока понадобится пользовательский загрузчик: 
+Для инъекции содержимого пользовательского блока понадобится пользовательский загрузчик:
 
 ``` js
 module.exports = function (source, map) {
@@ -94,7 +94,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             'docs': docsLoader
@@ -108,7 +108,7 @@ module.exports = {
 
 #### component.vue
 
-Теперь мы можем получить доступ к содержимому блока `<docs>` импортированного компонента на этапе выполнения. 
+Теперь мы можем получить доступ к содержимому блока `<docs>` импортированного компонента на этапе выполнения.
 
 ``` html
 <template>
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index 1d8431c70..124f1796c 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -50,7 +50,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             // 提取 <docs> 中的内容为原始文本
@@ -95,7 +95,7 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           loaders: {
             'docs': docsLoader

From 6054283cd8ab719c2399dd03737328c99ff30878 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Tue, 7 Nov 2017 18:09:51 +0300
Subject: [PATCH 757/877] [RU] Translation update (#1046)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример

* options.md новая секция

* hot-reload.md новая секция
---
 docs/ru/features/hot-reload.md | 26 +++++++++++++++++++++++++-
 docs/ru/options.md             | 13 ++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/docs/ru/features/hot-reload.md b/docs/ru/features/hot-reload.md
index 66af67734..bfa8e7bdd 100644
--- a/docs/ru/features/hot-reload.md
+++ b/docs/ru/features/hot-reload.md
@@ -18,4 +18,28 @@
 
 При настройке проекта вручную горячая перезагрузка включится автоматически, когда вы запускаете ваш проект с помощью `webpack-dev-server --hot`.
 
-Продвинутые пользователи могут изучить [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api), который используется внутри `vue-loader`.
\ No newline at end of file
+Продвинутые пользователи могут изучить [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api), который используется внутри `vue-loader`.
+
+## Отключение горячей замены
+
+Горячая замена всегда включена, за исключением следующих ситуаций:
+
+ * Опция Webpack `target` в значении `node` (SSR)
+ * Webpack минифицирует код
+ * `process.env.NODE_ENV === 'production'`
+  
+Вы можете использовать опцию `hotReload: false` для принудительного отключения горячей замены:
+
+``` js
+module: {
+  rules: [
+    {
+      test: /\.vue$/,
+      loader: 'vue-loader',
+      options: {
+        hotReload: false // отключает горячую замену
+      }
+    }
+  ]
+}
+```
\ No newline at end of file
diff --git a/docs/ru/options.md b/docs/ru/options.md
index 0f371327b..41b3d3a5e 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -309,4 +309,15 @@ module.exports = {
 - Тип: `boolean`
 - По умолчанию: `true` в режиме разработки, `false` в режиме production.
 
-Генерировать ли source maps при перезагрузке кэша, добавив хэш-запрос в имени файла. Выключение этой опции может помочь при отладке с использованием source map.
\ No newline at end of file
+Генерировать ли source maps при перезагрузке кэша, добавив хэш-запрос в имени файла. Выключение этой опции может помочь при отладке с использованием source map.
+
+### hotReload
+
+> Добавлено в версии 13.5.0
+
+- Тип: `boolean`
+- По умолчанию: `true` в режиме разработки, `false` в режиме production или при установленной опции `target: 'node'` в конфигурации webpack.
+- Разрешённые значения: `false` (`true` не заставит работать горячую замену ни в режиме production, ни когда `target: 'node'`)
+
+Использование возможности Webpack по [горячей замене модулей](https://webpack.js.org/concepts/hot-module-replacement/) позволяет применять изменения в браузере **без необходимости обновления страницы**.
+Используйте эту опцию (со значением `false`) чтобы отключить горячую замену в режиме разработки. 
\ No newline at end of file

From e5bc6ede8653b8ea1259a00e6177780b85abf547 Mon Sep 17 00:00:00 2001
From: Nicholas Lee <nicholaslee119@gmail.com>
Date: Wed, 8 Nov 2017 05:37:10 +0900
Subject: [PATCH 758/877] chore: remove unnecessary blank space for better
 output string (#1028)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index e9ca890cd..217d7bc3d 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -296,7 +296,7 @@ module.exports = function (content) {
   }
 
   // template functional
-  output += '/* template functional */\n  '
+  output += '/* template functional */\n'
   output +=
     'var __vue_template_functional__ = ' +
     (functionalTemplate ? 'true' : 'false') +

From 47c33170986df96799d8fc4763671b6d926462f5 Mon Sep 17 00:00:00 2001
From: Daniel Chabr <danielchabr@gmail.com>
Date: Tue, 7 Nov 2017 13:37:42 -0700
Subject: [PATCH 759/877] fix: scoping of multiple animations (#1030)

fix #1031
---
 lib/style-compiler/plugins/scope-id.js |  2 +-
 test/fixtures/scoped-css.vue           | 16 ++++++++++++++++
 test/test.js                           |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index b2a53ff8a..1ad7697bf 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -63,7 +63,7 @@ module.exports = postcss.plugin('add-id', ({ id }) => root => {
       if (/-?animation$/.test(decl.prop)) {
         decl.value = decl.value.split(',')
           .map(v => {
-            const vals = v.split(/\s+/)
+            const vals = v.trim().split(/\s+/)
             const name = vals[0]
             if (keyframes[name]) {
               return [keyframes[name]].concat(vals.slice(1)).join(' ')
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index ef2d41b7f..7eacac8be 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -15,6 +15,14 @@ h1 {
   animation-name: color;
   animation-duration: 5s;
 }
+.anim-multiple {
+  animation: color 5s infinite, opacity 2s;
+}
+.anim-multiple-2 {
+  animation-name: color, opacity;
+  animation-duration: 5s, 2s;
+}
+
 @keyframes color {
   from { color: red; }
   to { color: green; }
@@ -23,6 +31,14 @@ h1 {
   from { color: red; }
   to { color: green; }
 }
+@keyframes opacity {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+@-webkit-keyframes opacity {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
 .foo p >>> .bar {
   color: red;
 }
diff --git a/test/test.js b/test/test.js
index c596b7a9a..51ec6019a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -213,6 +213,11 @@ describe('vue-loader', () => {
       expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
       expect(style).to.contain(`@keyframes color-${id} {`)
       expect(style).to.contain(`@-webkit-keyframes color-${id} {`)
+
+      expect(style).to.contain(`.anim-multiple[${id}] {\n  animation: color-${id} 5s infinite,opacity-${id} 2s;`)
+      expect(style).to.contain(`.anim-multiple-2[${id}] {\n  animation-name: color-${id},opacity-${id};`)
+      expect(style).to.contain(`@keyframes opacity-${id} {`)
+      expect(style).to.contain(`@-webkit-keyframes opacity-${id} {`)
       // >>> combinator
       expect(style).to.contain(`.foo p[${id}] .bar {\n  color: red;\n}`)
       done()

From 77915b89f22b689d0af9b8bc57d4219b2ead59f4 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 7 Nov 2017 15:41:17 -0500
Subject: [PATCH 760/877] 13.5.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a63274ff8..178e31e3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.4.0",
+  "version": "13.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4e69e8495..27a81ac24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.4.0",
+  "version": "13.5.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From cda497343de9d0a8cdac1afd8636260f8059cde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E8=B6=85?= <tianchaolf@126.com>
Date: Thu, 9 Nov 2017 00:24:11 +0800
Subject: [PATCH 761/877] Update custom-blocks.md (#1047)

---
 docs/zh-cn/configurations/custom-blocks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index 124f1796c..5378d2506 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -61,7 +61,7 @@ module.exports = {
     ]
   },
   plugins: [
-    // 输出 docs 到当个文件中
+    // 输出 docs 到单个文件中
     new ExtractTextPlugin('docs.md')
   ]
 }

From e637c886b6d0b029954f1b18dc0c101acfc3f48f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sun, 12 Nov 2017 00:43:50 +0800
Subject: [PATCH 762/877] [en] Webpack -> webpack (#1054)

* [en] Webpack -> webpack

* [docs] Webpack -> webpack in other languages
---
 docs/en/README.md                           | 20 ++++++------
 docs/en/configurations/advanced.md          |  6 ++--
 docs/en/configurations/asset-url.md         |  4 +--
 docs/en/configurations/custom-blocks.md     |  2 +-
 docs/en/configurations/extract-css.md       |  4 +--
 docs/en/configurations/pre-processors.md    | 12 ++++----
 docs/en/features/es2015.md                  |  2 +-
 docs/en/features/hot-reload.md              |  8 ++---
 docs/en/features/postcss.md                 |  4 +--
 docs/en/options.md                          | 18 +++++------
 docs/en/start/spec.md                       |  4 +--
 docs/en/workflow/linting.md                 |  6 ++--
 docs/en/workflow/production.md              |  4 +--
 docs/en/workflow/testing.md                 |  4 +--
 docs/ja/README.md                           | 20 ++++++------
 docs/ja/configurations/advanced.md          |  4 +--
 docs/ja/configurations/asset-url.md         |  2 +-
 docs/ja/configurations/custom-blocks.md     |  2 +-
 docs/ja/configurations/extract-css.md       |  4 +--
 docs/ja/configurations/pre-processors.md    |  8 ++---
 docs/ja/features/es2015.md                  |  2 +-
 docs/ja/features/postcss.md                 |  4 +--
 docs/ja/options.md                          | 34 ++++++++++-----------
 docs/ja/start/spec.md                       |  4 +--
 docs/ja/workflow/linting.md                 |  6 ++--
 docs/ja/workflow/production.md              |  4 +--
 docs/ja/workflow/testing.md                 |  6 ++--
 docs/kr/README.md                           | 20 ++++++------
 docs/kr/configurations/advanced.md          | 10 +++---
 docs/kr/configurations/asset-url.md         |  4 +--
 docs/kr/configurations/custom-blocks.md     |  2 +-
 docs/kr/configurations/extract-css.md       |  8 ++---
 docs/kr/configurations/pre-processors.md    |  8 ++---
 docs/kr/features/es2015.md                  |  2 +-
 docs/kr/features/postcss.md                 |  4 +--
 docs/kr/options.md                          | 14 ++++-----
 docs/kr/start/spec.md                       | 10 +++---
 docs/kr/workflow/linting.md                 |  6 ++--
 docs/kr/workflow/production.md              |  2 +-
 docs/kr/workflow/testing.md                 |  6 ++--
 docs/pt_BR/README.md                        | 20 ++++++------
 docs/pt_BR/configurations/advanced.md       | 20 ++++++------
 docs/pt_BR/configurations/asset-url.md      |  6 ++--
 docs/pt_BR/configurations/custom-blocks.md  |  2 +-
 docs/pt_BR/configurations/extract-css.md    |  4 +--
 docs/pt_BR/configurations/pre-processors.md |  8 ++---
 docs/pt_BR/features/es2015.md               |  4 +--
 docs/pt_BR/features/postcss.md              |  6 ++--
 docs/pt_BR/options.md                       | 18 +++++------
 docs/pt_BR/start/spec.md                    |  6 ++--
 docs/pt_BR/workflow/linting.md              |  8 ++---
 docs/pt_BR/workflow/production.md           |  4 +--
 docs/pt_BR/workflow/testing.md              |  8 ++---
 docs/ru/README.md                           | 20 ++++++------
 docs/ru/configurations/advanced.md          |  4 +--
 docs/ru/configurations/asset-url.md         |  4 +--
 docs/ru/configurations/custom-blocks.md     |  4 +--
 docs/ru/configurations/extract-css.md       |  4 +--
 docs/ru/configurations/pre-processors.md    | 10 +++---
 docs/ru/features/es2015.md                  |  2 +-
 docs/ru/features/hot-reload.md              |  8 ++---
 docs/ru/features/postcss.md                 |  4 +--
 docs/ru/options.md                          | 20 ++++++------
 docs/ru/start/spec.md                       |  6 ++--
 docs/ru/workflow/linting.md                 |  6 ++--
 docs/ru/workflow/production.md              |  4 +--
 docs/ru/workflow/testing.md                 |  4 +--
 67 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/docs/en/README.md b/docs/en/README.md
index 0250fa4a9..a91d0a71a 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -2,32 +2,32 @@
 
 ### What is `vue-loader`?
 
-`vue-loader` is a loader for Webpack that can transform Vue components written in the following format into a plain JavaScript module:
+`vue-loader` is a loader for webpack that can transform Vue components written in the following format into a plain JavaScript module:
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 There are many cool features provided by `vue-loader`:
 
 - ES2015 enabled by default;
-- Allows using other Webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
+- Allows using other webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
 - Allows custom sections in a .vue file that can have custom loader chains applied to them
-- Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with Webpack loaders;
+- Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with webpack loaders;
 - Can simulate scoped CSS for each component;
 - Supports component hot-reloading during development.
 
-In a nutshell, the combination of Webpack and `vue-loader` gives you a modern, flexible and extremely powerful front-end workflow for authoring Vue.js applications.
+In a nutshell, the combination of webpack and `vue-loader` gives you a modern, flexible and extremely powerful front-end workflow for authoring Vue.js applications.
 
-### What is Webpack?
+### What is webpack?
 
-If you are already familiar with Webpack, feel free to skip the following explanation. But for those of you who are new to Webpack, here's a quick intro:
+If you are already familiar with webpack, feel free to skip the following explanation. But for those of you who are new to webpack, here's a quick intro:
 
-[Webpack](https://webpack.github.io/) is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
+[webpack](https://webpack.github.io/) is a module bundler. It takes a bunch of files, treating each as a module, figuring out the dependencies between them, and bundle them into static assets that are ready for deployment.
 
 ![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
-For a basic example, imagine we have a bunch of CommonJS modules. They cannot run directly inside the browser, so we need to "bundle" them into a single file that can be included via a `<script>` tag. Webpack can follow the dependencies of the `require()` calls and do that for us.
+For a basic example, imagine we have a bunch of CommonJS modules. They cannot run directly inside the browser, so we need to "bundle" them into a single file that can be included via a `<script>` tag. webpack can follow the dependencies of the `require()` calls and do that for us.
 
-But Webpack can do more than that. With "loaders", we can teach Webpack to transform all types of files in any way we want before outputting the final bundle. Some examples include:
+But webpack can do more than that. With "loaders", we can teach webpack to transform all types of files in any way we want before outputting the final bundle. Some examples include:
 
 - Transpile ES2015, CoffeeScript or TypeScript modules into plain ES5 CommonJS modules;
 - Optionally you can pipe the source code through a linter before doing the compilation;
@@ -35,4 +35,4 @@ But Webpack can do more than that. With "loaders", we can teach Webpack to trans
 - Transpile SASS files into plain CSS, then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
 - Process an image file referenced in HTML or CSS, moved it to the desired destination based on the path configurations, and naming it using its md5 hash.
 
-Webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is its verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using Webpack with Vue.js and `vue-loader`.
+webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is its verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using webpack with Vue.js and `vue-loader`.
diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 90563308b..7a0c05ee9 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -12,7 +12,7 @@ To do that, specify the `loaders` option for `vue-loader`:
 
 > Note that `preLoaders` and `postLoaders` are only supported in 10.3.0+
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 module.exports = {
@@ -49,7 +49,7 @@ module.exports = {
           postLoaders: {
             html: 'babel-loader'
           },
-          
+
           // `excludedPreLoaders` should be regex
           excludedPreLoaders: /(eslint-loader)/
         }
@@ -59,7 +59,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` js
 // webpack.config.js
diff --git a/docs/en/configurations/asset-url.md b/docs/en/configurations/asset-url.md
index eeceef709..d2ba4c16c 100644
--- a/docs/en/configurations/asset-url.md
+++ b/docs/en/configurations/asset-url.md
@@ -14,10 +14,10 @@ will be compiled into:
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-Because `.png` is not a JavaScript file, you will need to configure Webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. The project scaffolded with `vue-cli` has also configured this for you.
+Because `.png` is not a JavaScript file, you will need to configure webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. The project scaffolded with `vue-cli` has also configured this for you.
 
 The benefits of all this are:
 
-1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreover, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, Webpack will auto-rewrite the file paths into correct URLs in the bundled output.
+1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreover, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, webpack will auto-rewrite the file paths into correct URLs in the bundled output.
 
 2. `url-loader` allows you to conditionally inline a file as base-64 data URL if they are smaller than a given threshold. This can reduce the amount of HTTP requests for trivial files. If the file is larger than the threshold, it automatically falls back to `file-loader`.
diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index ffd6013bf..e10021f51 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -41,7 +41,7 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// Webpack 2.x
+// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index f40b2c017..457b923d9 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -39,7 +39,7 @@ Note this only extracts `*.vue` files though - CSS imported in JavaScript still
 
 Example config to extract all the processed CSS in all Vue components into a single CSS file:
 
-### Webpack 2.x
+### webpack 2.x
 
 
 ``` js
@@ -70,7 +70,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index caf92e277..632274ace 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # Using Pre-Processors
 
-In Webpack, all pre-processors need to be applied with a corresponding loader. `vue-loader` allows you to use other Webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
+In webpack, all pre-processors need to be applied with a corresponding loader. `vue-loader` allows you to use other webpack loaders to process a part of a Vue component. It will automatically infer the proper loaders to use from the `lang` attribute of a language block.
 
 ### CSS
 
@@ -20,7 +20,7 @@ Under the hood, the text content inside the `<style>` tag will be first compiled
 
 #### sass-loader caveat
 
-Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *SASS* syntax, you have to configure vue-loader's options for sass-loader accordingly. 
+Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *SASS* syntax, you have to configure vue-loader's options for sass-loader accordingly.
 
 ```javascript
 {
@@ -69,7 +69,7 @@ scss: generateLoaders('sass').concat(
 ),
 ```
 
-It is recommended to only include variables, mixins, etc. in this file, to prevent duplicated css in your final, compiled files. 
+It is recommended to only include variables, mixins, etc. in this file, to prevent duplicated css in your final, compiled files.
 
 ### JavaScript
 
@@ -87,7 +87,7 @@ npm install coffee-loader --save-dev
 
 ### Templates
 
-Processing templates is a little different, because most Webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we can just install the original `pug`:
+Processing templates is a little different, because most webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we can just install the original `pug`:
 
 ``` bash
 npm install pug --save-dev
@@ -104,7 +104,7 @@ div
 
 ### Inline Loader Requests
 
-You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) in the `lang` attribute:
+You can use [webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) in the `lang` attribute:
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -112,4 +112,4 @@ You can use [Webpack loader requests](https://webpack.github.io/docs/loaders.htm
 </style>
 ```
 
-However, note this makes your Vue component Webpack-specific and not compatible with Browserify and [vueify](https://github.com/vuejs/vueify). **If you intend to ship your Vue component as a reusable 3rd-party component, avoid using this syntax.**
+However, note this makes your Vue component webpack-specific and not compatible with Browserify and [vueify](https://github.com/vuejs/vueify). **If you intend to ship your Vue component as a reusable 3rd-party component, avoid using this syntax.**
diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index 023e41612..42461df49 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -58,7 +58,7 @@ You can also customize the features supported in templates using the [`buble` op
 
 ### Transpiling Normal `.js` Files
 
-Since `vue-loader` only processes `*.vue` files, you'd need to tell Webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the Webpack config file. The project scaffolded with `vue-cli` already does it for you.
+Since `vue-loader` only processes `*.vue` files, you'd need to tell webpack to process normal `*.js` files with `babel-loader` or `buble-loader` in the webpack config file. The project scaffolded with `vue-cli` already does it for you.
 
 ### Configuring Babel with `.babelrc`
 
diff --git a/docs/en/features/hot-reload.md b/docs/en/features/hot-reload.md
index 71e77f7d3..2a04d0028 100644
--- a/docs/en/features/hot-reload.md
+++ b/docs/en/features/hot-reload.md
@@ -24,10 +24,10 @@ Advanced users may want to check out [vue-hot-reload-api](https://github.com/vue
 
 Hot Reload is always enabled except following situations:
 
- * Webpack `target` is `node` (SSR)
- * Webpack minifies the code
+ * webpack `target` is `node` (SSR)
+ * webpack minifies the code
  * `process.env.NODE_ENV === 'production'`
-  
+
 You may use `hotReload: false` option to disable the Hot Reload explicitly:
 
 ``` js
@@ -42,4 +42,4 @@ module: {
     }
   ]
 }
-```
\ No newline at end of file
+```
diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index d97f07379..4066d9ec6 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -16,7 +16,7 @@ Using a config file allows you to share the same config between your normal CSS
 
 Alternatively, you can specify postcss config specifically for `*.vue` files using the `postcss` option for `vue-loader`.
 
-Example usage in Webpack 1.x:
+Example usage in webpack 1.x:
 
 ``` js
 // webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2.x:
+For webpack 2.x:
 
 ``` js
 // webpack.config.js
diff --git a/docs/en/options.md b/docs/en/options.md
index 55eb290b2..8e63790a5 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -1,8 +1,8 @@
 # Options Reference
 
-## Usage Difference Between Webpack 1 & 2
+## Usage Difference Between webpack 1 & 2
 
-For Webpack 2: pass the options directly to the loader rule.
+For webpack 2: pass the options directly to the loader rule.
 
 ``` js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-For Webpack 1.x: add a root `vue` block in your Webpack config.
+For webpack 1.x: add a root `vue` block in your webpack config.
 
 ``` js
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
 
 - type: `{ [lang: string]: string }`
 
-  An object specifying Webpack loaders to overwrite the default loaders used for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
+  An object specifying webpack loaders to overwrite the default loaders used for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -45,7 +45,7 @@ module.exports = {
   For example, to use `babel-loader` and `eslint-loader` to process all `<script>` blocks:
 
   ``` js
-  // Webpack 2.x config
+  // webpack 2.x config
   module: {
     rules: [
       {
@@ -144,7 +144,7 @@ module.exports = {
 
   Whether to enable source maps for CSS. Disabling this can avoid some relative path related bugs in `css-loader` and make the build a bit faster.
 
-  Note this is automatically set to `false` if the `devtool` option is not present in the main Webpack config.
+  Note this is automatically set to `false` if the `devtool` option is not present in the main webpack config.
 
 ### esModule
 
@@ -183,7 +183,7 @@ module.exports = {
 - type: `{ [tag: string]: string | Array<string> }`
 - default: `{ img: 'src', image: 'xlink:href' }`
 
-  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by Webpack. The default config transforms the `src` attribute on `<img>` tags and `xlink:href` attribute on `<image>` tags of SVG.
+  During template compilation, the compiler can transform certain attributes, such as `src` URLs, into `require` calls, so that the target asset can be handled by webpack. The default config transforms the `src` attribute on `<img>` tags and `xlink:href` attribute on `<image>` tags of SVG.
 
 ### buble
 
@@ -319,5 +319,5 @@ Whether generate source maps with cache busting by appending a hash query to the
 - default: `true` in development mode, `false` in production mode or when the webpack config has `target: 'node'`.
 - allowed value: `false` (`true` will not force Hot Reload neither in production mode nor when `target: 'node'`)
 
-Whether to use Webpack [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/) to apply changes in the browser **without reloading the page**.
-Use this option (value `false`) to disable the Hot Reload feature in development mode.     
+Whether to use webpack [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/) to apply changes in the browser **without reloading the page**.
+Use this option (value `false`) to disable the Hot Reload feature in development mode.
diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 125ad60b6..3917f0857 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -56,7 +56,7 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - Each `*.vue` file can contain at most one `<script>` block at a time.
 
-- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via Webpack), which means you can `require()` other dependencies. And with ES2015 support, you can also use the `import` and `export` syntax.
+- The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via webpack), which means you can `require()` other dependencies. And with ES2015 support, you can also use the `import` and `export` syntax.
 
 - The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
 
@@ -68,7 +68,7 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - A `<style>` tag can have `scoped` or `module` attributes (see [Scoped CSS](../features/scoped-css.md) and [CSS Modules](../features/css-modules.md)) to help encapsulate the styles to the current component. Multiple `<style>` tags with different encapsulation modes can be mixed in the same component.
 
-- By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure Webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
+- By default, contents will be extracted and dynamically inserted into the document's `<head>` as an actual `<style>` tag using `style-loader`. It's also possible to [configure webpack so that all styles in all components are extracted into a single CSS file](../configurations/extract-css.md).
 
 ### Custom Blocks
 
diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index d23cd01b7..599a57620 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -39,9 +39,9 @@ module.exports = {
 }
 ```
 
-Note that Webpack loader chains are applied **right-first**. Make sure to apply `eslint` before `vue` so we are linting the pre-compile source code.
+Note that webpack loader chains are applied **right-first**. Make sure to apply `eslint` before `vue` so we are linting the pre-compile source code.
 
-One thing we need to consider is using third party `*.vue` components shipped in NPM packages. In such case, we want to use `vue-loader` to process the third party component, but do not want to lint it. We can separate the linting into Webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order):
+One thing we need to consider is using third party `*.vue` components shipped in NPM packages. In such case, we want to use `vue-loader` to process the third party component, but do not want to lint it. We can separate the linting into webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order):
 
 ``` js
 // webpack.config.js
@@ -67,7 +67,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2.x:
+For webpack 2.x:
 
 ``` js
 // webpack.config.js
diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index 931816e62..b06bd49d9 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // Webpack 1 only - optimize module ids by occurrence count
+    // webpack 1 only - optimize module ids by occurrence count
     new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
@@ -34,6 +34,6 @@ Obviously we don't want to use this config during development, so there are seve
 
 1. Dynamically build up the configuration object based on an environment variable;
 
-2. Or, use two separate Webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+2. Or, use two separate webpack config files, one for development and one for production. And maybe share some common options between them in a third file, as shown in [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
 
 It's really up to you as long as it achieves the goal.
diff --git a/docs/en/workflow/testing.md b/docs/en/workflow/testing.md
index b8ca599cd..ffa945f93 100644
--- a/docs/en/workflow/testing.md
+++ b/docs/en/workflow/testing.md
@@ -2,7 +2,7 @@
 
 > The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
 
-When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use Webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](https://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
+When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](https://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
 
 Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](https://jasmine.github.io/edge/introduction.html) test framework:
 
@@ -47,7 +47,7 @@ And for the entry `test/index.js` file:
 
 ``` js
 // test/index.js
-// require all test files using special Webpack feature
+// require all test files using special webpack feature
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
diff --git a/docs/ja/README.md b/docs/ja/README.md
index 08504db53..ff21057c3 100644
--- a/docs/ja/README.md
+++ b/docs/ja/README.md
@@ -2,31 +2,31 @@
 
 ### `vue-loader` とは ?
 
-`vue-loader` とは以下の形式で記述された Vue コンポーネントをプレーンな JavaScript モジュールに変換する Webpack の loader です。
+`vue-loader` とは以下の形式で記述された Vue コンポーネントをプレーンな JavaScript モジュールに変換する webpack の loader です。
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 `vue-loader` によって多くのクールな機能が提供されます:
 
 - デフォルトで ES2015 が有効
-- `<style>` には SASS、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の Webpack の loader が使用可能、カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能
-- `<style>` と `<template>` で参照される静的なアセットをモジュールの依存として扱い、Webpack の loader で処理可能
+- `<style>` には SASS、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の webpack の loader が使用可能、カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能
+- `<style>` と `<template>` で参照される静的なアセットをモジュールの依存として扱い、webpack の loader で処理可能
 - 各コンポーネントで scoped CSS をシミュレートすることが可能
 - 開発時のコンポーネントのホットリロードをサポート
 
-つまり、Webpack と `vue-loader` の組み合わせは Vue.js アプリケーションを作成するための、現代的で柔軟かつとても強力なフロントエンドワークフローを実現することが可能になります。
+つまり、webpack と `vue-loader` の組み合わせは Vue.js アプリケーションを作成するための、現代的で柔軟かつとても強力なフロントエンドワークフローを実現することが可能になります。
 
-### Webpack とは?
+### webpack とは?
 
-すでに Webpack に精通している場合は、次の説明を省略してもかまいません。しかし、Webpack を初めて使う人のために、ここで簡単な紹介を行います。
+すでに webpack に精通している場合は、次の説明を省略してもかまいません。しかし、webpack を初めて使う人のために、ここで簡単な紹介を行います。
 
-[Webpack](http://webpack.github.io/) とはモジュールのバンドラーです。それぞれのファイルをモジュールとして扱い、それらの間の依存関係を解決し、デプロイの準備が整った静的アセットにバンドルします。
+[webpack](http://webpack.github.io/) とはモジュールのバンドラーです。それぞれのファイルをモジュールとして扱い、それらの間の依存関係を解決し、デプロイの準備が整った静的アセットにバンドルします。
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
-基本的な例として、CommonJS モジュールが多数あるとします。これらはブラウザで直接実行できません。なのでそれらを `<script>` タグを介して読み込むことのできる単一のファイルに "バンドル" する必要があります。Webpack は `require()` での依存性解決と実行を行うことが出来ます。
+基本的な例として、CommonJS モジュールが多数あるとします。これらはブラウザで直接実行できません。なのでそれらを `<script>` タグを介して読み込むことのできる単一のファイルに "バンドル" する必要があります。webpack は `require()` での依存性解決と実行を行うことが出来ます。
 
-しかし Webpack はそれ以上のことが出来ます。 "loader" を用いることで、最終的なバンドルしたファイルを出力する前に Webpack に様々な方法で全てのタイプのファイルを変換できるように設定することが出来ます。いくつかの例をあげると：
+しかし webpack はそれ以上のことが出来ます。 "loader" を用いることで、最終的なバンドルしたファイルを出力する前に webpack に様々な方法で全てのタイプのファイルを変換できるように設定することが出来ます。いくつかの例をあげると：
 
 - ES2015、CoffeeScript、TypeScript のモジュールをプレーンな ES5 の CommonJS モジュールにトランスパイル
 - オプションでコンパイルを行う前にソースコードを linter に通すことが可能
@@ -34,4 +34,4 @@
 - SASS ファイルをプレーンな CSS にトランスパイルし、`<style>` タグとして挿入する JavaScript スニペットに変換
 - HTML または CSS で参照されるイメージファイルを処理し、パスの設定に基づいた目的の場所に移動し、md5 ハッシュを使用して名前付け
 
-Webpack は非常に強力です。どのように動作するか理解すれば、フロントエンド開発のワークフローを劇的に向上させることが出来ます。欠点としては冗長で複雑な構成です。しかし、このガイドでは Vue.js と `vue-loader` での Webpack を使用する際に一般的な問題の解決策を見つけることができるはずです。
+webpack は非常に強力です。どのように動作するか理解すれば、フロントエンド開発のワークフローを劇的に向上させることが出来ます。欠点としては冗長で複雑な構成です。しかし、このガイドでは Vue.js と `vue-loader` での webpack を使用する際に一般的な問題の解決策を見つけることができるはずです。
diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index b4716292f..05606a5f5 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -10,7 +10,7 @@
 
 > メモ: `preLoaders` と `postLoaders` は 10.3.0 以降でのみサポートされます
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 module.exports = {
@@ -57,7 +57,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` js
 // webpack.config.js
diff --git a/docs/ja/configurations/asset-url.md b/docs/ja/configurations/asset-url.md
index 18cc121e5..1b5c61e44 100644
--- a/docs/ja/configurations/asset-url.md
+++ b/docs/ja/configurations/asset-url.md
@@ -13,7 +13,7 @@
 ``` js
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
-もちろん `.png` ファイルは JavaScript のファイルではありません。[file-loader](https://github.com/webpack/file-loader) または [url-loader](https://github.com/webpack/url-loader) を使用して Webpack を設定する必要があります。`vue-cli` でスキャフォールドされたプロジェクトでは同じような設定がなされています。
+もちろん `.png` ファイルは JavaScript のファイルではありません。[file-loader](https://github.com/webpack/file-loader) または [url-loader](https://github.com/webpack/url-loader) を使用して webpack を設定する必要があります。`vue-cli` でスキャフォールドされたプロジェクトでは同じような設定がなされています。
 
 利点の全ては次の通りです:
 
diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
index 4021ecdfe..eb1f45f34 100644
--- a/docs/ja/configurations/custom-blocks.md
+++ b/docs/ja/configurations/custom-blocks.md
@@ -41,7 +41,7 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// Webpack 2.x
+// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/ja/configurations/extract-css.md b/docs/ja/configurations/extract-css.md
index e166a56a8..1dbc1b8ef 100644
--- a/docs/ja/configurations/extract-css.md
+++ b/docs/ja/configurations/extract-css.md
@@ -39,7 +39,7 @@ module.exports = {
 
 すべての Vue コンポーネントで処理されたすべての CSS を 1 つの CSS ファイルに抽出する例:
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 // webpack.config.js
@@ -69,7 +69,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
index a15c5d624..01950585f 100644
--- a/docs/ja/configurations/pre-processors.md
+++ b/docs/ja/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # プリプロセッサの使用
 
-Webpack において、全てのプリプロセッサは対応する loader を適用する必要があります。 `vue-loader` は他の Webpack の loader を使って Vue コンポーネントを処理することが出来ます。言語ブロックの `lang` 属性から適切な loader を自動的に推論します。
+webpack において、全てのプリプロセッサは対応する loader を適用する必要があります。 `vue-loader` は他の webpack の loader を使って Vue コンポーネントを処理することが出来ます。言語ブロックの `lang` 属性から適切な loader を自動的に推論します。
 
 ### CSS
 
@@ -87,7 +87,7 @@ npm install coffee-loader --save-dev
 
 ### テンプレート
 
-`pug-loader` のようなほとんどのWebpackテンプレート loader は、コンパイルされたHTML文字列の代わりにテンプレート関数を返すので、template の処理は少し異なります。`pug-loader` を使う代わりに、オリジナルの `pug` をインストールをするだけです:
+`pug-loader` のようなほとんどのwebpackテンプレート loader は、コンパイルされたHTML文字列の代わりにテンプレート関数を返すので、template の処理は少し異なります。`pug-loader` を使う代わりに、オリジナルの `pug` をインストールをするだけです:
 
 ``` bash
 npm install pug --save-dev
@@ -104,7 +104,7 @@ div
 
 ### インラインローダーリクエスト
 
-`lang` 属性で [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) を使用することが可能です:
+`lang` 属性で [webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction) を使用することが可能です:
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -112,4 +112,4 @@ div
 </style>
 ```
 
-ただこれにより Vue コンポーネントが Webpack 固有となり Browserify および [vueify](https://github.com/vuejs/vueify) と互換性がなくなります。 **Vue コンポーネントを再利用可能なサードパーティコンポーネントとして提供する場合は、この構文を使用しないでください。**
+ただこれにより Vue コンポーネントが webpack 固有となり Browserify および [vueify](https://github.com/vuejs/vueify) と互換性がなくなります。 **Vue コンポーネントを再利用可能なサードパーティコンポーネントとして提供する場合は、この構文を使用しないでください。**
diff --git a/docs/ja/features/es2015.md b/docs/ja/features/es2015.md
index a27463230..003ae9fd3 100644
--- a/docs/ja/features/es2015.md
+++ b/docs/ja/features/es2015.md
@@ -57,7 +57,7 @@ export default {
 
 ### `.js` ファイルのトランスパイル
 
-`vue-loader` は `*.vue` ファイルのみ処理するので、Webpack の設定ファイルに `babel-loader` または `buble-loader` を使って `*.js` ファイルを処理するように Webapck に指示する必要があります。 `vue-cli` でプロジェクトを作成しているとすでにそれは用意されています。
+`vue-loader` は `*.vue` ファイルのみ処理するので、webpack の設定ファイルに `babel-loader` または `buble-loader` を使って `*.js` ファイルを処理するように Webapck に指示する必要があります。 `vue-cli` でプロジェクトを作成しているとすでにそれは用意されています。
 
 ### `.babelrc` による Babel の設定
 
diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
index 07bff8d7f..717f338f9 100644
--- a/docs/ja/features/postcss.md
+++ b/docs/ja/features/postcss.md
@@ -16,7 +16,7 @@
 
 あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の postcss の設定を指定することが出来ます。
 
-Webpack 1.x の例:
+webpack 1.x の例:
 
 ``` js
 // webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
 }
 ```
 
-Webpack 2.x の例:
+webpack 2.x の例:
 
 ``` js
 // webpack.config.js
diff --git a/docs/ja/options.md b/docs/ja/options.md
index d6982b265..017be9238 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -1,8 +1,8 @@
 # オプションリファレンス
 
-## Webpack 1 と 2 の使い方の違い
+## webpack 1 と 2 の使い方の違い
 
-Webpack 2 の場合: オプションを loader ルールに直接渡します。
+webpack 2 の場合: オプションを loader ルールに直接渡します。
 
 ``` js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-Webpack 1.x の場合: Webpack の設定のルートに `vue` ブロックを追加します。
+webpack 1.x の場合: webpack の設定のルートに `vue` ブロックを追加します。
 
 ``` js
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
 
 - 型: `{ [lang: string]: string }`
 
-  `* .vue` ファイル内の言語ブロックに使用されるデフォルトの loader を上書きする Webpack loader を指定するオブジェクト。キーは指定されている場合、言語ブロックの `lang` 属性に対応します。各タイプのデフォルトの `lang` は次のとおりです:
+  `* .vue` ファイル内の言語ブロックに使用されるデフォルトの loader を上書きする webpack loader を指定するオブジェクト。キーは指定されている場合、言語ブロックの `lang` 属性に対応します。各タイプのデフォルトの `lang` は次のとおりです:
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -45,7 +45,7 @@ module.exports = {
   たとえば、`babel-loader` と `eslint-loader` を使ってすべての `<script>` ブロックを処理するには:
 
   ``` js
-  // Webpack 2.x config
+  // webpack 2.x config
   module: {
     rules: [
       {
@@ -143,7 +143,7 @@ module.exports = {
 
   CSS のソースマップを有効にするかどうか。これを無効にすると、`css-loader` の相対パス関連のバグを避けることができ、ビルドを少し早くすることができます。
 
-  注意: もしメインの Webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
+  注意: もしメインの webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
 
 ### cacheBusting
 
@@ -191,7 +191,7 @@ module.exports = {
 - 型: `{ [tag: string]: string | Array<string> }`
 - デフォルト: `{ img: 'src', image: 'xlink:href' }`
 
-  テンプレートのコンパイル中、コンパイラは `src` の URL のような特定の属性を `require` 呼び出しに変換することができます。これによりターゲットの asset を Webpack が処理できるようになります。デフォルトの設定は `<img>` タグの `src` 属性と SVG の `<image>` タグの `xlink:href` 属性を変換します。
+  テンプレートのコンパイル中、コンパイラは `src` の URL のような特定の属性を `require` 呼び出しに変換することができます。これによりターゲットの asset を webpack が処理できるようになります。デフォルトの設定は `<img>` タグの `src` 属性と SVG の `<image>` タグの `xlink:href` 属性を変換します。
 
 ### buble
 
@@ -238,24 +238,24 @@ module.exports = {
   ```
 
 ### extractCSS
-  
+
   > 12.0.0 で追加
-  
+
   - 型: `boolean`
   - デフォルト: `false`
 
   自動的に `extract-text-webpack-plugin` を使用して CSS を抽出します。ほとんどのプリプロセッサに対してすぐに動作し、本番環境においても同様に圧縮 (minify) 処理します。
-  
+
   `true` またはプラグインのインスタンス (複数の抽出されたファイルに対して `extract-text-webpack-plugin` の複数のインスタンスを使用できるように) を値として渡すことができます。
- 
+
   これは、開発中にはホットリロードが動作するため本番環境でのみ使用する必要があります。
-  
+
   例:
-  
+
   ``` js
   // webpack.config.js
   var ExtractTextPlugin = require("extract-text-webpack-plugin")
-  
+
   module.exports = {
     // 他のオプション ...
     module: {
@@ -274,14 +274,14 @@ module.exports = {
     ]
   }
   ```
-  
+
   または、プラグインのインスタンスを渡します:
-  
+
   ``` js
   // webpack.config.js
   var ExtractTextPlugin = require("extract-text-webpack-plugin")
   var plugin = new ExtractTextPlugin("style.css")
-  
+
   module.exports = {
     // 他のオプション ...
     module: {
diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
index 8ec36f226..94a0e431b 100644
--- a/docs/ja/start/spec.md
+++ b/docs/ja/start/spec.md
@@ -51,7 +51,7 @@ export default {
 
 - デフォルトの言語は `js`（`babel-loader` や `buble-loader` が検出される場合、自動的にES2015がサポートされる）
 - それぞれの `*.vue` ファイルは最大で一つの `<script>` ブロックを含みます
-- スクリプトは CommonJS のように処理されます（ Webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `require()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます
+- スクリプトは CommonJS のように処理されます（ webpack 経由でバンドルされた通常の `.js` モジュールと同じです）。つまり他の依存関係を `require()` することができます。そして ES2015 がサポートされ、`import` と `export` 構文を使用することが出来ます
 - スクリプトは Vue.js コンポーネントのオプションオブジェクトをエクスポートする必要があります。 `Vue.extend()` によって拡張されたコンストラクタもエクスポートすることが可能ですが、プレーンなオブジェクトが好ましいです
 
 #### `<style>`
@@ -59,7 +59,7 @@ export default {
 - デフォルトの言語は `css`
 - 複数の `<style>` タグは単一の `*.vue` ファイルでサポートされます
 - `<style>` タグは `scoped` か `module` （詳しくは [Scoped CSS](../features/scoped-css.md) と [CSS Modules](../features/css-modules.md) をみてください）を使用してコンポーネントにスタイルをカプセル化する事が出来ます。異なるカプセルモードをもつ複数の `<style>` タグは同じコンポーネント内で混在させることが出来ます
-- デフォルトではコンテンツは `style-loader` を使用して実際の `<style>` タグとして抽出され、ドキュメントの `<head>` に動的に挿入されます。また、[すべてのコンポーネントのすべてのスタイルが単一のCSSファイルに抽出されるようにWebpackを設定する](../configurations/extract-css.md)ことも出来ます
+- デフォルトではコンテンツは `style-loader` を使用して実際の `<style>` タグとして抽出され、ドキュメントの `<head>` に動的に挿入されます。また、[すべてのコンポーネントのすべてのスタイルが単一のCSSファイルに抽出されるようにwebpackを設定する](../configurations/extract-css.md)ことも出来ます
 
 ### カスタムブロック
 
diff --git a/docs/ja/workflow/linting.md b/docs/ja/workflow/linting.md
index 2612abc41..d55ca5c7f 100644
--- a/docs/ja/workflow/linting.md
+++ b/docs/ja/workflow/linting.md
@@ -38,9 +38,9 @@ module.exports = {
   }
 }
 ```
-Webpack ローダーチェーンは**まずはじめに**に適用されることをご了承ください。`vue` の前に `eslint` を適用して、コンパイル前のソースコードをリントしてください。
+webpack ローダーチェーンは**まずはじめに**に適用されることをご了承ください。`vue` の前に `eslint` を適用して、コンパイル前のソースコードをリントしてください。
 
-1 つ私たちが考慮する必要があるのは、NPM パッケージでリリースされているサードパーティの* .vueコンポーネントを使用することです。そのような場合には、サードパーティー製のコンポーネントを処理するために  `vue-loader` を使用したいと思いますが、それをリントしたくはありません。そういうときはリントを Webpack の [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) に分けることが可能です:
+1 つ私たちが考慮する必要があるのは、NPM パッケージでリリースされているサードパーティの* .vueコンポーネントを使用することです。そのような場合には、サードパーティー製のコンポーネントを処理するために  `vue-loader` を使用したいと思いますが、それをリントしたくはありません。そういうときはリントを webpack の [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) に分けることが可能です:
 
 ``` js
 // webpack.config.js
@@ -66,7 +66,7 @@ module.exports = {
 }
 ```
 
-Webpack 2.x:
+webpack 2.x:
 
 ``` js
 // webpack.config.js
diff --git a/docs/ja/workflow/production.md b/docs/ja/workflow/production.md
index d20d061e4..a7a6ba34e 100644
--- a/docs/ja/workflow/production.md
+++ b/docs/ja/workflow/production.md
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // Webpack 1 のみ - 発生回数別にモジュールIDを最適化します
+    // webpack 1 のみ - 発生回数別にモジュールIDを最適化します
     new webpack.optimize.OccurenceOrderPlugin()
   ]
 }
@@ -33,6 +33,6 @@ module.exports = {
 明らかに開発中にこの設定を使いたくないので、これにはいくつかの方法をとります:
 
 1. 環境変数に基づいて構成オブジェクトを動的に構築します
-2. または、開発用と運用用の2つの Webpack 設定ファイルを使用します。[vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) に示すように、3 つ目のファイルに共通のオプションをいくつか共有することもできます
+2. または、開発用と運用用の2つの webpack 設定ファイルを使用します。[vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) に示すように、3 つ目のファイルに共通のオプションをいくつか共有することもできます
 
 目標を達成している限り、それはあなた次第です。
diff --git a/docs/ja/workflow/testing.md b/docs/ja/workflow/testing.md
index bcec7624f..9f3d788e9 100644
--- a/docs/ja/workflow/testing.md
+++ b/docs/ja/workflow/testing.md
@@ -2,7 +2,7 @@
 
 > [webpack vue-cli テンプレート](https://github.com/vuejs-templates/webpack)には、事前に設定された単体テストと e2e テストの設定が用意されています。
 
-`* .vue`ファイルをテストするときには、普通の CommonJS ベースのテストランナーを使うことができません。なぜならそのテストランナーは `*.vue` ファイルの扱い方を知らないからです。代わりに、Webpack + vue-loader を使用してテストファイルをバンドルします。推奨設定は [Karma](http://karma-runner.github.io/0.13/index.html) と [karma-webpack](https://github.com/webpack/karma-webpack) です。
+`* .vue`ファイルをテストするときには、普通の CommonJS ベースのテストランナーを使うことができません。なぜならそのテストランナーは `*.vue` ファイルの扱い方を知らないからです。代わりに、webpack + vue-loader を使用してテストファイルをバンドルします。推奨設定は [Karma](http://karma-runner.github.io/0.13/index.html) と [karma-webpack](https://github.com/webpack/karma-webpack) です。
 
 Karma はブラウザを起動してテストを実行するテストランナーです。テストするブラウザと、使用するテストフレームワーク（たとえば、MochaやJasmineなど）を選択できます。[PhantomJS](http://phantomjs.org/) のテストを[Jasmine](http://jasmine.github.io/edge/introduction.html) テストフレームワークで実行する Karma の設定例を次に示します:
 
@@ -15,7 +15,7 @@ npm install\
 ```
 
 ``` js
-// 要求があれば同じWebpackの設定を使用することが可能です
+// 要求があれば同じwebpackの設定を使用することが可能です
 // ただし、テスト中に元のエントリが不要なので、
 // 元のエントリを削除することを忘れないでください
 var webpackConfig = require('./webpack.config.js')
@@ -47,7 +47,7 @@ module.exports = function (config) {
 
 ``` js
 // test/index.js
-// 特別なWebpackの機能を使用してすべてのテストファイルを必要とさせます
+// 特別なwebpackの機能を使用してすべてのテストファイルを必要とさせます
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
diff --git a/docs/kr/README.md b/docs/kr/README.md
index ba55ada21..eb5c36430 100644
--- a/docs/kr/README.md
+++ b/docs/kr/README.md
@@ -2,31 +2,31 @@
 
 ### `vue-loader`는 무엇인가요?
 
-`vue-loader`는 다음과 같이 작성된 Vue 컴포넌트를 일반적인 자바스크립트 모듈로 변환할 수 있는 Webpack에서 사용하는 로더입니다.
+`vue-loader`는 다음과 같이 작성된 Vue 컴포넌트를 일반적인 자바스크립트 모듈로 변환할 수 있는 webpack에서 사용하는 로더입니다.
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 다음은 `vue-loader`가 제공하는 여러가지 유용한 기능입니다.
 
 - 기본적으로 ES2015를 지원합니다.
-- 각 Vue 컴포넌트 마다 서로 다른 Webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 SASS, `<template>`에 Jade로 각각 설정 가능합니다.
-- `<style>`과 `<template>`에서 참조된 정적 Asset 파일을 모듈로 취급하고 Webpack 로더로 처리합니다.
+- 각 Vue 컴포넌트 마다 서로 다른 webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 SASS, `<template>`에 Jade로 각각 설정 가능합니다.
+- `<style>`과 `<template>`에서 참조된 정적 Asset 파일을 모듈로 취급하고 webpack 로더로 처리합니다.
 - 각 컴포넌트마다 지정된 CSS를 시뮬레이트 할 수 있습니다.
 - 개발 중에 컴포넌트 핫 리로딩을 지원합니다.
 
-한 마디로 Webpack과 `vue-loader`의 결합은 Vue.js 어플리케이션을 제작하기위한 현대적이고 유연하며 매우 강력한 작업환경을 제공합니다.
+한 마디로 webpack과 `vue-loader`의 결합은 Vue.js 어플리케이션을 제작하기위한 현대적이고 유연하며 매우 강력한 작업환경을 제공합니다.
 
-### Webpack이 무엇인가요?
+### webpack이 무엇인가요?
 
-이미 Webpack에 익숙하다면 이 설명을 건너뛰어도 됩니다. 하지만 Webpack을 처음 사용하는 사람들에게는 다음과 같은 간단한 소개를 읽어보세요.
+이미 webpack에 익숙하다면 이 설명을 건너뛰어도 됩니다. 하지만 webpack을 처음 사용하는 사람들에게는 다음과 같은 간단한 소개를 읽어보세요.
 
-[Webpack](http://webpack.github.io/)은 모듈의 묶음입니다. 각 파일을 모듈로 간주하고 파일 간의 종속성을 파악한 다음 정적 Asset으로 묶어서 배포합니다.
+[webpack](http://webpack.github.io/)은 모듈의 묶음입니다. 각 파일을 모듈로 간주하고 파일 간의 종속성을 파악한 다음 정적 Asset으로 묶어서 배포합니다.
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
-간단한 예를 들어보자면, 우리가 많은 CommonJS 모듈을 가지고 있다고 가정해봅시다. 모듈들은 브라우저 내부에서 바로 실행될 수 없으므로 `<script>` 태그를 통해 불러올 수 있도록 하나의 파일로 "묶어"야 합니다. Webpack은 `require()` 호출을 통해 의존하는 각 파일을 하나로 묶을 수 있습니다.
+간단한 예를 들어보자면, 우리가 많은 CommonJS 모듈을 가지고 있다고 가정해봅시다. 모듈들은 브라우저 내부에서 바로 실행될 수 없으므로 `<script>` 태그를 통해 불러올 수 있도록 하나의 파일로 "묶어"야 합니다. webpack은 `require()` 호출을 통해 의존하는 각 파일을 하나로 묶을 수 있습니다.
 
-여기서 Webpack은 묶는일 외에도 더 많은 일을 할 수 있습니다. "로더"들을 사용하면 최종 Bundle(묶음)을 출력하기 전에 원하는 방식으로 모든 유형의 파일을 변환할 수 있도록 Webpack에 지시할 수 있습니다. 몇 가지 예를 봅시다.
+여기서 webpack은 묶는일 외에도 더 많은 일을 할 수 있습니다. "로더"들을 사용하면 최종 Bundle(묶음)을 출력하기 전에 원하는 방식으로 모든 유형의 파일을 변환할 수 있도록 webpack에 지시할 수 있습니다. 몇 가지 예를 봅시다.
 
 - ES2015 또는 CoffeeScript, TypeScript 모듈을 ES5 CommonJS 모듈로 변환할 수 있습니다.
 - 선택 사항으로 컴파일 전에 linter를 이용하여 소스 코드를 연결 할 수 있습니다.
@@ -34,4 +34,4 @@
 - SASS 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 JavaScript 스니펫으로 변환합니다.
 - HTML 또는 CSS에서 참조된 이미지 파일을 처리하고 경로 구성에 따라 이동한 후 md5 해시를 사용하여 이름을 지정합니다.
 
-Webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 구성하기에 장황하고 복잡한 것이 단점입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 Webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
+webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 구성하기에 장황하고 복잡한 것이 단점입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
diff --git a/docs/kr/configurations/advanced.md b/docs/kr/configurations/advanced.md
index fb509d539..93b32ed71 100644
--- a/docs/kr/configurations/advanced.md
+++ b/docs/kr/configurations/advanced.md
@@ -12,7 +12,7 @@
 
 > 참고: `preLoaders`와 `postLoaders`는 10.3.0 버전 이상에서만 지원합니다.
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 module.exports = {
@@ -25,7 +25,7 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders`는 기본 로더를 덮어씁니다.
-          // 다음 설정은 "lang" 속성이 없는 
+          // 다음 설정은 "lang" 속성이 없는
           // 모든 <script> 태그가 coffee 로더와 함께 로드되도록 합니다
           loaders: {
             js: 'coffee-loader'
@@ -41,12 +41,12 @@ module.exports = {
           // `postLoaders`는 기본 로더 뒤에 붙습니다.
           // - `html`의 경우, 기본 로더의 결과는 컴파일 된 JavaScript 렌더링 함수 코드가 됩니다.
 
-          //  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고 
+          //  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고
           // 대부분의 경우 별로 사용할 일은 없습니다. postcss 플러그인을 사용하는 것이 더 좋습니다.
           postLoaders: {
             html: 'babel-loader'
           },
-          
+
           // `excludedPreLoaders`는 반드시 정규표현식을 사용합니다
           excludedPreLoaders: /(eslint-loader)/
         }
@@ -56,7 +56,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` js
 // webpack.config.js
diff --git a/docs/kr/configurations/asset-url.md b/docs/kr/configurations/asset-url.md
index bacf1487b..9ef2ab1b6 100644
--- a/docs/kr/configurations/asset-url.md
+++ b/docs/kr/configurations/asset-url.md
@@ -14,10 +14,10 @@
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-왜냐하면 `.png`는 Javscript 파일이 아니기 때문에 [file-loader](https://github.com/webpack/file-loader) 또는 [url-loader](https://github.com/webpack/url-loader)를 사용하여 Webpack을 처리하도록 Webpack을 구성해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트도 이것을 구성했습니다.
+왜냐하면 `.png`는 Javscript 파일이 아니기 때문에 [file-loader](https://github.com/webpack/file-loader) 또는 [url-loader](https://github.com/webpack/url-loader)를 사용하여 webpack을 처리하도록 webpack을 구성해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트도 이것을 구성했습니다.
 
 이것을 사용하는 이점은 다음과 같습니다.
 
-1. `file-loader`는 당신이 Asset 파일을 복사하여 붙여넣을 곳을 지정하고 더 나은 캐싱을 위해 버전 해시를 사용하여 이름을 지정하는 방법을 사용합니다. 더 나아가 **이것은 `*.vue` 파일 옆에 이미지를 놓고 배포 URL에 대해 걱정하지 않으면서 폴더 구조를 기반으로 상대 경로를 사용할 수 있습니다**. 올바른 설정을 사용하면 Webpack은 파일 경로를 번들 아웃풋을 올바른 URL로 자동으로 재작성합니다.
+1. `file-loader`는 당신이 Asset 파일을 복사하여 붙여넣을 곳을 지정하고 더 나은 캐싱을 위해 버전 해시를 사용하여 이름을 지정하는 방법을 사용합니다. 더 나아가 **이것은 `*.vue` 파일 옆에 이미지를 놓고 배포 URL에 대해 걱정하지 않으면서 폴더 구조를 기반으로 상대 경로를 사용할 수 있습니다**. 올바른 설정을 사용하면 webpack은 파일 경로를 번들 아웃풋을 올바른 URL로 자동으로 재작성합니다.
 
 2. `url-loader`는 파일이 주어진 값보다 작은 경우 조건부로 파일을 base-64 데이터 URL로 인라인 할 수 있도록 합니다. 이렇게하면 사소한 파일들에 대한 HTTP 요청의 양을 줄일 수 있습니다. 파일이 주어진 값보다 크면 자동으로 `file-loader`로 돌아갑니다.
diff --git a/docs/kr/configurations/custom-blocks.md b/docs/kr/configurations/custom-blocks.md
index 57adc5134..2c16dd52a 100644
--- a/docs/kr/configurations/custom-blocks.md
+++ b/docs/kr/configurations/custom-blocks.md
@@ -41,7 +41,7 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// Webpack 2.x
+// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/kr/configurations/extract-css.md b/docs/kr/configurations/extract-css.md
index e6aede8f4..1e72ad0ca 100644
--- a/docs/kr/configurations/extract-css.md
+++ b/docs/kr/configurations/extract-css.md
@@ -34,12 +34,12 @@ module.exports = {
 위 코드는 `*.vue` 파일 내부에서 `<style>`에 대한 추출을 자동으로 처리하며, 대부분의 프리프로세서와 함께 사용할 수 있습니다.
 
  `*.vue`만 추출합니다. JavaScript에서 가져온 CSS는 별도로 설정해야합니다.
- 
+
 ## 수동 설정
 
 설정을 사용하여 모든 Vue 컴포넌트에서 처리된 CSS를 단일 CSS 파일로 추출하는 예제 입니다.
 
-### Webpack 2.x
+### webpack 2.x
 
 
 ``` js
@@ -70,7 +70,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
@@ -101,4 +101,4 @@ module.exports = {
     new ExtractTextPlugin("style.css")
   ]
 }
-```
\ No newline at end of file
+```
diff --git a/docs/kr/configurations/pre-processors.md b/docs/kr/configurations/pre-processors.md
index 6ba9f83b8..15b29684e 100644
--- a/docs/kr/configurations/pre-processors.md
+++ b/docs/kr/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # 전처리기 사용하기
 
-Webpack에서는 모든 전처리기가 해당 로더와 함께 적용되어야 합니다. `vue-loader`는 다른 Webpack 로더를 사용하여 Vue 컴포넌트의 일부를 처리 할 수 있게 합니다. 언어 블럭의 `lang` 속성에서 사용할 적절한 로더를 자동으로 알아챕니다.
+webpack에서는 모든 전처리기가 해당 로더와 함께 적용되어야 합니다. `vue-loader`는 다른 webpack 로더를 사용하여 Vue 컴포넌트의 일부를 처리 할 수 있게 합니다. 언어 블럭의 `lang` 속성에서 사용할 적절한 로더를 자동으로 알아챕니다.
 
 ### CSS
 
@@ -34,7 +34,7 @@ npm install coffee-loader --save-dev
 
 ### 템플릿
 
-`pug-loader`와 같은 대부분의 Webpack 템플릿 로더는 컴파일된 HTML 문자열 대신 템플릿 함수를 반환하기 때문에 템플릿 처리는 앞서 처리한 방법과 약간 다릅니다. `pug-loader` 대신 원래의 `pug` 파일을 설치하여 사용할 수 있습니다.
+`pug-loader`와 같은 대부분의 webpack 템플릿 로더는 컴파일된 HTML 문자열 대신 템플릿 함수를 반환하기 때문에 템플릿 처리는 앞서 처리한 방법과 약간 다릅니다. `pug-loader` 대신 원래의 `pug` 파일을 설치하여 사용할 수 있습니다.
 
 ``` bash
 npm install pug --save-dev
@@ -51,7 +51,7 @@ div
 
 ### 인라인 로더 요청
 
-당신은 `lang` 속성에서 [Webpack 로더 요청](https://webpack.github.io/docs/loaders.html#introduction)을 할 수 있습니다.
+당신은 `lang` 속성에서 [webpack 로더 요청](https://webpack.github.io/docs/loaders.html#introduction)을 할 수 있습니다.
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -59,4 +59,4 @@ div
 </style>
 ```
 
-그러나 이것은 Vue 컴포넌트가 Webpack에 한정되어 있고 Browserify 및 [vueify](https://github.com/vuejs/vueify)와 호환되지 않습니다. **Vue 컴포넌트를 재사용 가능한 써드파티로 제공하려면 이 구문을 사용하지 마십시오.**
+그러나 이것은 Vue 컴포넌트가 webpack에 한정되어 있고 Browserify 및 [vueify](https://github.com/vuejs/vueify)와 호환되지 않습니다. **Vue 컴포넌트를 재사용 가능한 써드파티로 제공하려면 이 구문을 사용하지 마십시오.**
diff --git a/docs/kr/features/es2015.md b/docs/kr/features/es2015.md
index 857569eee..95fbd6a6d 100644
--- a/docs/kr/features/es2015.md
+++ b/docs/kr/features/es2015.md
@@ -58,7 +58,7 @@ export default {
 
 ### 일반적인 `.js` 파일로 변환하기
 
-`vue-loader`는 오직 `*.vue` 파일만 처리하기 때문에 Webpack 설정 파일에 `babel-loader` 또는 `buble-loader`를 사용하여 보통 `*.js` 파일을 처리하도록 지시해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트는 이미 당신을 위해 그렇게 설정되어 있습니다.
+`vue-loader`는 오직 `*.vue` 파일만 처리하기 때문에 webpack 설정 파일에 `babel-loader` 또는 `buble-loader`를 사용하여 보통 `*.js` 파일을 처리하도록 지시해야 합니다. `vue-cli`로 스캐폴딩된 프로젝트는 이미 당신을 위해 그렇게 설정되어 있습니다.
 
 ### `.babelrc`로 Babel 설정하기
 
diff --git a/docs/kr/features/postcss.md b/docs/kr/features/postcss.md
index 51368a238..e3fbed138 100644
--- a/docs/kr/features/postcss.md
+++ b/docs/kr/features/postcss.md
@@ -16,7 +16,7 @@
 
 또는 `vue-loader`에 `postcss` 옵션을 사용해 `*.vue`파일을 위해 postcss 설정을 지정할 수 있습니다.
 
-Webpack 1버전 예제:
+webpack 1버전 예제:
 
 ``` js
 // webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
 }
 ```
 
-Webpack 2버전 예제:
+webpack 2버전 예제:
 
 ``` js
 // webpack.config.js
diff --git a/docs/kr/options.md b/docs/kr/options.md
index 0368b0f99..4eac04b7e 100644
--- a/docs/kr/options.md
+++ b/docs/kr/options.md
@@ -1,8 +1,8 @@
 # 옵션 레퍼런스
 
-## Webpack 1 & 2 사용 방법의 차이점
+## webpack 1 & 2 사용 방법의 차이점
 
-Webpack 2 : 직접 loader 규칙에 전달합니다
+webpack 2 : 직접 loader 규칙에 전달합니다
 
 ``` js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-Webpack 1.x의 경우 Webpack 설정에 루트 `vue` 블럭을 추가합니다.
+webpack 1.x의 경우 webpack 설정에 루트 `vue` 블럭을 추가합니다.
 
 ``` js
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
 
 - 타입: `{ [lang: string]: string }`
 
-  `*.vue` 파일의 언어 블럭에 사용할 Webpack 로더를 지정하는 객체입니다. 이 키는 특별히 지정된 경우 language block에 대한 `lang` 속성에 해당합니다. 각 타입에 대한 기본적인 `lang`은 다음과 같습니다.
+  `*.vue` 파일의 언어 블럭에 사용할 webpack 로더를 지정하는 객체입니다. 이 키는 특별히 지정된 경우 language block에 대한 `lang` 속성에 해당합니다. 각 타입에 대한 기본적인 `lang`은 다음과 같습니다.
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -45,7 +45,7 @@ module.exports = {
   예를 들어, `babel-loader`와 `eslint-loader`를 사용하여 모든 `<script>` 블럭을 처리하려면 다음과 같이 사용합니다.
 
   ``` js
-  // Webpack 2.x config
+  // webpack 2.x config
 module: {
   rules: [
     {
@@ -119,7 +119,7 @@ module: {
 
   CSS 소스 맵을 사용할지 여부를 정합니다. 이 기능을 끄면 `css-loader`에서 상대 경로와 관련된 버그를 피할 수 있고 빌드를 좀 더 빠르게 할 수 있습니다.
 
-  `devtool` 옵션이 메인 Webpack 설정에 없으면 자동으로 `false`로 설정됩니다.
+  `devtool` 옵션이 메인 webpack 설정에 없으면 자동으로 `false`로 설정됩니다.
 
 ### esModule
 
@@ -141,7 +141,7 @@ module: {
 - 디폴트: `{ img: 'src', image: 'xlink:href' }`
 
 
-  템플릿 컴파일 중에 컴파일러는 `src` URL과 같은 특정 속성을 `require` 호출로 변환하여 대상 Asset을 Webpack에서 처리할 수 있습니다. 기본 설정은 `<img>` 태그에 `src` 속성을 변환합니다.
+  템플릿 컴파일 중에 컴파일러는 `src` URL과 같은 특정 속성을 `require` 호출로 변환하여 대상 Asset을 webpack에서 처리할 수 있습니다. 기본 설정은 `<img>` 태그에 `src` 속성을 변환합니다.
 
 ### buble
 
diff --git a/docs/kr/start/spec.md b/docs/kr/start/spec.md
index f819bd36f..3096919f8 100644
--- a/docs/kr/start/spec.md
+++ b/docs/kr/start/spec.md
@@ -47,7 +47,7 @@ export default {
 - 기본 언어 : `html`.
 
 - 각 `*.vue` 파일은 한번에 최대 하나의 `<template>` 블록을 포함할 수 있습니다.
- 
+
 - 내용은 문자열로 추출되어 컴파일 된 Vue 컴포넌트의 `template` 옵션으로 사용합니다.
 
 #### `<script>`
@@ -56,7 +56,7 @@ export default {
 
 - 각 `*.vue` 파일은 한번에 최대 하나의 `<script>` 블록을 포함할 수 있습니다.
 
-- 스크립트는 CommonJS와 같은 (Webpack을 통해 번들된 일반적인 `.js` 모듈같은)환경 에서  실행됩니다. 다른 의존성을 `require()`할 수 있습니다. 또한 ES2015를 지원하여 `import`와 `export`를 사용할 수 있습니다.
+- 스크립트는 CommonJS와 같은 (webpack을 통해 번들된 일반적인 `.js` 모듈같은)환경 에서  실행됩니다. 다른 의존성을 `require()`할 수 있습니다. 또한 ES2015를 지원하여 `import`와 `export`를 사용할 수 있습니다.
 
 - 스크립트는 Vue.js 컴포넌트 옵션 객체를 내보내야합니다. `Vue.extend()`에 의해 생성된 확장 생성자를 export하는 것도 지원되지만 평범한 객체를 추천합니다.
 
@@ -68,13 +68,13 @@ export default {
 
 - `<style>`태그는 `scoped` 또는 `module` 속성을 가질 수 있습니다. ([Scoped CSS](../features/scoped-css.md)와 [CSS Modules](../features/css-modules.md)를 확인하세요) 현재 컴포넌트에 스타일을 캡슐화 하는데 도움을 줍니다. 캡슐화 모드는 다른 여러개의 `<style>` 태그를 동일한 컴포넌트에 사용할 수 있습니다.
 
-- 기본적으로, 내용이 추출되어 `style-loader`를 사용해 실제로 `<style>` 태그로 문서의 `<head>`에 동적으로 삽입됩니다. [모든 컴포넌트의 모든 스타일이 하나의 CSS 파일로 추출되도록  Webpack을 설정](../configurations/extract-css.md)할 수 있습니다.
-- 
+- 기본적으로, 내용이 추출되어 `style-loader`를 사용해 실제로 `<style>` 태그로 문서의 `<head>`에 동적으로 삽입됩니다. [모든 컴포넌트의 모든 스타일이 하나의 CSS 파일로 추출되도록  webpack을 설정](../configurations/extract-css.md)할 수 있습니다.
+-
 ### 사용자 정의 블록
 
 > 10.2.0 이상에서 지원합니다.
 
-사용자 정의 블록은 `<docs>` 블록과 같이 프로젝트에 한정되는 요구에 따라 추가적으로 사용할 수 있습니다. `vue-loader`는 태그 이름을 사용해 섹션의 내용에 적용할 Webpack 로더를 찾습니다. 로더는 `vue-loader` 옵션의 `loaders` 섹션에 지정되어야 합니다.
+사용자 정의 블록은 `<docs>` 블록과 같이 프로젝트에 한정되는 요구에 따라 추가적으로 사용할 수 있습니다. `vue-loader`는 태그 이름을 사용해 섹션의 내용에 적용할 webpack 로더를 찾습니다. 로더는 `vue-loader` 옵션의 `loaders` 섹션에 지정되어야 합니다.
 
 [사용자 정의 블록](../configurations/custom-blocks.md)에서 자세히 다룹니다.
 
diff --git a/docs/kr/workflow/linting.md b/docs/kr/workflow/linting.md
index b23667a13..4e11be3a9 100644
--- a/docs/kr/workflow/linting.md
+++ b/docs/kr/workflow/linting.md
@@ -39,9 +39,9 @@ module.exports = {
 }
 ```
 
-Webpack 로더 체인이 **가장 먼저** 적용됩니다. `vue` 전에 `eslint`를 적용하여 컴파일 전 소스코드를 lint하세요.
+webpack 로더 체인이 **가장 먼저** 적용됩니다. `vue` 전에 `eslint`를 적용하여 컴파일 전 소스코드를 lint하세요.
 
-우리가 고려해야할 한 가지는 NPM 패키지에 포함 된 써드파티 `*.vue` 컴포넌트를 사용하는 것 입니다. 이 경우에 우리는 써드파티 컴포넌트를 처리하기 위해 `vue-loader`를 사용하려고 하지만 그것을 lint하고 싶지는 않습니다. 우리는 lint를 Webpack의 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order)로 분리할 수 있습니다.
+우리가 고려해야할 한 가지는 NPM 패키지에 포함 된 써드파티 `*.vue` 컴포넌트를 사용하는 것 입니다. 이 경우에 우리는 써드파티 컴포넌트를 처리하기 위해 `vue-loader`를 사용하려고 하지만 그것을 lint하고 싶지는 않습니다. 우리는 lint를 webpack의 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order)로 분리할 수 있습니다.
 
 ``` js
 // webpack.config.js
@@ -67,7 +67,7 @@ module.exports = {
 }
 ```
 
-Webpack 2.x에서는 다음과 같이 처리합니다.
+webpack 2.x에서는 다음과 같이 처리합니다.
 
 ``` js
 // webpack.config.js
diff --git a/docs/kr/workflow/production.md b/docs/kr/workflow/production.md
index b3eaffad8..e59ba0055 100644
--- a/docs/kr/workflow/production.md
+++ b/docs/kr/workflow/production.md
@@ -34,6 +34,6 @@ module.exports = {
 
 1. 환경변수 기반으로 설정 오브젝트를 동적으로 빌드할 수 있습니다.
 
-2. 또는 개발용 Webpack 설정 파일과 배포용 설정 파일을 분리하여 사용합니다. 그리고 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)에 표시 된 것처럼 세 번째 파일에서 공통 옵션을 공유할 수도 있습니다.
+2. 또는 개발용 webpack 설정 파일과 배포용 설정 파일을 분리하여 사용합니다. 그리고 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0)에 표시 된 것처럼 세 번째 파일에서 공통 옵션을 공유할 수도 있습니다.
 
 당신에게 목표 달성이 달려있습니다.
diff --git a/docs/kr/workflow/testing.md b/docs/kr/workflow/testing.md
index a1d8b8d34..e31697345 100644
--- a/docs/kr/workflow/testing.md
+++ b/docs/kr/workflow/testing.md
@@ -2,7 +2,7 @@
 
 > [webpack vue-cli 템플릿](https://github.com/vuejs-templates/webpack)은 유닛 테스트 및 e2e 테스트 설정을 사전에 제공합니다.
 
-`*.vue` 파일을 테스트할 때 `*.vue` 파일 처리 방법을 모르기 때문에 CommonJS 기반 테스트 러너를 사용할 수 없습니다. 대신 Webpack + vue-loader를 사용하여 테스트 파일을 번들로 제공합니다. [Karma](http://karma-runner.github.io/0.13/index.html) 및 [karma-webpack](https://github.com/webpack/karma-webpack)을 사용하는 것을 추천합니다.
+`*.vue` 파일을 테스트할 때 `*.vue` 파일 처리 방법을 모르기 때문에 CommonJS 기반 테스트 러너를 사용할 수 없습니다. 대신 webpack + vue-loader를 사용하여 테스트 파일을 번들로 제공합니다. [Karma](http://karma-runner.github.io/0.13/index.html) 및 [karma-webpack](https://github.com/webpack/karma-webpack)을 사용하는 것을 추천합니다.
 
 Karma는 브라우저를 실행하고 테스트를 실행하는 테스트 러너입니다. 테스트할 브라우저와 사용할 테스트 프레임워크(Mocha 또는 Jasmine)를 선택할 수 있습니다. 다음은 [PhantomJS](http://phantomjs.org/) 내부에서 [Jasmine](http://jasmine.github.io/edge/introduction.html)을 사용하여 테스트를 실행하는 Karma 설정의 예입니다.
 
@@ -15,7 +15,7 @@ npm install\
 ```
 
 ``` js
-// 우리는 정확히 똑같은 Webpack 설정을 요구할 수 있습니다
+// 우리는 정확히 똑같은 webpack 설정을 요구할 수 있습니다
 // 하지만, 테스트 중에는 필요하지 않기 때문에
 // 원래 항목을 지우는 것을 잊지 마십시오.
 var webpackConfig = require('./webpack.config.js')
@@ -47,7 +47,7 @@ module.exports = function (config) {
 
 ``` js
 // test/index.js
-// 특별한 Webpack 기능을 사용하기 위해 모든 테스트 파일이 필요합니다.
+// 특별한 webpack 기능을 사용하기 위해 모든 테스트 파일이 필요합니다.
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
diff --git a/docs/pt_BR/README.md b/docs/pt_BR/README.md
index 65d746569..13c66d356 100644
--- a/docs/pt_BR/README.md
+++ b/docs/pt_BR/README.md
@@ -2,32 +2,32 @@
 
 ### O que é `vue-loader`?
 
-`vue-loader` é um carregador para Webpack capaz de transformar componentes Vue, como o exemplo abaixo, em um módulo JavaScript sem formatação:
+`vue-loader` é um carregador para webpack capaz de transformar componentes Vue, como o exemplo abaixo, em um módulo JavaScript sem formatação:
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 O `vue-loader` fornece muitos recursos interessantes:
 
 - ES2015 habilitado por padrão;
-- Permite usar outros carregadores Webpack para cada parte de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
+- Permite usar outros carregadores webpack para cada parte de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
 - Permite seções customizadas em um arquivo .vue que pode ter carregadores encadeados personalizados aplicados a eles;
-- Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores Webpack;
+- Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores webpack;
 - Pode simular escopo CSS para cada componente;
 - Suporta componente hot-reloading durante desenvolvimento;
 
-Em poucas palavras, a combinação de Webpack e `vue-loader` oferece um fluxo de trabalho front-end moderno, flexível e extremamente poderoso para criação de aplicações Vue.js.
+Em poucas palavras, a combinação de webpack e `vue-loader` oferece um fluxo de trabalho front-end moderno, flexível e extremamente poderoso para criação de aplicações Vue.js.
 
-### O que é Webpack?
+### O que é webpack?
 
-Se você já esta familiarizado com o Webpack, fique à vontade para pular esta seção. Para aqueles que não conhecem o Webpack, aqui segue uma rápida introdução:
+Se você já esta familiarizado com o webpack, fique à vontade para pular esta seção. Para aqueles que não conhecem o webpack, aqui segue uma rápida introdução:
 
-[Webpack](http://webpack.github.io/) é um empacotador de módulo. Ele pega um grupo de arquivos, trata cada um como um módulo, descobre as dependências entre eles e empacota em ativos estáticos prontos para implantação.
+[webpack](http://webpack.github.io/) é um empacotador de módulo. Ele pega um grupo de arquivos, trata cada um como um módulo, descobre as dependências entre eles e empacota em ativos estáticos prontos para implantação.
 
 ![webpack](http://webpack.github.io/assets/what-is-webpack.png)
 
-Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. Eles não podem rodar diretamente dentro do navegador, então precisamos empacotá-los dentro de um único arquivo que pode ser incluído através de uma tag `<script>`. Webpack é capaz de mapear as dependências injetadas pelas chamadas `require()` e empacotá-las para nós.
+Para um exemplo básico, imagine que nós temos um monte de módulos CommonJs. Eles não podem rodar diretamente dentro do navegador, então precisamos empacotá-los dentro de um único arquivo que pode ser incluído através de uma tag `<script>`. webpack é capaz de mapear as dependências injetadas pelas chamadas `require()` e empacotá-las para nós.
 
-Mais do que isso, com o uso dos "loaders" o Webpack é capaz de transformar todos os tipos de arquivos da maneira como quisermos, antes do término da geração do pacote. Alguns exemplos incluem:
+Mais do que isso, com o uso dos "loaders" o webpack é capaz de transformar todos os tipos de arquivos da maneira como quisermos, antes do término da geração do pacote. Alguns exemplos incluem:
 
 - Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
 - Você pode escolher se quer canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
@@ -35,4 +35,4 @@ Mais do que isso, com o uso dos "loaders" o Webpack é capaz de transformar todo
 - Traspilar arquivos SASS em CSS sem formatação, em seguida os converter em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
 - Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5;
 
-Webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando Webpack com Vue.js e `vue-loader`.
+webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando webpack com Vue.js e `vue-loader`.
diff --git a/docs/pt_BR/configurations/advanced.md b/docs/pt_BR/configurations/advanced.md
index 5d95bc4a8..8578e82bb 100644
--- a/docs/pt_BR/configurations/advanced.md
+++ b/docs/pt_BR/configurations/advanced.md
@@ -2,9 +2,9 @@
 
 Às vezes você pode querer:
 
-1. Aplicar um carregador personalizado de string a uma linguagem em vez de deixar `vue-loader` responsável. 
+1. Aplicar um carregador personalizado de string a uma linguagem em vez de deixar `vue-loader` responsável.
 
-2. Sobrescrever a configuração embutida do carregador para a linguagem padrão. 
+2. Sobrescrever a configuração embutida do carregador para a linguagem padrão.
 
 3. Pré-processar ou pós-processar um bloco de linguagem especifico com carregadores personalizado.
 
@@ -12,7 +12,7 @@ Para fazer isto, especifique a opção `loaders` para `vue-loader`:
 
 > Observe que `preLoaders` e`postLoaders` são suportados apenas em verões >=10.3.0
 
-### Webpack 2.x
+### webpack 2.x
 
 ```js
 // webpack.config.js
@@ -26,21 +26,21 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders` substituirá os carregadores padrões.
-          // A configuração a seguir fará com que todas as tags <script> sem 
+          // A configuração a seguir fará com que todas as tags <script> sem
           // o atributo "lang" sejam carrega com coffee-loader
           loaders: {
             js: 'coffee-loader'
           },
-          
+
           // `preLoaders` são anexados antes dos carregadores padrões
-          // Você pode usar isso para pré-processar blocos de linguagem 
+          // Você pode usar isso para pré-processar blocos de linguagem
           // - um caso de uso comum seria intercionalização (i18n)  em tempo de construção.
           preLoaders: {
             js: '/caminho/personalizado/para/carregador'
           },
-          
+
           // `postLoaders` são anexados após os carregadores padrões.
-          // 
+          //
           // - Para `html`, o resultado retornado pelo carregador padrão
           //   será compilado em código de função de renderização JavaScript.
           //
@@ -50,7 +50,7 @@ module.exports = {
           postLoaders: {
             html: 'babel-loader'
           },
-          
+
           // `excludedPreLoaders` should be regex
           excludedPreLoaders: /(eslint-loader)/
         }
@@ -60,7 +60,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ```js
 // webpack.config.js
diff --git a/docs/pt_BR/configurations/asset-url.md b/docs/pt_BR/configurations/asset-url.md
index 21ea4a550..74c25a111 100644
--- a/docs/pt_BR/configurations/asset-url.md
+++ b/docs/pt_BR/configurations/asset-url.md
@@ -14,10 +14,10 @@ será compilado em:
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-Como `.png` não é um arquivo JavaScript, você precisará configurar o Webpack para usar [file-loader](https://github.com/webpack/file-loader) ou [url-loader](https://github.com/webpack/url-loader) para lidar com eles. O projeto estruturado com `vue-cli` também configurou isso para você.
+Como `.png` não é um arquivo JavaScript, você precisará configurar o webpack para usar [file-loader](https://github.com/webpack/file-loader) ou [url-loader](https://github.com/webpack/url-loader) para lidar com eles. O projeto estruturado com `vue-cli` também configurou isso para você.
 
 Os benefícios de tudo isso são:
 
-1. `file-loader` permite a você designar onde copiar e colar os arquivos de recursos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos `.vue` e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, Webpack irá automaticamente reescrever o caminho dos arquivos em URLs corretas na saída empacotada.
+1. `file-loader` permite a você designar onde copiar e colar os arquivos de recursos \(assets\), e como nomeá-lo usando hashes de versão para melhorar o cache. Mas, isso também significa que **você pode simplesmente colocar imagens ao lado de seus arquivos `.vue` e usar o caminho relativo com base na estrutura de pastas em vez de se preocupar com URLs de implantação**. Com a configuração apropriada, webpack irá automaticamente reescrever o caminho dos arquivos em URLs corretas na saída empacotada.
 
-2. `url-loader` permite a você colocar condicionalmente em linha um arquivo de dados URL base64 se eles forem menor que um determinado limite. Se o arquivo for maior do que o limite ele automaticamente será jogado para `file-loader`.
\ No newline at end of file
+2. `url-loader` permite a você colocar condicionalmente em linha um arquivo de dados URL base64 se eles forem menor que um determinado limite. Se o arquivo for maior do que o limite ele automaticamente será jogado para `file-loader`.
diff --git a/docs/pt_BR/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
index 20595aa64..779ef7d49 100644
--- a/docs/pt_BR/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -41,7 +41,7 @@ comp-a h2 {
 #### webpack.config.js
 
 ```js
-// Webpack 2.x
+// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/pt_BR/configurations/extract-css.md b/docs/pt_BR/configurations/extract-css.md
index b15e95ea4..39af0031d 100644
--- a/docs/pt_BR/configurations/extract-css.md
+++ b/docs/pt_BR/configurations/extract-css.md
@@ -2,7 +2,7 @@
 
 Exemplo de configuração para extrair todo CSS processado de todos componentes Vue em um único arquivo CSS:
 
-### Webpack 2.x
+### webpack 2.x
 
 ```bash
 npm install extract-text-webpack-plugin --save-dev
@@ -36,7 +36,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ```bash
 npm install extract-text-webpack-plugin
diff --git a/docs/pt_BR/configurations/pre-processors.md b/docs/pt_BR/configurations/pre-processors.md
index bde9590d1..d593b58b2 100644
--- a/docs/pt_BR/configurations/pre-processors.md
+++ b/docs/pt_BR/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # Usando Pré-Processadores
 
-No Webpack, todos os pré-processadores precisam ser aplicados com um carregador \(loader\) correspondente. `vue-loader` permite que você use outros carregadores Webpack para processar uma parte de um componente Vue. Ele irá automaticamente indicar os carregadores apropriados para usar a partir do atributo `lang` de um bloco de linguagem.
+No webpack, todos os pré-processadores precisam ser aplicados com um carregador \(loader\) correspondente. `vue-loader` permite que você use outros carregadores webpack para processar uma parte de um componente Vue. Ele irá automaticamente indicar os carregadores apropriados para usar a partir do atributo `lang` de um bloco de linguagem.
 
 ### CSS
 
@@ -53,7 +53,7 @@ npm install coffee-loader --save-dev
 
 ### Templates
 
-O processamento de templates é um pouco diferente, porque a maioria dos carregadores de template do Webpack, como `pug-loader` retornam uma função de template em vez de uma sequência de caracteres HTML compilado. Em vez de usar `pug-loader`, podemos simplesmente instalar o `pug` original.
+O processamento de templates é um pouco diferente, porque a maioria dos carregadores de template do webpack, como `pug-loader` retornam uma função de template em vez de uma sequência de caracteres HTML compilado. Em vez de usar `pug-loader`, podemos simplesmente instalar o `pug` original.
 
 ```bash
 npm install pug --save-dev
@@ -70,7 +70,7 @@ div
 
 ### Solicitação de Carregamento em Linha
 
-Você pode usar \[solicitação de carregador Webpack\] no atributo `lang`:
+Você pode usar \[solicitação de carregador webpack\] no atributo `lang`:
 
 ```html
 <style lang="sass?outputStyle=expanded">
@@ -78,4 +78,4 @@ Você pode usar \[solicitação de carregador Webpack\] no atributo `lang`:
 </style>
 ```
 
-Contudo, observe que isso faz com que seu componente Vue se torne especifico para Webpack e não compatível com Browserify e [vueify](https://github.com/vuejs/vueify). **Se você pretende enviar seu componente Vue como um componente reutilizável para terceiros, evite usar está sintaxe**.
+Contudo, observe que isso faz com que seu componente Vue se torne especifico para webpack e não compatível com Browserify e [vueify](https://github.com/vuejs/vueify). **Se você pretende enviar seu componente Vue como um componente reutilizável para terceiros, evite usar está sintaxe**.
diff --git a/docs/pt_BR/features/es2015.md b/docs/pt_BR/features/es2015.md
index 5a5a21809..4b0fd6e6d 100644
--- a/docs/pt_BR/features/es2015.md
+++ b/docs/pt_BR/features/es2015.md
@@ -58,8 +58,8 @@ Você também pode personalizar os recursos suportados em template usando as [op
 
 ### Transpilação normal de arquivos `.js`
 
-Uma vez que `vue-loader` processa apenas arquivos `*.vue`, você precisa informar ao Webpack para processar arquivos `*.js` normais com `babel-loader` ou `buble-loader` em seu arquivo de configuração Webpack. O projeto esqueleto criado com `vue-cli` já faz isso pra você.
+Uma vez que `vue-loader` processa apenas arquivos `*.vue`, você precisa informar ao webpack para processar arquivos `*.js` normais com `babel-loader` ou `buble-loader` em seu arquivo de configuração webpack. O projeto esqueleto criado com `vue-cli` já faz isso pra você.
 
 ### Configurando Babel com `.babelrc`
 
-`babel-loader` respeita [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), portanto essa é a abordagem recomentada para configurar as predefinições e os plugins Babel.
\ No newline at end of file
+`babel-loader` respeita [`.babelrc`](https://babeljs.io/docs/usage/babelrc/), portanto essa é a abordagem recomentada para configurar as predefinições e os plugins Babel.
diff --git a/docs/pt_BR/features/postcss.md b/docs/pt_BR/features/postcss.md
index eace1a8c6..5627e1845 100644
--- a/docs/pt_BR/features/postcss.md
+++ b/docs/pt_BR/features/postcss.md
@@ -16,7 +16,7 @@ O uso de um arquivo de configuração permite que você compartilhe a mesma conf
 
 Como alternativa, você pode especificar configurações postcss especificamente para arquivos `*.vue` usando a opção `postcss` para `vue-loader`.
 
-Exemplo de uso no Webpack 1.x:
+Exemplo de uso no webpack 1.x:
 
 ```js
 // webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
 }
 ```
 
-Para Webpack 2.x:
+Para webpack 2.x:
 
 ```js
 // webpack.config.js
@@ -65,4 +65,4 @@ Além de fornecer uma coleção de plugins, a opção de `postcss` também aceit
       parser: sugarss // Use o analisador sugarss
     }
   }
-  ```
\ No newline at end of file
+  ```
diff --git a/docs/pt_BR/options.md b/docs/pt_BR/options.md
index a6db98ac7..0ca6037c8 100644
--- a/docs/pt_BR/options.md
+++ b/docs/pt_BR/options.md
@@ -1,8 +1,8 @@
 # Referência de Opções
 
-## Diferença do uso entre Webpack 1 & 2
+## Diferença do uso entre webpack 1 & 2
 
-Para Webpack 2: passe as opções diretamente para a regra do carregador.
+Para webpack 2: passe as opções diretamente para a regra do carregador.
 
 ```js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-Para Webpack 1.x: Adicione um bloco \`vue\` na raiz de suas configurações Webpack:
+Para webpack 1.x: Adicione um bloco \`vue\` na raiz de suas configurações webpack:
 
 ```js
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
 
 - tipo: `{ [lang: string]: string }`
 
-  Um objeto especificando carregadores de Webpack para substituir carregadores padrão usados para blocos de linguagem dentro de arquivos `*.vue`. A chave corresponde ao atributo `lang` para o bloco de linguagem, se especificado. O padrão `lang` para cada tipo é:
+  Um objeto especificando carregadores de webpack para substituir carregadores padrão usados para blocos de linguagem dentro de arquivos `*.vue`. A chave corresponde ao atributo `lang` para o bloco de linguagem, se especificado. O padrão `lang` para cada tipo é:
 
   - `<template>`: `html`
   - `<script>`:`js`
@@ -45,7 +45,7 @@ module.exports = {
   Por exemplo, para usar `babel-loader` e `eslint-loader` para processar todos os blocos `<script>`:
 
 ```js
-  // Configuração Webpack 2.X
+  // Configuração webpack 2.X
   module: {
     rules: {
       {
@@ -72,7 +72,7 @@ module.exports = {
 - suportado apenas em >= 10.3.0
 
   O formato de configuração é o mesmo que `loaders`, mas `postLoaders` são aplicados depois dos carregadores padrões. Você pode usar para pós-processar blocos de linguagem. No entanto note que isso é um pouco mais complicado:
-  
+
   - Para `html`, o resultado retornado pelo carregador padrão será compilado em código de função de renderização JavaScript.
 
   - Para `css`, o resultado será retornado por `vue-style-loader` que não é particularmente útil na maioria dos casos. Usando um plugin postcss será uma opção melhor.
@@ -117,7 +117,7 @@ module.exports = {
 
   Se deve habilitar mapas de origem para CSS. Desativar isso pode evitar alguns erros relacionado a caminho relativo em `css-loader` e fazer a construção um pouco mais rápida.
 
-  Observe que isso é automaticamente definido para `false` se a opção `devtoo` não estiver presente na configuração princípai de Webpack.
+  Observe que isso é automaticamente definido para `false` se a opção `devtoo` não estiver presente na configuração princípai de webpack.
 
 ### esModule
 
@@ -138,7 +138,7 @@ module.exports = {
 - tipo: `{ [tag: string]: string | Array<string> }`
 - padrão: `{ img: 'src', image: 'xlink:href' }`
 
-  Durante a compilação do template, o compilador pode transformar certos atributos, tais como URLs `src`, em chamadas `require`, para que o recurso de destino possa ser manipulado pelo Webpack. A configuração padrão transforma o atributo `src` em tags `<img>` e atributos `xlink:href` em tags `<image>` de SVG.
+  Durante a compilação do template, o compilador pode transformar certos atributos, tais como URLs `src`, em chamadas `require`, para que o recurso de destino possa ser manipulado pelo webpack. A configuração padrão transforma o atributo `src` em tags `<img>` e atributos `xlink:href` em tags `<image>` de SVG.
 
 ### buble
 
@@ -157,7 +157,7 @@ module.exports = {
   // webpack 1
   vue: {
     buble: {
-      // ativa o objeto de propagação 
+      // ativa o objeto de propagação
       // NOTA: Você precisa fornecer o polyfill Object.assign por si mesmo!
       objectAssign: 'Object.assign',
 
diff --git a/docs/pt_BR/start/spec.md b/docs/pt_BR/start/spec.md
index e1391b6f7..a9d0c1667 100644
--- a/docs/pt_BR/start/spec.md
+++ b/docs/pt_BR/start/spec.md
@@ -68,13 +68,13 @@ Mais detalhes podem ser encontrados em [Usando Pré-Processadores](../configurat
 
 - Uma tag `<style>` pode ter atributos `scoped` ou `module` \(consulte [CSS com Escopo](../features/scoped-css.md) e [Módulos CSS](../features/css-modules.md)\)\) para ajudar encapsular o estilo para o seu componente atual. Várias tags `<style>` com diferente modos de encapsulamento pode ser misturados em um mesmo componente.
 
-- Por padrão, o conteúdo será extraído e inserido dinamicamente no `<head>` do documento atual como uma tag `<style>` usando `style-loader`. Também é possível [configurar o Webpack para que todos os estilos em todos os componentes sejam extraídos em um único arquivo CSS](../configurations/extract-css.md).
+- Por padrão, o conteúdo será extraído e inserido dinamicamente no `<head>` do documento atual como uma tag `<style>` usando `style-loader`. Também é possível [configurar o webpack para que todos os estilos em todos os componentes sejam extraídos em um único arquivo CSS](../configurations/extract-css.md).
 
 ### Blocos customizados
 
 > Suportado apenas em vue-loader 10.2.0+
 
-Blocos customizados adicionais pode ser incluídos em um arquivo `*.vue` para qualquer necessidade específica do projeto, por exemplo um bloco `<docs>`. `vue-loader` usará o nome da tag para procurar por carregadores de Webpack. Os carregadores dever ser adicionados na opção `loaders` de `vue-loader`.
+Blocos customizados adicionais pode ser incluídos em um arquivo `*.vue` para qualquer necessidade específica do projeto, por exemplo um bloco `<docs>`. `vue-loader` usará o nome da tag para procurar por carregadores de webpack. Os carregadores dever ser adicionados na opção `loaders` de `vue-loader`.
 
 Para mais detalhes, veja [Blocos Customizados](../configurations/custom-blocks.md).
 
@@ -107,4 +107,4 @@ Atualmente existem realce de sintaxe \(ou [coloração de sintaxe](https://pt.wi
 
 ### Comentários
 
-Dentro de cada bloco você deve usar a sintaxe de comentário da linguagem que está sendo usada \(HTML, CSS, JavaScript, Jade, etc\). Para comentários de nível superior, use a sintaxe de comentário HTML: `<!-- conteúdo do comentário aqui -->`
\ No newline at end of file
+Dentro de cada bloco você deve usar a sintaxe de comentário da linguagem que está sendo usada \(HTML, CSS, JavaScript, Jade, etc\). Para comentários de nível superior, use a sintaxe de comentário HTML: `<!-- conteúdo do comentário aqui -->`
diff --git a/docs/pt_BR/workflow/linting.md b/docs/pt_BR/workflow/linting.md
index 731d7bae6..8b631ae0c 100644
--- a/docs/pt_BR/workflow/linting.md
+++ b/docs/pt_BR/workflow/linting.md
@@ -39,9 +39,9 @@ module.exports = {
 }
 ```
 
-Lembre-se que a sequência dos carregadores Webpack são aplicados da **direita para esquerda**. Certifique-se de aplicar `eslint` antes de `vue`, de modo que estamos analisando o código fonte pré-compilado.
+Lembre-se que a sequência dos carregadores webpack são aplicados da **direita para esquerda**. Certifique-se de aplicar `eslint` antes de `vue`, de modo que estamos analisando o código fonte pré-compilado.
 
-Uma coisa que precisamos considerar é o uso de componente `*.vue` de terceiros enviados em pacote NPM. Neste caso, usaremos `vue-loader` para processar os componentes de terceiros, mas não queremos aplicar a análise de código estático \(linting\). Para isso nós podemos separar o linting em [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) do Webpack.
+Uma coisa que precisamos considerar é o uso de componente `*.vue` de terceiros enviados em pacote NPM. Neste caso, usaremos `vue-loader` para processar os componentes de terceiros, mas não queremos aplicar a análise de código estático \(linting\). Para isso nós podemos separar o linting em [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) do webpack.
 
 ```js
 // webpack.config.js
@@ -67,7 +67,7 @@ module.exports = {
 }
 ```
 
-Para Webpack 2.x:
+Para webpack 2.x:
 
 ```js
 // webpack.config.js
@@ -90,4 +90,4 @@ module.exports = {
         ]
     }
 }
-```
\ No newline at end of file
+```
diff --git a/docs/pt_BR/workflow/production.md b/docs/pt_BR/workflow/production.md
index 897becb39..ee77bb879 100644
--- a/docs/pt_BR/workflow/production.md
+++ b/docs/pt_BR/workflow/production.md
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // Webpack 1 apenas - otimiza ids de módulo por contagem de ocorrências
+    // webpack 1 apenas - otimiza ids de módulo por contagem de ocorrências
     new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
@@ -34,6 +34,6 @@ Obviamente não queremos usar estás configurações durante o desenvolvimento,
 
 1. Crie dinamicamente o objeto de configuração com base em uma variável de ambiente.
 
-2. Ou use dois arquivos de configuração do Webpack separados,  um para o desenvolvimento e outro para produção. E talvez compartilhe algumas opções comuns entre eles em um terceiro arquivo, como mostrado em [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+2. Ou use dois arquivos de configuração do webpack separados,  um para o desenvolvimento e outro para produção. E talvez compartilhe algumas opções comuns entre eles em um terceiro arquivo, como mostrado em [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
 
 Isto é com você, desde que o objetivo seja atingido.
diff --git a/docs/pt_BR/workflow/testing.md b/docs/pt_BR/workflow/testing.md
index c911891af..e1baaaf07 100644
--- a/docs/pt_BR/workflow/testing.md
+++ b/docs/pt_BR/workflow/testing.md
@@ -2,7 +2,7 @@
 
 > O [template vue-cli do webpack](https://github.com/vuejs-templates/webpack)  oferece testes de unidade pré-configurados e configurações de teste es2 para você.
 
-Ao testar arquivos `*.vue` não podemos usar um corredor de teste simples baseado em CommonJs, porque ele não sabe como manipular arquivos `*.vue`. Em vez disso, nós ainda usaremos Webpack + vue-loader para manipular nossos arquivos de teste. A configuração recomendada é usando [Karma](http://karma-runner.github.io/0.13/index.html) e [karma-webpack](https://github.com/webpack/karma-webpack).
+Ao testar arquivos `*.vue` não podemos usar um corredor de teste simples baseado em CommonJs, porque ele não sabe como manipular arquivos `*.vue`. Em vez disso, nós ainda usaremos webpack + vue-loader para manipular nossos arquivos de teste. A configuração recomendada é usando [Karma](http://karma-runner.github.io/0.13/index.html) e [karma-webpack](https://github.com/webpack/karma-webpack).
 
 Karma é um corredor de teste que inicia navegadores e executa seus testes. Você pode escolher qual navegador você quer para testar e qual framework \(exemplo: Mocha ou Jasmine\) você quer usar. Aqui está um exemplo de configuração Karma que executa os testes dentro de [PhantomJS](http://phantomjs.org/) com o framework de teste [Jasmine](http://jasmine.github.io/edge/introduction.html).
 
@@ -16,7 +16,7 @@ npm install\
 
 ```js
 // podemos usar a mesma configuração que é exigida pelo webpackm
-// entretanto, lembre-se de remover a entrada original, uma vez 
+// entretanto, lembre-se de remover a entrada original, uma vez
 // que não precisamo durante os testes
 var webpackConfig = require('./webpack.config.js')
 delete webpackConfig.entry
@@ -47,7 +47,7 @@ E para o arquivo `test/index.js` de entrada:
 
 ```js
 // test/index.js
-// requisita todos os arquivos de testes usando 0 recursos especial do Webpack
+// requisita todos os arquivos de testes usando 0 recursos especial do webpack
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
@@ -98,4 +98,4 @@ Finalmente execute:
 npm test
 ```
 
-Novamente, [template vue-cli webpack](https://github.com/vuejs-templates/webpack) contém um exemplo totalmente funcional com testes.
\ No newline at end of file
+Novamente, [template vue-cli webpack](https://github.com/vuejs-templates/webpack) contém um exemplo totalmente funcional com testes.
diff --git a/docs/ru/README.md b/docs/ru/README.md
index d131f849e..11b4d9419 100644
--- a/docs/ru/README.md
+++ b/docs/ru/README.md
@@ -2,32 +2,32 @@
 
 ### Что такое `vue-loader`?
 
-`vue-loader` – это загрузчик для Webpack, который преобразует Vue компоненты, написанные в следующем формате в обычные JavaScript модули:
+`vue-loader` – это загрузчик для webpack, который преобразует Vue компоненты, написанные в следующем формате в обычные JavaScript модули:
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 `vue-loader` предлагает множество полезных возможностей:
 
 - Поддержка ES2015 по умолчанию;
-- Позволяет использовать разные загрузчики Webpack для разных частей Vue компонента, например, SASS для `<style>` и Jade для `<template>`;
+- Позволяет использовать разные загрузчики webpack для разных частей Vue компонента, например, SASS для `<style>` и Jade для `<template>`;
 - Позволяет использовать пользовательские секции во .vue-файлах, применяя к ним пользовательские цепочки загрузчиков
-- Обращается со статическими ресурсами, указанными в `<style>` и `<template>`, как с зависимостями модуля, и обрабатывает их Webpack загрузчиками;
+- Обращается со статическими ресурсами, указанными в `<style>` и `<template>`, как с зависимостями модуля, и обрабатывает их webpack загрузчиками;
 - Может эмулировать scoped CSS для компонентов;
 - Поддерживает горячую замену модулей.
 
-В двух словах, сочетание Webpack и `vue-loader` предоставляет вам современный, гибкий и невероятно эффективный подход к написанию клиентских приложений на Vue.js.
+В двух словах, сочетание webpack и `vue-loader` предоставляет вам современный, гибкий и невероятно эффективный подход к написанию клиентских приложений на Vue.js.
 
-### Что такое Webpack?
+### Что такое webpack?
 
-Если вы уже знакомы с Webpack, можете пропустить дальнейшее объяснение. Для тех же, кому Webpack в новинку, вот краткая вводная:
+Если вы уже знакомы с webpack, можете пропустить дальнейшее объяснение. Для тех же, кому webpack в новинку, вот краткая вводная:
 
-[Webpack](https://webpack.github.io/) – это сборщик модулей. Он берёт кучу файлов, рассматривая каждый как модуль, разрешает зависимости между ними и собирает их в статические ресурсы, готовые к развёртыванию.
+[webpack](https://webpack.github.io/) – это сборщик модулей. Он берёт кучу файлов, рассматривая каждый как модуль, разрешает зависимости между ними и собирает их в статические ресурсы, готовые к развёртыванию.
 
 ![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
-В качестве простого примера, представим, что у нас есть набор модулей CommonJS. Они не могут запускаться прямо в браузере, так что нам нужно "собрать" их в единый файл, который можно будет вставить на страницу через тег `<script>`. Webpack может сделать это за нас, следуя инструкциям `require()`.
+В качестве простого примера, представим, что у нас есть набор модулей CommonJS. Они не могут запускаться прямо в браузере, так что нам нужно "собрать" их в единый файл, который можно будет вставить на страницу через тег `<script>`. webpack может сделать это за нас, следуя инструкциям `require()`.
 
-Но Webpack может делать и больше. С "загрузчиками", мы можем научить Webpack преобразовывать любые типы файлов любым нужным нам образом, прежде чем выдать финальную сборку. Например:
+Но webpack может делать и больше. С "загрузчиками", мы можем научить webpack преобразовывать любые типы файлов любым нужным нам образом, прежде чем выдать финальную сборку. Например:
 
 - Скомпилировать ES2015, CoffeeScript или TypeScript модули в обычные ES5 CommonJS модули;
 - Пропустить код через статический анализатор, прежде чем приступать к компиляции;
@@ -35,4 +35,4 @@
 - Скомпилировать SASS файлы в обычный CSS, затем конвертировать его в JS скрипт, который будет добавлять полученный CSS как тег `<style>`;
 - Обработать файлы изображений, указанные в HTML или CSS, переместить их в нужное место, согласно файлу конфигурации, и переименовать, используя их md5 хеш.
 
-Webpack настолько крут, что когда вы поймете, как он работает, он значительно улучшит ваш процесс разработки клиентской части. Его основным недостатком является многословная и сложная конфигурация; но с этим руководством вы сможете найти решения для большинства задач, возникающих при работе с Webpack в сочетании с Vue.js и `vue-loader`.
+webpack настолько крут, что когда вы поймете, как он работает, он значительно улучшит ваш процесс разработки клиентской части. Его основным недостатком является многословная и сложная конфигурация; но с этим руководством вы сможете найти решения для большинства задач, возникающих при работе с webpack в сочетании с Vue.js и `vue-loader`.
diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
index 51edb4d2b..2429c363f 100644
--- a/docs/ru/configurations/advanced.md
+++ b/docs/ru/configurations/advanced.md
@@ -12,7 +12,7 @@
 
 > Опции `preLoaders` и `postLoaders` доступны только в версиях 10.3.0+
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 module.exports = {
@@ -59,7 +59,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` js
 // webpack.config.js
diff --git a/docs/ru/configurations/asset-url.md b/docs/ru/configurations/asset-url.md
index 3ccb40724..e81b605f1 100644
--- a/docs/ru/configurations/asset-url.md
+++ b/docs/ru/configurations/asset-url.md
@@ -14,10 +14,10 @@
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-Так как `.png` это не JavaScript-файл, вам необходимо настроить Webpack использовать [file-loader](https://github.com/webpack/file-loader) или [url-loader](https://github.com/webpack/url-loader) для их обработки. Проект создаваемый с помощью `vue-cli` уже сделает это за вас.
+Так как `.png` это не JavaScript-файл, вам необходимо настроить webpack использовать [file-loader](https://github.com/webpack/file-loader) или [url-loader](https://github.com/webpack/url-loader) для их обработки. Проект создаваемый с помощью `vue-cli` уже сделает это за вас.
 
 Преимущества подобного подхода:
 
-1. `file-loader` позволяет определить куда нужно скопировать и поместить файл, а также как именовать его с добавлением в имя хэша для лучшего кеширования. Кроме того, это означает что **вы можете просто поместить изображения рядом с вашим `*.vue` файлами и использовать относительные пути, основанные на структуре каталогов, не беспокоясь об адресах при развёртывании**. При правильной конфигурации, Webpack будет автоматически заменять пути к файлам в корректные URL в итоговой сборке.
+1. `file-loader` позволяет определить куда нужно скопировать и поместить файл, а также как именовать его с добавлением в имя хэша для лучшего кеширования. Кроме того, это означает что **вы можете просто поместить изображения рядом с вашим `*.vue` файлами и использовать относительные пути, основанные на структуре каталогов, не беспокоясь об адресах при развёртывании**. При правильной конфигурации, webpack будет автоматически заменять пути к файлам в корректные URL в итоговой сборке.
 
 2. `url-loader` позволяет вставлять файлы как base-64 ссылки если они меньше указанного размера. Это позволит уменьшить количество HTTP-запросов при использовании маленьких файлов. Если же файл больше указанного порога, то он автоматически подключится с помощью `file-loader`.
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index dc9fbea68..92033f9bc 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -41,7 +41,7 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// Webpack 2.x
+// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
@@ -84,7 +84,7 @@ module.exports = function (source, map) {
 
 #### webpack.config.js
 
-Теперь необходимо настроить Webpack использовать наш загрузчик для пользовательских блоков `<docs>`.
+Теперь необходимо настроить webpack использовать наш загрузчик для пользовательских блоков `<docs>`.
 
 ``` js
 const docsLoader = require.resolve('./custom-loaders/docs-loader.js')
diff --git a/docs/ru/configurations/extract-css.md b/docs/ru/configurations/extract-css.md
index e092e87bb..b185d3b84 100644
--- a/docs/ru/configurations/extract-css.md
+++ b/docs/ru/configurations/extract-css.md
@@ -39,7 +39,7 @@ module.exports = {
 
 Пример конфигурации для извлечения CSS из всех компонентов Vue в отдельный CSS-файл:
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 // webpack.config.js
@@ -69,7 +69,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
index 1bb3be1bc..71d7cda85 100644
--- a/docs/ru/configurations/pre-processors.md
+++ b/docs/ru/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # Использование пре-процессоров
 
-В Webpack все пре-процессоры должны быть применены с соответствующим загрузчиком. `vue-loader` позволяет вам использовать другие загрузчики Webpack для обработки секций компонентов Vue. Они будут автоматически вызваны для обработки секций на основе указанного атрибута `lang` у секции файла.
+В webpack все пре-процессоры должны быть применены с соответствующим загрузчиком. `vue-loader` позволяет вам использовать другие загрузчики webpack для обработки секций компонентов Vue. Они будут автоматически вызваны для обработки секций на основе указанного атрибута `lang` у секции файла.
 
 ### CSS
 
@@ -45,7 +45,7 @@ npm install sass-loader node-sass --save-dev
 npm install sass-resources-loader --save-dev
 ```
 
-Затем добавить новое правило в Webpack:
+Затем добавить новое правило в webpack:
 
 ``` js
 {
@@ -87,7 +87,7 @@ npm install coffee-loader --save-dev
 
 ### Шаблоны
 
-Обработка шаблонов выполняется несколько иначе, потому что большинство loader'ов шаблонов Webpack, например `pug-loader`, возвращают функцию шаблона вместо скомпилированного в строку HTML. Поэтому вместо использования `pug-loader`, можно просто установить оригинальный `pug`:
+Обработка шаблонов выполняется несколько иначе, потому что большинство loader'ов шаблонов webpack, например `pug-loader`, возвращают функцию шаблона вместо скомпилированного в строку HTML. Поэтому вместо использования `pug-loader`, можно просто установить оригинальный `pug`:
 
 ``` bash
 npm install pug --save-dev
@@ -104,7 +104,7 @@ div
 
 ### Непосредственное указание loader'ов
 
-Вы можете указывать [опции для loader'ов Webpack](https://webpack.github.io/docs/loaders.html#introduction) в атрибуте `lang`:
+Вы можете указывать [опции для loader'ов webpack](https://webpack.github.io/docs/loaders.html#introduction) в атрибуте `lang`:
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -112,4 +112,4 @@ div
 </style>
 ```
 
-Обратите внимание, это сделает ваш компонент Vue зависимым от Webpack и несовместимым с Browserify и [vueify](https://github.com/vuejs/vueify). **Если вы планируете распространять ваш компонент Vue, избегайте использования этого синтаксиса.**
+Обратите внимание, это сделает ваш компонент Vue зависимым от webpack и несовместимым с Browserify и [vueify](https://github.com/vuejs/vueify). **Если вы планируете распространять ваш компонент Vue, избегайте использования этого синтаксиса.**
diff --git a/docs/ru/features/es2015.md b/docs/ru/features/es2015.md
index b99e931bd..f91dacc26 100644
--- a/docs/ru/features/es2015.md
+++ b/docs/ru/features/es2015.md
@@ -58,7 +58,7 @@ export default {
 
 ### Транспиляция обычных `.js` файлов
 
-Так как `vue-loader` обрабатывает только `*.vue` файлы, вам нужно настроить в файле конфигурации Webpack чтобы обычные `*.js` файлы обрабатывались с помощью `babel-loader` или `buble-loader`. Проект созданный с помощью `vue-cli` уже настроен таким образом.
+Так как `vue-loader` обрабатывает только `*.vue` файлы, вам нужно настроить в файле конфигурации webpack чтобы обычные `*.js` файлы обрабатывались с помощью `babel-loader` или `buble-loader`. Проект созданный с помощью `vue-cli` уже настроен таким образом.
 
 ### Настройка Babel с помощью `.babelrc`
 
diff --git a/docs/ru/features/hot-reload.md b/docs/ru/features/hot-reload.md
index bfa8e7bdd..a3ba769b5 100644
--- a/docs/ru/features/hot-reload.md
+++ b/docs/ru/features/hot-reload.md
@@ -24,10 +24,10 @@
 
 Горячая замена всегда включена, за исключением следующих ситуаций:
 
- * Опция Webpack `target` в значении `node` (SSR)
- * Webpack минифицирует код
+ * Опция webpack `target` в значении `node` (SSR)
+ * webpack минифицирует код
  * `process.env.NODE_ENV === 'production'`
-  
+
 Вы можете использовать опцию `hotReload: false` для принудительного отключения горячей замены:
 
 ``` js
@@ -42,4 +42,4 @@ module: {
     }
   ]
 }
-```
\ No newline at end of file
+```
diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
index f486b0e21..d933108ce 100644
--- a/docs/ru/features/postcss.md
+++ b/docs/ru/features/postcss.md
@@ -16,7 +16,7 @@
 
 В качестве альтернативы, вы можете указать конфигурацию PostCSS специально для `*.vue` файлов с помощью опции `postcss` для `vue-loader`.
 
-Пример использования с Webpack 1.x:
+Пример использования с webpack 1.x:
 
 ``` js
 // webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
 }
 ```
 
-Для Webpack 2.x:
+Для webpack 2.x:
 
 ``` js
 // webpack.config.js
diff --git a/docs/ru/options.md b/docs/ru/options.md
index 41b3d3a5e..6e57a70e7 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -1,8 +1,8 @@
 # Перечень настроек
 
-## Отличия в использовании с Webpack 1 & 2
+## Отличия в использовании с webpack 1 & 2
 
-Для Webpack 2: настройки можно передавать непосредственно в правилах загрузчиков.
+Для webpack 2: настройки можно передавать непосредственно в правилах загрузчиков.
 
 ``` js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-Для Webpack 1.x: добавить блок `vue` в корень конфигурации Webpack:
+Для webpack 1.x: добавить блок `vue` в корень конфигурации webpack:
 
 ``` js
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
 
 - Тип: `{ [lang: string]: string }`
 
-  Объект определяющий какие загрузчики Webpack переопределят стандартные загрузчики, используемые для обработки секций `*.vue` файлов. Ключ соответствует атрибуту `lang` у секции файла, если таковой был указан. Значения `lang` по умолчанию:
+  Объект определяющий какие загрузчики webpack переопределят стандартные загрузчики, используемые для обработки секций `*.vue` файлов. Ключ соответствует атрибуту `lang` у секции файла, если таковой был указан. Значения `lang` по умолчанию:
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -45,7 +45,7 @@ module.exports = {
   Например, чтобы использовать `babel-loader` и `eslint-loader` для обработки всех секций `<script>`:
 
   ``` js
-  // Конфигурация Webpack 2.x
+  // Конфигурация webpack 2.x
   module: {
     rules: [
       {
@@ -144,7 +144,7 @@ module.exports = {
 
   Использование source maps для CSS. Отключение этой опции может позволить избежать некоторых багов с относительными путями в `css-loader` и сделать сборку немного быстрее.
 
-  Обратите внимание, эта опция автоматически устанавливается в `false` при отсутствии опции `devtool` в файле конфигурации Webpack.
+  Обратите внимание, эта опция автоматически устанавливается в `false` при отсутствии опции `devtool` в файле конфигурации webpack.
 
 ### esModule
 
@@ -183,7 +183,7 @@ module.exports = {
 - Тип: `{ [tag: string]: string | Array<string> }`
 - По умолчанию: `{ img: 'src' }`
 
-  Во время компиляции шаблона, компилятор может преобразовывать определённые атрибуты, такие как `src` в ссылках, в вызовы `require`, таким образом чтобы файл обрабатывался с помощью Webpack. Конфигурация по умолчанию преобразует `src` атрибуты внутри тегов `<img>`.
+  Во время компиляции шаблона, компилятор может преобразовывать определённые атрибуты, такие как `src` в ссылках, в вызовы `require`, таким образом чтобы файл обрабатывался с помощью webpack. Конфигурация по умолчанию преобразует `src` атрибуты внутри тегов `<img>`.
 
 ### buble
 
@@ -298,7 +298,7 @@ module.exports = {
 > Добавлено в версии 12.1.1
 
 - Тип: `boolean`
-- По умолчанию: `true` когда конфигурация Webpack имеет `target: 'node'` и версия `vue-template-compiler` 2.4.0 или выше.
+- По умолчанию: `true` когда конфигурация webpack имеет `target: 'node'` и версия `vue-template-compiler` 2.4.0 или выше.
 
 Включает оптимизацию компиляции в Vue 2.4 SSR, которая компилирует в простые строки часть деревьев vdom возвращаемых render-функциями, что улучшает производительность SSR. В некоторых случаях вам может потребоваться явно отключить оптимизацию, поскольку результирующие render-функции могут быть использованы только для SSR и не могут использоваться для рендеринга на стороне клиента или тестирования.
 
@@ -319,5 +319,5 @@ module.exports = {
 - По умолчанию: `true` в режиме разработки, `false` в режиме production или при установленной опции `target: 'node'` в конфигурации webpack.
 - Разрешённые значения: `false` (`true` не заставит работать горячую замену ни в режиме production, ни когда `target: 'node'`)
 
-Использование возможности Webpack по [горячей замене модулей](https://webpack.js.org/concepts/hot-module-replacement/) позволяет применять изменения в браузере **без необходимости обновления страницы**.
-Используйте эту опцию (со значением `false`) чтобы отключить горячую замену в режиме разработки. 
\ No newline at end of file
+Использование возможности webpack по [горячей замене модулей](https://webpack.js.org/concepts/hot-module-replacement/) позволяет применять изменения в браузере **без необходимости обновления страницы**.
+Используйте эту опцию (со значением `false`) чтобы отключить горячую замену в режиме разработки.
diff --git a/docs/ru/start/spec.md b/docs/ru/start/spec.md
index 22c0225aa..d50552543 100644
--- a/docs/ru/start/spec.md
+++ b/docs/ru/start/spec.md
@@ -56,7 +56,7 @@ export default {
 
 - Каждый `*.vue` файл может содержать максимум один блок `<script>`.
 
-- Скрипт исполняется в окружении CommonJS (как обычный `.js` модуль, собранный с помощью Webpack), что позволяет вам использовать `require()` для подключения других зависимостей. А вместе с поддержкой ES2015, можно использовать также синтаксис `import` и `export`.
+- Скрипт исполняется в окружении CommonJS (как обычный `.js` модуль, собранный с помощью webpack), что позволяет вам использовать `require()` для подключения других зависимостей. А вместе с поддержкой ES2015, можно использовать также синтаксис `import` и `export`.
 
 - Скрипт должен экспортировать объект с настройками компонента Vue.js. Экспортирование расширенного конструктора, созданного через `Vue.extend()`, также поддерживается, но просто объект предпочтительнее.
 
@@ -68,13 +68,13 @@ export default {
 
 - Тег `<style>` может иметь `scoped` или `module` атрибуты (подробнее — [Scoped CSS](../features/scoped-css.md) и [CSS модули](../features/css-modules.md)) для возможности инкапсулировать стили в текущий компонент. Несколько тегов `<style>` с разными режимами инкапсуляции могут быть использованы в одном компоненте.
 
-- По умолчанию, содержимое будет извлечено и динамически вставлено в тег `<head>` документа обычным тегом `<style>` с помощью `style-loader`. Также возможно [настроить Webpack чтобы извлекать стили всех компонентов в один CSS-файл](../configurations/extract-css.md).
+- По умолчанию, содержимое будет извлечено и динамически вставлено в тег `<head>` документа обычным тегом `<style>` с помощью `style-loader`. Также возможно [настроить webpack чтобы извлекать стили всех компонентов в один CSS-файл](../configurations/extract-css.md).
 
 ### Пользовательские блоки
 
 > Доступно только в версиях vue-loader 10.2.0+
 
-Дополнительные пользовательские блоки могут быть добавлены в `*.vue` файл для любых потребностей проекта, например блок `<docs>`. `vue-loader` будет использовать имя тега для определения какими загрузчиками Webpack требуется обрабатывать содержимое этой секции. Загрузчики Webpack должны быть указаны в секции `loaders` настроек `vue-loader`.
+Дополнительные пользовательские блоки могут быть добавлены в `*.vue` файл для любых потребностей проекта, например блок `<docs>`. `vue-loader` будет использовать имя тега для определения какими загрузчиками webpack требуется обрабатывать содержимое этой секции. Загрузчики webpack должны быть указаны в секции `loaders` настроек `vue-loader`.
 
 Подробнее в разделе [пользовательских блоков](../configurations/custom-blocks.md).
 
diff --git a/docs/ru/workflow/linting.md b/docs/ru/workflow/linting.md
index 085b3499a..ed6757b14 100644
--- a/docs/ru/workflow/linting.md
+++ b/docs/ru/workflow/linting.md
@@ -39,9 +39,9 @@ module.exports = {
 }
 ```
 
-Обратите внимание, что загрузчики Webpack применяются **справа-налево**. Убедитесь, что `eslint` прописан перед `vue`, чтобы код сначала проходил через анализатор, а затем компилировался.
+Обратите внимание, что загрузчики webpack применяются **справа-налево**. Убедитесь, что `eslint` прописан перед `vue`, чтобы код сначала проходил через анализатор, а затем компилировался.
 
-Стоит упомянуть об использовании сторонних `*.vue` компонентов, поставляемых в NPM пакетах. В таком случае нам нужно воспользоваться `vue-loader`? чтобы подключить сторонние компоненты, но не анализировать их. Мы можем вынести анализ в [предзагрузчики](https://webpack.github.io/docs/loaders.html#loader-order) Webpack:
+Стоит упомянуть об использовании сторонних `*.vue` компонентов, поставляемых в NPM пакетах. В таком случае нам нужно воспользоваться `vue-loader`? чтобы подключить сторонние компоненты, но не анализировать их. Мы можем вынести анализ в [предзагрузчики](https://webpack.github.io/docs/loaders.html#loader-order) webpack:
 
 ``` js
 // webpack.config.js
@@ -67,7 +67,7 @@ module.exports = {
 }
 ```
 
-Для Webpack 2.x:
+Для webpack 2.x:
 
 ``` js
 // webpack.config.js
diff --git a/docs/ru/workflow/production.md b/docs/ru/workflow/production.md
index e8f3bf3e7..a8f392d14 100644
--- a/docs/ru/workflow/production.md
+++ b/docs/ru/workflow/production.md
@@ -24,7 +24,7 @@ module.exports = {
         warnings: false
       }
     }),
-    // только для Webpack 1 – оптимизируем идентификаторы модулей по числу использований
+    // только для webpack 1 – оптимизируем идентификаторы модулей по числу использований
     new webpack.optimize.OccurrenceOrderPlugin()
   ]
 }
@@ -34,6 +34,6 @@ module.exports = {
 
 1. Динамически собирать объект конфигурации на основе переменных окружения;
 
-2. Или использовать два отдельных конфигурационных файла Webpack, один для разработки, и один для продакшна. И возможно хранить некоторые их общие опции в третьем файле, как показано в [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
+2. Или использовать два отдельных конфигурационных файла webpack, один для разработки, и один для продакшна. И возможно хранить некоторые их общие опции в третьем файле, как показано в [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0).
 
 Не имеет значения, как вы будете это делать, если это решит задачу.
diff --git a/docs/ru/workflow/testing.md b/docs/ru/workflow/testing.md
index 5650b5de3..17594b64f 100644
--- a/docs/ru/workflow/testing.md
+++ b/docs/ru/workflow/testing.md
@@ -3,7 +3,7 @@
 
 > [Шаблон webpack vue-cli](https://github.com/vuejs-templates/webpack) предлагает вам готовые решения для модульного и e2e-тестирования.
 
-Тестируя `*.vue` файлы, мы не можем использовать обычные тестовые движки для CommonJS, поскольку они не знают, как обрабатывать `*.vue` файлы. Вместо этого мы снова воспользуемся Webpack + vue-loader для сборки наших тестов. Мы рекомендуем использовать сочетание [Karma](https://karma-runner.github.io/0.13/index.html) и [karma-webpack](https://github.com/webpack/karma-webpack).
+Тестируя `*.vue` файлы, мы не можем использовать обычные тестовые движки для CommonJS, поскольку они не знают, как обрабатывать `*.vue` файлы. Вместо этого мы снова воспользуемся webpack + vue-loader для сборки наших тестов. Мы рекомендуем использовать сочетание [Karma](https://karma-runner.github.io/0.13/index.html) и [karma-webpack](https://github.com/webpack/karma-webpack).
 
 Karma – это тестовый движок, который запускает браузеры и прогоняет тесты за вас. Вы можете выбрать, в каких браузерах выполнять тесты и какой тестовый фреймворк использовать (например, Mocha или Jasmin). Вот пример конфигурации Karma для тестирования в [PhantomJS](http://phantomjs.org/) с помощью фреймворка [Jasmine](https://jasmine.github.io/edge/introduction.html):
 
@@ -48,7 +48,7 @@ module.exports = function (config) {
 
 ``` js
 // test/index.js
-// подтягиваем все файлы тестов, используя специальную возможность Webpack
+// подтягиваем все файлы тестов, используя специальную возможность webpack
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)

From da8f356731355e76e28b0019a48dcd1c5586f114 Mon Sep 17 00:00:00 2001
From: Kindy Lin <kindy.lin@gmail.com>
Date: Sat, 18 Nov 2017 23:12:56 +0800
Subject: [PATCH 763/877] Update custom-blocks.md (#1059)

---
 docs/en/configurations/custom-blocks.md    | 2 ++
 docs/ja/configurations/custom-blocks.md    | 2 ++
 docs/kr/configurations/custom-blocks.md    | 2 ++
 docs/pt_BR/configurations/custom-blocks.md | 2 ++
 docs/ru/configurations/custom-blocks.md    | 2 ++
 docs/zh-cn/configurations/custom-blocks.md | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index e10021f51..eac92d478 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -68,6 +68,8 @@ module.exports = {
 
 ## Runtime available docs
 
+> Requires 11.3.0+
+
 Here's an example of injecting the `<docs>` custom blocks into the component so that it's available during runtime.
 
 #### docs-loader.js
diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
index eb1f45f34..b0a764346 100644
--- a/docs/ja/configurations/custom-blocks.md
+++ b/docs/ja/configurations/custom-blocks.md
@@ -68,6 +68,8 @@ module.exports = {
 
 ## 実行時に利用可能なドキュメント
 
+> 11.3.0 以上で動作します
+
 `<docs>`カスタムブロックをコンポーネントに注入して実行時に利用できるようにする例です。
 
 #### docs-loader.js
diff --git a/docs/kr/configurations/custom-blocks.md b/docs/kr/configurations/custom-blocks.md
index 2c16dd52a..c845859b4 100644
--- a/docs/kr/configurations/custom-blocks.md
+++ b/docs/kr/configurations/custom-blocks.md
@@ -68,6 +68,8 @@ module.exports = {
 
 ## 런타임에서 사용할 수 있는 문서
 
+> 11.3.0 버전 이상에서 지원
+
 다음은 `<docs>` 사용자 정의 블록을 컴포넌트에 넣어 런타임에서 사용할 수 있는 예제입니다.
 
 #### docs-loader.js
diff --git a/docs/pt_BR/configurations/custom-blocks.md b/docs/pt_BR/configurations/custom-blocks.md
index 779ef7d49..765443a0d 100644
--- a/docs/pt_BR/configurations/custom-blocks.md
+++ b/docs/pt_BR/configurations/custom-blocks.md
@@ -68,6 +68,8 @@ module.exports = {
 
 ## Documentos disponíveis em tempo de execução.
 
+> Requer versão 11.3.0+
+
 Aqui está um exemplo de injetar os blocos personalizados `<docs>` no componente para que ele esteja disponível durante o tempo de execução.
 
 ### docs-loader.js
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index 92033f9bc..0da7a6cbc 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -68,6 +68,8 @@ module.exports = {
 
 ## Документация доступная во время выполнения
 
+> Доступно в версиях 11.3.0+
+
 Вот пример того, как можно встроить пользовательские блоки `<docs>` в компонент, чтобы он был доступен во время выполнения.
 
 #### docs-loader.js
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index 5378d2506..b80fecf48 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -69,6 +69,8 @@ module.exports = {
 
 ## 运行时可用的文档
 
+> 在 11.3.0+ 中支持
+
 这里有一个向组件注入 `<docs>` 自定义块使其在运行时可用的例子。
 
 #### docs-loader.js

From b3edfacfad167e1fca5f48493ba70f559c517e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Mon, 20 Nov 2017 12:45:28 +0800
Subject: [PATCH 764/877] [en] comment format fixing (#1067)

* [en] typo

* [docs] typos
---
 docs/en/configurations/advanced.md    | 4 ++--
 docs/en/features/postcss.md           | 4 ++--
 docs/en/options.md                    | 4 ++--
 docs/ja/configurations/advanced.md    | 4 ++--
 docs/ja/features/postcss.md           | 4 ++--
 docs/ja/options.md                    | 4 ++--
 docs/kr/configurations/advanced.md    | 4 ++--
 docs/kr/features/postcss.md           | 4 ++--
 docs/kr/options.md                    | 4 ++--
 docs/pt_BR/configurations/advanced.md | 2 +-
 docs/pt_BR/features/postcss.md        | 2 +-
 docs/ru/configurations/advanced.md    | 2 +-
 docs/ru/features/postcss.md           | 2 +-
 docs/zh-cn/configurations/advanced.md | 4 ++--
 docs/zh-cn/features/postcss.md        | 4 ++--
 docs/zh-cn/options.md                 | 4 ++--
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 7a0c05ee9..8bdea8b4f 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -18,7 +18,7 @@ To do that, specify the `loaders` option for `vue-loader`:
 module.exports = {
   // other options...
   module: {
-    // module.rules is the same as module.loaders in 1.x
+    // `module.rules` is the same as `module.loaders` in 1.x
     rules: [
       {
         test: /\.vue$/,
@@ -73,7 +73,7 @@ module.exports = {
       }
     ]
   },
-  // vue-loader configurations
+  // `vue-loader` configurations
   vue: {
     loaders: {
       // same configuration rules as above
diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index 4066d9ec6..eafeb1cea 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -36,12 +36,12 @@ For webpack 2.x:
 module.exports = {
   // other options...
   module: {
-    // module.rules is the same as module.loaders in 1.x
+    // `module.rules` is the same as `module.loaders` in 1.x
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        // vue-loader options goes here
+        // `vue-loader` options goes here
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
diff --git a/docs/en/options.md b/docs/en/options.md
index 8e63790a5..635ec0e95 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -13,7 +13,7 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          // vue-loader options
+          // `vue-loader` options
         }
       }
     ]
@@ -27,7 +27,7 @@ For webpack 1.x: add a root `vue` block in your webpack config.
 module.exports = {
   // ...
   vue: {
-    // vue-loader options
+    // `vue-loader` options
   }
 }
 ```
diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index 05606a5f5..ed4e179ed 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -16,7 +16,7 @@
 module.exports = {
   // 他のオプション
   module: {
-    // module.rules は 1.x での module.loaders と同じです
+    // `module.rules` は 1.x での `module.loaders` と同じです
     rules: [
       {
         test: /\.vue$/,
@@ -71,7 +71,7 @@ module.exports = {
       }
     ]
   },
-  // vue-loader の設定
+  // `vue-loader` の設定
   vue: {
     loaders: {
       // 上記の設定と同じ
diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
index 717f338f9..c0dfe3124 100644
--- a/docs/ja/features/postcss.md
+++ b/docs/ja/features/postcss.md
@@ -36,12 +36,12 @@ webpack 2.x の例:
 module.exports = {
   // 他の設定
   module: {
-    // module.rules は 1.x の module.loaders と同じです
+    // `module.rules` は 1.x の `module.loaders` と同じです
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        // vue-loader のオプションはここです
+        // `vue-loader` のオプションはここです
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
diff --git a/docs/ja/options.md b/docs/ja/options.md
index 017be9238..c8960ee8a 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -13,7 +13,7 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          // vue-loader オプション
+          // `vue-loader` オプション
         }
       }
     ]
@@ -27,7 +27,7 @@ webpack 1.x の場合: webpack の設定のルートに `vue` ブロックを追
 module.exports = {
   // ...
   vue: {
-    // vue-loader オプション
+    // `vue-loader` オプション
   }
 }
 ```
diff --git a/docs/kr/configurations/advanced.md b/docs/kr/configurations/advanced.md
index 93b32ed71..4debf1be1 100644
--- a/docs/kr/configurations/advanced.md
+++ b/docs/kr/configurations/advanced.md
@@ -18,7 +18,7 @@
 module.exports = {
   // 기타 옵션들...
   module: {
-    // module.rules은 1.x버전의 module.loaders과 같습니다
+    // `module.rules`은 1.x버전의 module.loaders과 같습니다
     rules: [
       {
         test: /\.vue$/,
@@ -70,7 +70,7 @@ module.exports = {
       }
     ]
   },
-  // vue-loader 설정
+  // `vue-loader` 설정
   vue: {
     loaders: {
       // 위와 동일한 설정 규칙입니다
diff --git a/docs/kr/features/postcss.md b/docs/kr/features/postcss.md
index e3fbed138..9c6678d7f 100644
--- a/docs/kr/features/postcss.md
+++ b/docs/kr/features/postcss.md
@@ -36,12 +36,12 @@ webpack 2버전 예제:
 module.exports = {
   // 기타 설정...
   module: {
-    // module.rules는 1.x의 module.loaders와 동일
+    // `module.rules`는 1.x의 module.loaders와 동일
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        // vue-loader 옵션은 여기에 지정합니다
+        // `vue-loader` 옵션은 여기에 지정합니다
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
diff --git a/docs/kr/options.md b/docs/kr/options.md
index 4eac04b7e..304ec19cc 100644
--- a/docs/kr/options.md
+++ b/docs/kr/options.md
@@ -13,7 +13,7 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          // vue-loader 옵션
+          // `vue-loader` 옵션
         }
       }
     ]
@@ -27,7 +27,7 @@ webpack 1.x의 경우 webpack 설정에 루트 `vue` 블럭을 추가합니다.
 module.exports = {
   // ...
   vue: {
-    // vue-loader 옵션
+    // `vue-loader` 옵션
   }
 }
 ```
diff --git a/docs/pt_BR/configurations/advanced.md b/docs/pt_BR/configurations/advanced.md
index 8578e82bb..33d8ffc71 100644
--- a/docs/pt_BR/configurations/advanced.md
+++ b/docs/pt_BR/configurations/advanced.md
@@ -19,7 +19,7 @@ Para fazer isto, especifique a opção `loaders` para `vue-loader`:
 module.exports = {
   // outras opções...
   module: {
-    // module.rules é o mesmo que module.loaders em 1.x
+    // `module.rules` é o mesmo que `module.loaders` em 1.x
     rules : [
       {
         test: /\.vue$/,
diff --git a/docs/pt_BR/features/postcss.md b/docs/pt_BR/features/postcss.md
index 5627e1845..798e500c9 100644
--- a/docs/pt_BR/features/postcss.md
+++ b/docs/pt_BR/features/postcss.md
@@ -36,7 +36,7 @@ Para webpack 2.x:
 module.exports = {
   // outras opções...
   module: {
-    // module.rules é o mesmo que module.loaders em 1.x
+    // `module.rules` é o mesmo que `module.loaders` em 1.x
     rules: [
       {
         test: /\.vue$/,
diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
index 2429c363f..8a529af20 100644
--- a/docs/ru/configurations/advanced.md
+++ b/docs/ru/configurations/advanced.md
@@ -18,7 +18,7 @@
 module.exports = {
   // другие настройки...
   module: {
-    // module.rules тоже самое, что и module.loaders в 1.x
+    // `module.rules` тоже самое, что и `module.loaders` в 1.x
     rules: [
       {
         test: /\.vue$/,
diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
index d933108ce..7b20bd087 100644
--- a/docs/ru/features/postcss.md
+++ b/docs/ru/features/postcss.md
@@ -36,7 +36,7 @@ module.exports = {
 module.exports = {
   // другие настройки...
   module: {
-    // module.rules тоже самое, что и module.loaders в 1.x
+    // `module.rules` тоже самое, что и `module.loaders` в 1.x
     rules: [
       {
         test: /\.vue$/,
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index 79c7222c4..598d0df62 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -18,7 +18,7 @@
 module.exports = {
   // other options...
   module: {
-    // module.rules 与 1.x 中的 module.loaders 相同
+    // `module.rules` 与 1.x 中的 `module.loaders` 相同
     rules: [
       {
         test: /\.vue$/,
@@ -68,7 +68,7 @@ module.exports = {
       }
     ]
   },
-  // vue-loader configurations
+  // `vue-loader` configurations
   vue: {
     loaders: {
       // same configuration rules as above
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
index 6f951ab43..9807897de 100644
--- a/docs/zh-cn/features/postcss.md
+++ b/docs/zh-cn/features/postcss.md
@@ -36,12 +36,12 @@ Webpack 2.x 例子：
 module.exports = {
   // other options...
   module: {
-    // module.rules is the same as module.loaders in 1.x
+    // `module.rules` is the same as `module.loaders` in 1.x
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        // vue-loader options goes here
+        // `vue-loader` options goes here
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 615324ea0..9bf9404a5 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -13,7 +13,7 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          // vue-loader options
+          // `vue-loader` options
         }
       }
     ]
@@ -27,7 +27,7 @@ Webpack 1.x：在 Webpack 配置中添加根节点 `vue` 块。
 module.exports = {
   // ...
   vue: {
-    // vue-loader options
+    // `vue-loader` options
   }
 }
 ```

From 45d462f0b9c136ffc66a115796f2b4b1f7e38442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Mon, 27 Nov 2017 23:25:24 +0800
Subject: [PATCH 765/877] docs: [zh-cn] synced from #5e549cb to #cda4973
 (#1053)

* [zh-cn] synced from #5e549cb to #cda4973

* Update hot-reload.md

* Update hot-reload.md
---
 docs/zh-cn/features/hot-reload.md | 24 ++++++++++++++++++++++++
 docs/zh-cn/features/postcss.md    | 12 ++++++------
 docs/zh-cn/options.md             | 11 +++++++++++
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/docs/zh-cn/features/hot-reload.md b/docs/zh-cn/features/hot-reload.md
index 1d5b8280f..b1601b854 100644
--- a/docs/zh-cn/features/hot-reload.md
+++ b/docs/zh-cn/features/hot-reload.md
@@ -19,3 +19,27 @@
 当手动设置你的工程时，热重载会在你启动 `webpack-dev-server --hot` 服务时自动开启。
 
 高阶用户可能希望移步 `vue-loader` 内部使用的 [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api) 继续查阅。
+
+## 关闭热重载
+
+热重载默认是开启的，除非遇到以下情况：
+
+ * webpack 的 `target` 的值是 `node` (服务端渲染)
+ * webpack 会压缩代码
+ * `process.env.NODE_ENV === 'production'`
+
+你可以设置 `hotReload: false` 选项来显式关闭热重载：
+
+``` js
+module: {
+  rules: [
+    {
+      test: /\.vue$/,
+      loader: 'vue-loader',
+      options: {
+        hotReload: false // 关闭热重载
+      }
+    }
+  ]
+}
+```
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
index 9807897de..bc63415e0 100644
--- a/docs/zh-cn/features/postcss.md
+++ b/docs/zh-cn/features/postcss.md
@@ -21,9 +21,9 @@ Webpack 1.x 例子：
 ``` js
 // webpack.config.js
 module.exports = {
-  // other configs...
+  // 其它配置……
   vue: {
-    // use custom postcss plugins
+    // 使用自定义 postcss 插件
     postcss: [require('postcss-cssnext')()]
   }
 }
@@ -36,12 +36,12 @@ Webpack 2.x 例子：
 module.exports = {
   // other options...
   module: {
-    // `module.rules` is the same as `module.loaders` in 1.x
+    // `module.rules` 和 1.x 里的 `module.loaders` 相同
     rules: [
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-        // `vue-loader` options goes here
+        // `vue-loader` 选项放这里
         options: {
           // ...
           postcss: [require('postcss-cssnext')()]
@@ -60,9 +60,9 @@ module.exports = {
 
   ``` js
   postcss: {
-    plugins: [...], // list of plugins
+    plugins: [...], // 插件列表
     options: {
-      parser: sugarss // use sugarss parser
+      parser: 'sugarss' // 使用 sugarss 解析器
     }
   }
   ```
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 9bf9404a5..6bbcdbea1 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -306,3 +306,14 @@ module.exports = {
 - 默认值：在开发环境下是 `true`，在生产环境下是 `false`。
 
 是否通过给文件名后加哈希查询值来避免生成的 source map 被缓存。关掉这一选项有益于 source map 调试。
+
+### hotReload
+
+> 13.5.0 新增
+
+- 类型: `boolean`
+- 默认值: 在开发环境下是 `true`，在生产环境下或 webpack 配置中有 `target: 'node'` 的时候是 `false`。
+- 允许的值: `false` (`true` 会强制热重载，即便是生产环境或 `target: 'node'` 时)
+
+是否使用 webpack 的[模块热替换](https://webpack.js.org/concepts/hot-module-replacement/)在浏览器中应用变更而**不重载整个页面**。
+用这个选项 (值设为 `false`) 在开发环境下关闭热重载特性。

From 1e3dc169a91f6aeaefdade20d9b85d83eaeceab0 Mon Sep 17 00:00:00 2001
From: 38elements <38elements@users.noreply.github.com>
Date: Tue, 28 Nov 2017 09:15:26 +0900
Subject: [PATCH 766/877] Update testing.md (#1078)

---
 docs/ja/workflow/testing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ja/workflow/testing.md b/docs/ja/workflow/testing.md
index 9f3d788e9..7d5fb830d 100644
--- a/docs/ja/workflow/testing.md
+++ b/docs/ja/workflow/testing.md
@@ -10,7 +10,7 @@ Karma はブラウザを起動してテストを実行するテストランナ
 npm install\
   karma karma-webpack\
   karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs--prebuilt\
+  karma-phantomjs-launcher phantomjs-prebuilt\
   --save-dev
 ```
 

From 21809a08ee948f8a38c251646a00dfbfa8ba2802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Mon, 11 Dec 2017 14:17:19 +0800
Subject: [PATCH 767/877] [docs] updated status of inject-loader (close #892)
 (#1088)

---
 docs/en/workflow/testing-with-mocks.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
index 7cff72e85..b2f728ca5 100644
--- a/docs/en/workflow/testing-with-mocks.md
+++ b/docs/en/workflow/testing-with-mocks.md
@@ -4,6 +4,8 @@ In a real world application, our components most likely have external dependenci
 
 `vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
 
+> Note: You must disable `esModule` option in inject mode, or you will get an error.
+
 Suppose we have a component like this:
 
 ``` html
@@ -14,9 +16,9 @@ Suppose we have a component like this:
 
 <script>
 // this dependency needs to be mocked
-import SomeService from '../service'
+const SomeService = require('../service')
 
-export default {
+module.exports = {
   data () {
     return {
       msg: SomeService.msg
@@ -28,10 +30,8 @@ export default {
 
 Here's how to import it with mocks:
 
-> Note: inject-loader@3.x is currently unstable.
-
 ``` bash
-npm install inject-loader@^2.0.0 --save-dev
+npm install inject-loader --save-dev
 ```
 
 ``` js

From ddcea2010a5ac3811b831571fbbcac0828c1f550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sat, 16 Dec 2017 00:34:29 +0800
Subject: [PATCH 768/877] fix: more robust handling for parsing 'srcset'
 attribute value (#1057)

* fix #1052

* added test case for #1052
---
 lib/template-compiler/modules/transform-srcset.js | 13 +++++++++----
 test/fixtures/transform.vue                       |  4 ++++
 test/test.js                                      | 11 +++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/template-compiler/modules/transform-srcset.js b/lib/template-compiler/modules/transform-srcset.js
index 49a15585b..2779eeae6 100644
--- a/lib/template-compiler/modules/transform-srcset.js
+++ b/lib/template-compiler/modules/transform-srcset.js
@@ -28,10 +28,15 @@ function transform (node) {
           return { require: urlToRequire(url), descriptor: descriptor }
         })
 
-        let code = ''
-        imageCandidates.forEach((o, i, a) => {
-          code += o.require + ' + " ' + o.descriptor + (i < a.length - 1 ? ', " + ' : '"')
-        })
+        // "require(url1)"
+        // "require(url1) 1x"
+        // "require(url1), require(url2)"
+        // "require(url1), require(url2) 2x"
+        // "require(url1) 1x, require(url2)"
+        // "require(url1) 1x, require(url2) 2x"
+        const code = imageCandidates.map(
+          ({ require, descriptor }) => `${require} + "${descriptor ? ' ' + descriptor : ''}, " + `
+        ).join('').slice(0, -6).concat('"').replace(/ \+ ""$/, '')
 
         attr.value = code
       }
diff --git a/test/fixtures/transform.vue b/test/fixtures/transform.vue
index 1e358f890..f43b47c69 100644
--- a/test/fixtures/transform.vue
+++ b/test/fixtures/transform.vue
@@ -4,8 +4,12 @@
   <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink= "http://www.w3.org/1999/xlink">
     <image xlink:href="./logo.png" />
   </svg>
+  <img src="./logo.png" srcset="./logo.png">
   <img src="./logo.png" srcset="./logo.png 2x">
+  <img src="./logo.png" srcset="./logo.png, ./logo.png 2x">
+  <img src="./logo.png" srcset="./logo.png 2x, ./logo.png">
   <img src="./logo.png" srcset="./logo.png 2x, ./logo.png 3x">
+  <img src="./logo.png" srcset="./logo.png, ./logo.png 2x, ./logo.png 3x">
   <img
     src="./logo.png"
     srcset="
diff --git a/test/test.js b/test/test.js
index 51ec6019a..93d15ff24 100644
--- a/test/test.js
+++ b/test/test.js
@@ -444,11 +444,14 @@ describe('vue-loader', () => {
       const dataURL = vnode.children[0].data.attrs.src
 
       // image tag with srcset
-      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL + ' 2x')
-      // image tag with srcset with two candidates
-      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
+      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL)
+      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + ' 2x')
       // image tag with multiline srcset
-      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
+      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + ', ' + dataURL + ' 2x')
+      expect(vnode.children[10].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL)
+      expect(vnode.children[12].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
+      expect(vnode.children[14].data.attrs.srcset).to.equal(dataURL + ', ' + dataURL + ' 2x, ' + dataURL + ' 3x')
+      expect(vnode.children[16].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
 
       // style
       expect(includeDataURL(style)).to.equal(true)

From 6d3c5b2c6d9b4dd0f282c45e6a8d734ce38011ed Mon Sep 17 00:00:00 2001
From: GU Yiling <justice360@gmail.com>
Date: Sat, 16 Dec 2017 00:34:50 +0800
Subject: [PATCH 769/877] fix: animation value replacement (#1058)

---
 lib/style-compiler/plugins/scope-id.js | 7 ++++---
 test/fixtures/scoped-css.vue           | 3 +++
 test/test.js                           | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/style-compiler/plugins/scope-id.js b/lib/style-compiler/plugins/scope-id.js
index 1ad7697bf..b8c217686 100644
--- a/lib/style-compiler/plugins/scope-id.js
+++ b/lib/style-compiler/plugins/scope-id.js
@@ -64,9 +64,10 @@ module.exports = postcss.plugin('add-id', ({ id }) => root => {
         decl.value = decl.value.split(',')
           .map(v => {
             const vals = v.trim().split(/\s+/)
-            const name = vals[0]
-            if (keyframes[name]) {
-              return [keyframes[name]].concat(vals.slice(1)).join(' ')
+            const i = vals.findIndex(val => keyframes[val])
+            if (i !== -1) {
+              vals.splice(i, 1, keyframes[vals[i]])
+              return vals.join(' ')
             } else {
               return v
             }
diff --git a/test/fixtures/scoped-css.vue b/test/fixtures/scoped-css.vue
index 7eacac8be..cd5f74676 100644
--- a/test/fixtures/scoped-css.vue
+++ b/test/fixtures/scoped-css.vue
@@ -15,6 +15,9 @@ h1 {
   animation-name: color;
   animation-duration: 5s;
 }
+.anim-3 {
+  animation: 5s color infinite, 5s other;
+}
 .anim-multiple {
   animation: color 5s infinite, opacity 2s;
 }
diff --git a/test/test.js b/test/test.js
index 93d15ff24..4b41d25ff 100644
--- a/test/test.js
+++ b/test/test.js
@@ -211,6 +211,7 @@ describe('vue-loader', () => {
       // scoped keyframes
       expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id} 5s infinite, other 5s;`)
       expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
+      expect(style).to.contain(`.anim-3[${id}] {\n  animation: 5s color-${id} infinite, 5s other;`)
       expect(style).to.contain(`@keyframes color-${id} {`)
       expect(style).to.contain(`@-webkit-keyframes color-${id} {`)
 

From 1809031f1fb02e8c4318c4b02923494cf3f7202c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 11:43:31 -0500
Subject: [PATCH 770/877] fix: only generate CSS source map when needed

close #1070
---
 lib/loader.js | 17 +++++++++++++++--
 lib/parser.js |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 217d7bc3d..f8ec00fe9 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -85,7 +85,11 @@ module.exports = function (content) {
   const moduleId = 'data-v-' + hash(isProduction ? content : shortFilePath)
 
   let cssLoaderOptions = ''
-  if (!isProduction && this.sourceMap && options.cssSourceMap !== false) {
+  const cssSourceMap =
+    !isProduction &&
+    this.sourceMap &&
+    options.cssSourceMap !== false
+  if (cssSourceMap) {
     cssLoaderOptions += '?sourceMap'
   }
   if (isProduction) {
@@ -97,7 +101,16 @@ module.exports = function (content) {
 
   let output = ''
   const bustCache = !isProduction && options.cacheBusting !== false
-  const parts = parse(content, fileName, this.sourceMap, sourceRoot, bustCache)
+
+  const parts = parse(
+    content,
+    fileName,
+    this.sourceMap,
+    sourceRoot,
+    bustCache,
+    cssSourceMap
+  )
+
   const hasScoped = parts.styles.some(({ scoped }) => scoped)
   const templateAttrs =
     parts.template && parts.template.attrs && parts.template.attrs
diff --git a/lib/parser.js b/lib/parser.js
index d26cc76a1..07f415ad5 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -6,7 +6,7 @@ const SourceMapGenerator = require('source-map').SourceMapGenerator
 const splitRE = /\r?\n/g
 const emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = (content, filename, needMap, sourceRoot, bustCache) => {
+module.exports = (content, filename, needMap, sourceRoot, bustCache, needCSSMap) => {
   const cacheKey = hash(filename + content)
   // source-map cache busting for hot-reloadded modules
   const filenameWithHash = bustCache
@@ -24,7 +24,7 @@ module.exports = (content, filename, needMap, sourceRoot, bustCache) => {
         sourceRoot
       )
     }
-    if (output.styles) {
+    if (needCSSMap && output.styles) {
       output.styles.forEach(style => {
         if (!style.src) {
           style.map = generateSourceMap(

From 69998934365fad90a4f161a987921cca0fdd8066 Mon Sep 17 00:00:00 2001
From: Jet <390715001@qq.com>
Date: Fri, 15 Dec 2017 10:45:21 -0600
Subject: [PATCH 771/877] docs: slot-scope deprecated (#1072)

---
 docs/zh-cn/features/es2015.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/features/es2015.md b/docs/zh-cn/features/es2015.md
index 6bca7f0fd..a85fdd7d1 100644
--- a/docs/zh-cn/features/es2015.md
+++ b/docs/zh-cn/features/es2015.md
@@ -48,7 +48,7 @@ export default {
 
 ``` html
 <my-component>
-  <template scope="{ id, text }">
+  <template slot-scope="{ id, text }">
     <span>{{ id }} {{ text }}</span>
   </template>
 </my-component>

From fa4d25e8fcbd555c236ef21fd5c6db76c279bc53 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 11:46:37 -0500
Subject: [PATCH 772/877] docs: fix deprecated scoped slot syntax

---
 docs/en/features/es2015.md    | 2 +-
 docs/ja/features/es2015.md    | 2 +-
 docs/kr/features/es2015.md    | 2 +-
 docs/pt_BR/features/es2015.md | 2 +-
 docs/ru/features/es2015.md    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/features/es2015.md b/docs/en/features/es2015.md
index 42461df49..85e3b2416 100644
--- a/docs/en/features/es2015.md
+++ b/docs/en/features/es2015.md
@@ -48,7 +48,7 @@ can be simplified to:
 
 ``` html
 <my-component>
-  <template scope="{ id, text }">
+  <template slot-scope="{ id, text }">
     <span>{{ id }} {{ text }}</span>
   </template>
 </my-component>
diff --git a/docs/ja/features/es2015.md b/docs/ja/features/es2015.md
index 003ae9fd3..49f4b587e 100644
--- a/docs/ja/features/es2015.md
+++ b/docs/ja/features/es2015.md
@@ -47,7 +47,7 @@ export default {
 
 ``` html
 <my-component>
-  <template scope="{ id, text }">
+  <template slot-scope="{ id, text }">
     <span>{{ id }} {{ text }}</span>
   </template>
 </my-component>
diff --git a/docs/kr/features/es2015.md b/docs/kr/features/es2015.md
index 95fbd6a6d..8d821b30e 100644
--- a/docs/kr/features/es2015.md
+++ b/docs/kr/features/es2015.md
@@ -48,7 +48,7 @@ export default {
 
 ``` html
 <my-component>
-  <template scope="{ id, text }">
+  <template slot-scope="{ id, text }">
     <span>{{ id }} {{ text }}</span>
   </template>
 </my-component>
diff --git a/docs/pt_BR/features/es2015.md b/docs/pt_BR/features/es2015.md
index 4b0fd6e6d..a7f68e23b 100644
--- a/docs/pt_BR/features/es2015.md
+++ b/docs/pt_BR/features/es2015.md
@@ -48,7 +48,7 @@ Pode ser simplificado para:
 
 ```html
 <my-component>
-  <template scope="{ id, text }">
+  <template slot-scope="{ id, text }">
     <span>{{ id }} {{ text }}</span>
   </template>
 </my-component>
diff --git a/docs/ru/features/es2015.md b/docs/ru/features/es2015.md
index f91dacc26..ffd0e4983 100644
--- a/docs/ru/features/es2015.md
+++ b/docs/ru/features/es2015.md
@@ -48,7 +48,7 @@ export default {
 
 ``` html
 <my-component>
-  <template scope="{ id, text }">
+  <template slot-scope="{ id, text }">
     <span>{{ id }} {{ text }}</span>
   </template>
 </my-component>

From ecea3c376be3576182f2a8e56e8cad8fd8fece66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sat, 16 Dec 2017 00:47:16 +0800
Subject: [PATCH 773/877] refactor: small code fix for hot-reload (#1079)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index f8ec00fe9..f16e5a830 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -413,7 +413,7 @@ module.exports = function (content) {
       output +=
         `    hotAPI.${
           functionalTemplate ? 'rerender' : 'reload'
-        }("${moduleId}", Component.options)\n' + '  }\n`
+        }("${moduleId}", Component.options)\n  }\n`
       // dispose
       output +=
         '  module.hot.dispose(function (data) {\n' +

From b5263494765251c029ecd81941d2aa7de3bb4350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sat, 16 Dec 2017 00:51:34 +0800
Subject: [PATCH 774/877] fix: avoid hash collision in prod by including both
 filepath and content (#1086)

---
 lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index f16e5a830..b33381757 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -82,7 +82,7 @@ module.exports = function (content) {
     process.cwd()
   const sourceRoot = path.dirname(path.relative(context, filePath))
   const shortFilePath = path.relative(context, filePath).replace(/^(\.\.[\\\/])+/, '')
-  const moduleId = 'data-v-' + hash(isProduction ? content : shortFilePath)
+  const moduleId = 'data-v-' + hash(isProduction ? (shortFilePath + '\n' + content) : shortFilePath)
 
   let cssLoaderOptions = ''
   const cssSourceMap =

From 7459a87651ed5591bb97e315a40beaf64024ed30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sat, 16 Dec 2017 01:04:54 +0800
Subject: [PATCH 775/877] fix: handle default export in custom blocks (#1081)

---
 lib/loader.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index b33381757..b452a7fdf 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -380,8 +380,11 @@ module.exports = function (content) {
 
         output +=
           'var customBlock = ' + requireString + '\n' +
-          'if (typeof customBlock === "function") {' +
-          '  customBlock(Component)' +
+          'if (customBlock && customBlock.__esModule) {\n' +
+          '  customBlock = customBlock.default\n' +
+          '}\n' +
+          'if (typeof customBlock === "function") {\n' +
+          '  customBlock(Component)\n' +
           '}\n'
       }
     })

From 86e0298f3ebe7a869e21be338248bd10353c33c7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 12:05:45 -0500
Subject: [PATCH 776/877] test: add test case for #1081 (custom block default
 export)

---
 test/fixtures/custom-blocks.vue |  6 ++++++
 test/mock-loaders/identity.js   |  3 +++
 test/test.js                    | 15 +++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 test/mock-loaders/identity.js

diff --git a/test/fixtures/custom-blocks.vue b/test/fixtures/custom-blocks.vue
index de3f1032c..8e7925aca 100644
--- a/test/fixtures/custom-blocks.vue
+++ b/test/fixtures/custom-blocks.vue
@@ -7,6 +7,12 @@ ja:
 
 <blog>## foo</blog>
 
+<esm>
+export default function (Component) {
+  Component.options.foo = 1
+}
+</esm>
+
 <template>
   <div>
     <h1>{{ msg }}</h1>
diff --git a/test/mock-loaders/identity.js b/test/mock-loaders/identity.js
new file mode 100644
index 000000000..1590b7f40
--- /dev/null
+++ b/test/mock-loaders/identity.js
@@ -0,0 +1,3 @@
+module.exports = function (source, map) {
+  this.callback(null, source, map)
+}
diff --git a/test/test.js b/test/test.js
index 4b41d25ff..4d7764532 100644
--- a/test/test.js
+++ b/test/test.js
@@ -782,6 +782,21 @@ describe('vue-loader', () => {
     })
   })
 
+  it('custom blocks with ES module default export', done => {
+    test({
+      entry: './test/fixtures/custom-blocks.vue',
+      vue: {
+        loaders: {
+          esm: require.resolve('./mock-loaders/identity')
+        }
+      }
+    }, (window, module) => {
+      // option added by custom block code
+      expect(module.foo).to.equal(1)
+      done()
+    })
+  })
+
   it('passes attributes as options to the loader', done => {
     bundle({
       entry: './test/fixtures/custom-options.vue',

From 4e7b0b99734199233160c175c3d1b1ae5f5c90c7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 12:27:03 -0500
Subject: [PATCH 777/877] 13.5.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 178e31e3e..dfdb8c03e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.5.0",
+  "version": "13.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 27a81ac24..dcd83c689 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.5.0",
+  "version": "13.5.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From e27a5ce9b98a2c1fe61c5f8f85eb51afb319c8f0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 15:03:42 -0500
Subject: [PATCH 778/877] feat: allow disabling auto postcss config loading via
 postcss.useConfigFile

close #654, close #800
---
 lib/style-compiler/load-postcss-config.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index 3cc5eccd3..1eac6fab0 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -7,6 +7,13 @@ function isObject (val) {
 }
 
 module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
+  if (inlineConfig.useConfigFile === false) {
+    return Promise.resolve({
+      plugins: inlineConfig.plugins || [],
+      options: inlineConfig.options || {}
+    })
+  }
+
   if (process.env.VUE_LOADER_TEST || !loaded) {
     const config = inlineConfig.config || {}
     const ctx = { webpack: loaderContext }

From 81a59ba3645fb7c9892f0591d397ab4a71186a59 Mon Sep 17 00:00:00 2001
From: Blake Newman <blake.newman@askattest.com>
Date: Fri, 15 Dec 2017 20:09:13 +0000
Subject: [PATCH 779/877] feat: normalize default loader for commonly known
 postcss langs (#1055)

If no postcss loader is provided in vue loader options then default to
vue-loader handling

This allows you to use vue internal postcss/css handling with known
postcss extensions

fixes: #942
fixes: #800
fixes: #654
---
 lib/loader.js                  | 10 ++++++++--
 test/fixtures/postcss-lang.vue |  6 ++++++
 test/test.js                   | 11 +++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/postcss-lang.vue

diff --git a/lib/loader.js b/lib/loader.js
index b452a7fdf..df66891b0 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -29,6 +29,10 @@ const defaultLang = {
   script: 'js'
 }
 
+const postcssExtensions = [
+  'postcss', 'pcss', 'sugarss', 'sss'
+]
+
 // When extracting parts from the source vue file, we want to apply the
 // loaders chained before vue-loader, but exclude some loaders that simply
 // produces side effects such as linting.
@@ -572,9 +576,11 @@ module.exports = function (content) {
           hasInlineConfig: !!query.postcss
         }) +
         '!'
-      // normalize scss/sass if no specific loaders have been provided
+      // normalize scss/sass/postcss if no specific loaders have been provided
       if (!loaders[lang]) {
-        if (lang === 'sass') {
+        if (postcssExtensions.indexOf(lang) !== -1) {
+          lang = 'css'
+        } else if (lang === 'sass') {
           lang = 'sass?indentedSyntax'
         } else if (lang === 'scss') {
           lang = 'sass'
diff --git a/test/fixtures/postcss-lang.vue b/test/fixtures/postcss-lang.vue
new file mode 100644
index 000000000..0f3255f1f
--- /dev/null
+++ b/test/fixtures/postcss-lang.vue
@@ -0,0 +1,6 @@
+<style lang="pcss">
+h1 {
+  color: red;
+  font-size: 14px
+}
+</style>
diff --git a/test/test.js b/test/test.js
index 4d7764532..e34fda9a9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -511,6 +511,17 @@ describe('vue-loader', () => {
     })
   })
 
+  it('postcss options', done => {
+    test({
+      entry: './test/fixtures/postcss-lang.vue'
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      done()
+    })
+  })
+
   it('transpile ES2015 features in template', done => {
     test({
       entry: './test/fixtures/es2015.vue'

From 2e2aa2bcc8d593e8b37de4ab17ffbfe63fb41983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sat, 16 Dec 2017 05:00:55 +0800
Subject: [PATCH 780/877] feat: support named exports (#1087)

close #1080
---
 lib/loader.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index df66891b0..01ff18201 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -273,8 +273,14 @@ module.exports = function (content) {
   if (script) {
     if (options.esModule) {
       output += script.src
-        ? getImportForImport('script', script)
-        : getImport('script', script) + '\n'
+        ? (
+            getNamedExportForImport('script', script) + '\n' +
+            getImportForImport('script', script)
+          )
+        : (
+            getNamedExport('script', script) + '\n' +
+            getImport('script', script)
+          ) + '\n'
     } else {
       output +=
         'var __vue_script__ = ' +
@@ -429,6 +435,7 @@ module.exports = function (content) {
         '  })\n'
       output += '})()}\n'
     }
+
     // final export
     if (options.esModule) {
       output += '\nexport default Component.exports\n'
@@ -461,6 +468,13 @@ module.exports = function (content) {
     )
   }
 
+  function getNamedExport (type, part, index, scoped) {
+    return (
+      'export * from ' +
+      getRequireString(type, part, index, scoped)
+    )
+  }
+
   function getRequireString (type, part, index, scoped) {
     return loaderUtils.stringifyRequest(
       loaderContext,
@@ -486,6 +500,13 @@ module.exports = function (content) {
     )
   }
 
+  function getNamedExportForImport (type, impt, scoped) {
+    return (
+      'export * from ' +
+      getRequireForImportString(type, impt, scoped)
+    )
+  }
+
   function getRequireForImportString (type, impt, scoped) {
     return loaderUtils.stringifyRequest(
       loaderContext,

From 8c4550fbe18e58e4aa85d83dd3d8c07534f35ae1 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 16:01:39 -0500
Subject: [PATCH 781/877] test: test case for named exports

---
 test/fixtures/named-exports.vue |  9 +++++++++
 test/test.js                    | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 test/fixtures/named-exports.vue

diff --git a/test/fixtures/named-exports.vue b/test/fixtures/named-exports.vue
new file mode 100644
index 000000000..fe873668a
--- /dev/null
+++ b/test/fixtures/named-exports.vue
@@ -0,0 +1,9 @@
+<script>
+export default {
+  name: 'named-exports'
+}
+
+export function foo () {
+  return 1
+}
+</script>
diff --git a/test/test.js b/test/test.js
index e34fda9a9..1164cb010 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1086,4 +1086,14 @@ describe('vue-loader', () => {
       done()
     })
   })
+
+  it('named exports', done => {
+    test({
+      entry: './test/fixtures/named-exports.vue'
+    }, (window, _, rawModule) => {
+      expect(rawModule.default.name).to.equal('named-exports')
+      expect(rawModule.foo()).to.equal(1)
+      done()
+    })
+  })
 })

From a25592628d39ea0700c2f62d8bcb43ded4649b04 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 16:21:01 -0500
Subject: [PATCH 782/877] remove unnecessary named exports check

---
 lib/loader.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 01ff18201..8720f7250 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -362,13 +362,6 @@ module.exports = function (content) {
     // add filename in dev
     output +=
       'Component.options.__file = ' + JSON.stringify(shortFilePath) + '\n'
-    // check named exports
-    output +=
-      'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +
-      '  return key !== "default" && key.substr(0, 2) !== "__"' +
-      '})) {' +
-      '  console.error("named exports are not supported in *.vue files.")' +
-      '}\n'
   }
 
   // add requires for customBlocks

From 2db8c0a07585812755ed52d2890e01462873a786 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 16:38:13 -0500
Subject: [PATCH 783/877] docs: update for 13.6.0

---
 docs/en/features/postcss.md | 27 ++++++++++++++++++++++++++-
 docs/en/options.md          |  9 +++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index eafeb1cea..bd53a1e51 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -4,7 +4,7 @@ Any CSS output processed by `vue-loader` is piped through [PostCSS](https://gith
 
 ## Using a Config File
 
-Starting in 11.0 `vue-loader` supports auto-loading the same PostCss config files supported by [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
+`vue-loader` supports auto-loading the same PostCss config files supported by [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
 
 - `postcss.config.js`
 - `.postcssrc`
@@ -12,6 +12,17 @@ Starting in 11.0 `vue-loader` supports auto-loading the same PostCss config file
 
 Using a config file allows you to share the same config between your normal CSS files processed by `postcss-loader` and the CSS inside `*.vue` files, and is recommended.
 
+## Using with `postcss-loader`
+
+Since `vue-loader` handles PostCSS on its styles internally, you only need to apply `postcss-loader` to standalone CSS files. There's no need to specify `lang="postcss"` on a style block if there is a PostCSS config file in your project.
+
+Sometimes the user may want to use `lang="postcss"` only for syntax highlighting purposes. Starting in 13.6.0, if no loader has been explicitly configured for the following common PostCSS extensions (via `vue-loader`'s own `loaders` option), they will simply go through `vue-loader`'s default PostCSS transforms:
+
+- `postcss`
+- `pcss`
+- `sugarss`
+- `sss`
+
 ## Inline Options
 
 Alternatively, you can specify postcss config specifically for `*.vue` files using the `postcss` option for `vue-loader`.
@@ -66,3 +77,17 @@ In addition to providing an Array of plugins, the `postcss` option also accepts:
     }
   }
   ```
+
+### Disabling Auto Config File Loading
+
+In `13.6.0+`, auto postcss config file loading can be disabled by specifying `postcss.useConfigFile: false`:
+
+``` js
+postcss: {
+  useConfigFile: false,
+  plugins: [/* ... */],
+  options: {/* ... */}
+}
+```
+
+This allows the postcss configuration inside `*.vue` files to be entirely controlled by the inline config.
diff --git a/docs/en/options.md b/docs/en/options.md
index 635ec0e95..986d21db6 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -137,6 +137,15 @@ module.exports = {
 
     Provide context to PostCSS plugins. See [postcss-loader docs](https://github.com/postcss/postcss-loader#context-ctx) for more details.
 
+### postcss.useConfigFile
+
+> New in 13.6.0
+
+- type: `boolean`
+- default: `true`
+
+  Set this to `false` to disable auto-loading of postcss config files.
+
 ### cssSourceMap
 
 - type: `boolean`

From c4671415016d02160826698597e9db8c129b50d7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 16:38:19 -0500
Subject: [PATCH 784/877] 13.6.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dfdb8c03e..ee67d2465 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.5.1",
+  "version": "13.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index dcd83c689..e2d11e1f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.5.1",
+  "version": "13.6.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From ebd66fe0bed7af6856bb7fafc2d0efc23c08811f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 15 Dec 2017 17:17:20 -0500
Subject: [PATCH 785/877] chore: readme

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8f6966d43..9704c3d96 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,9 @@
 
 > Vue.js component loader for [Webpack](https://webpack.js.org/).
 
-**NOTE: the master branch (9.0+) only works with Vue 2.x. For usage with Vue 1.x, see the [8.x branch](https://github.com/vuejs/vue-loader/tree/8.x).**
-
-It allows you to write your components in this format:
-
-![screenshot](http://blog.evanyou.me/images/vue-component.png)
+<p align="center">
+  <img width="809px" src="https://raw.githubusercontent.com/vuejs/vue-syntax-highlight/master/samples/screenshot.png">
+</p>
 
 The best way to get started is with [vue-cli](https://github.com/vuejs/vue-cli):
 

From 192428ce0def9fc8f886fcba3fdbcb5f95b70afc Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Tue, 19 Dec 2017 19:19:07 +0300
Subject: [PATCH 786/877] [RU] Translation update (#1096)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример

* options.md новая секция

* hot-reload.md новая секция

* testing-with-mocks.md новые правки

* postcss.md правки

* options.md новые правки
---
 docs/ru/features/postcss.md            | 27 +++++++++++++++++++++++++-
 docs/ru/options.md                     |  9 +++++++++
 docs/ru/workflow/testing-with-mocks.md | 10 +++++-----
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
index 7b20bd087..b84a22439 100644
--- a/docs/ru/features/postcss.md
+++ b/docs/ru/features/postcss.md
@@ -4,7 +4,7 @@
 
 ## Использование файла конфигурации
 
-Начиная с версии 11.0 `vue-loader` поддерживает файлы конфигурации PostCSS поддерживаемые с помощью [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
+`vue-loader` поддерживает файлы конфигурации PostCSS поддерживаемые с помощью [`postcss-loader`](https://github.com/postcss/postcss-loader#usage):
 
 - `postcss.config.js`
 - `.postcssrc`
@@ -12,6 +12,17 @@
 
 Рекомендуется использовать файл конфигурации, это позволяет использовать один и тот же конфиг для обработки ваших CSS файлов, обрабатываемых `postcss-loader` и CSS внутри `*.vue` файлов.
 
+## Использование с `postcss-loader`
+
+Поскольку `vue-loader` обрабатывает PostCSS внутри стилей своими силами, вам может потребоваться только применить `postcss-loader` к отдельным CSS-файлам. Нет необходимости указывать `lang="postcss"` в блоке стилей, если в вашем проекте есть конфигурационный файл PostCSS.
+
+Иногда пользователь может захотеть использовать `lang="postcss"` только для целей подсветки синтаксиса. Начиная с версии 13.6.0, если никакой загрузчик не был явно настроен для частоиспользуемых расширений PostCSS (через собственную опцию `loaders` у `vue-loader`), они будут просто подвержены стандартной трансформации PostCSS в `vue-loader`:
+
+- `postcss`
+- `pcss`
+- `sugarss`
+- `sss`
+
 ## Указание настроек в опциях vue-loader
 
 В качестве альтернативы, вы можете указать конфигурацию PostCSS специально для `*.vue` файлов с помощью опции `postcss` для `vue-loader`.
@@ -66,3 +77,17 @@ module.exports = {
     }
   }
   ```
+
+### Отключение автозагрузки файла конфигурации
+
+С версии `13.6.0+`, автозагрузку файла конфигурации postcss можно отключить с помощью опции `postcss.useConfigFile: false`:
+
+``` js
+postcss: {
+  useConfigFile: false,
+  plugins: [/* ... */],
+  options: {/* ... */}
+}
+```
+
+Это позволяет конфигурации postcss внутри файлов `*.vue` быть полностью конфигурируемой через inline-конфигурацию.
\ No newline at end of file
diff --git a/docs/ru/options.md b/docs/ru/options.md
index 6e57a70e7..15ba137e9 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -137,6 +137,15 @@ module.exports = {
 
     Предоставляет контекст для плагинов PostCSS. См. подробнее в [документации postcss-loader](https://github.com/postcss/postcss-loader#context-ctx).
 
+### postcss.useConfigFile
+
+> Добавлено в версии 13.6.0
+
+- Тип: `boolean`
+- По умолчанию: `true`
+
+  Установка в значение `false` отключает автозагрузку файла конфигурации postcss.
+
 ### cssSourceMap
 
 - Тип: `boolean`
diff --git a/docs/ru/workflow/testing-with-mocks.md b/docs/ru/workflow/testing-with-mocks.md
index 57b4e6cd5..2f5fc299b 100644
--- a/docs/ru/workflow/testing-with-mocks.md
+++ b/docs/ru/workflow/testing-with-mocks.md
@@ -6,6 +6,8 @@
 
 `vue-loader` предоставляет возможность внедрять произвольные зависимости в `*.vue` компоненты, используя [inject-loader](https://github.com/plasticine/inject-loader). Основная идея состоит в том, что вместо прямой подгрузки модуля компонента мы используем `inject-loader`, чтобы создать "фабричную функцию" для этого модуля. Когда мы вызовем эту функцию с мок-объектом, она вернет нам экземпляр модуля с внедренными мок-объектами.
 
+> Примечание: Вы должны отключить опцию `esModule` в режиме инжектирования, иначе вы получите ошибку.
+
 Допустим, у нас есть следующий компонент:
 
 ``` html
@@ -16,9 +18,9 @@
 
 <script>
 // эту зависимость нужно подменить мок-объектом
-import SomeService from '../service'
+const SomeService = require('../service')
 
-export default {
+module.exports = {
   data () {
     return {
       msg: SomeService.msg
@@ -30,10 +32,8 @@ export default {
 
 Вот как получить его с мок-объектами:
 
-> Заметка: inject-loader@3.x еще не в стабильной версии
-
 ``` bash
-npm install inject-loader@^2.0.0 --save-dev
+npm install inject-loader --save-dev
 ```
 
 ``` js

From aaf724d60f8d47e850d79872f6242b01f9f259d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Wed, 20 Dec 2017 00:20:36 +0800
Subject: [PATCH 787/877] [docs] postcss -> PostCSS & some formattings (#1098)

---
 docs/en/configurations/advanced.md    | 8 ++++----
 docs/en/features/postcss.md           | 8 ++++----
 docs/en/options.md                    | 4 ++--
 docs/ja/configurations/advanced.md    | 8 ++++----
 docs/ja/features/postcss.md           | 4 ++--
 docs/ja/options.md                    | 2 +-
 docs/kr/configurations/advanced.md    | 6 +++---
 docs/kr/features/postcss.md           | 4 ++--
 docs/kr/options.md                    | 2 +-
 docs/pt_BR/configurations/advanced.md | 8 ++++----
 docs/pt_BR/features/postcss.md        | 4 ++--
 docs/pt_BR/options.md                 | 2 +-
 docs/ru/configurations/advanced.md    | 6 +++---
 docs/ru/features/postcss.md           | 2 +-
 docs/zh-cn/configurations/advanced.md | 4 ++--
 docs/zh-cn/options.md                 | 2 +-
 16 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 8bdea8b4f..8574fee44 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -25,8 +25,8 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders` will overwrite the default loaders.
-          // The following config will cause all <script> tags without "lang"
-          // attribute to be loaded with coffee-loader
+          // The following config will cause all `<script>` tags without `lang`
+          // attribute to be loaded with `coffee-loader`
           loaders: {
             js: 'coffee-loader'
           },
@@ -43,8 +43,8 @@ module.exports = {
           // - For `html`, the result returned by the default loader
           //   will be compiled JavaScript render function code.
           //
-          // - For `css`, the result will be returned by vue-style-loader
-          //   which isn't particularly useful in most cases. Using a postcss
+          // - For `css`, the result will be returned by `vue-style-loader`
+          //   which isn't particularly useful in most cases. Using a PostCSS
           //   plugin will be a better option.
           postLoaders: {
             html: 'babel-loader'
diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index bd53a1e51..021471af0 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -25,7 +25,7 @@ Sometimes the user may want to use `lang="postcss"` only for syntax highlighting
 
 ## Inline Options
 
-Alternatively, you can specify postcss config specifically for `*.vue` files using the `postcss` option for `vue-loader`.
+Alternatively, you can specify PostCSS config specifically for `*.vue` files using the `postcss` option for `vue-loader`.
 
 Example usage in webpack 1.x:
 
@@ -34,7 +34,7 @@ Example usage in webpack 1.x:
 module.exports = {
   // other configs...
   vue: {
-    // use custom postcss plugins
+    // use custom PostCSS plugins
     postcss: [require('postcss-cssnext')()]
   }
 }
@@ -80,7 +80,7 @@ In addition to providing an Array of plugins, the `postcss` option also accepts:
 
 ### Disabling Auto Config File Loading
 
-In `13.6.0+`, auto postcss config file loading can be disabled by specifying `postcss.useConfigFile: false`:
+In `13.6.0+`, auto PostCSS config file loading can be disabled by specifying `postcss.useConfigFile: false`:
 
 ``` js
 postcss: {
@@ -90,4 +90,4 @@ postcss: {
 }
 ```
 
-This allows the postcss configuration inside `*.vue` files to be entirely controlled by the inline config.
+This allows the PostCSS configuration inside `*.vue` files to be entirely controlled by the inline config.
diff --git a/docs/en/options.md b/docs/en/options.md
index 986d21db6..681417dda 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -77,7 +77,7 @@ module.exports = {
 
   - For `html`, the result returned by the default loader will be compiled JavaScript render function code.
 
-  - For `css`, the result will be returned by `vue-style-loader` which isn't particularly useful in most cases. Using a postcss plugin will be a better option.
+  - For `css`, the result will be returned by `vue-style-loader` which isn't particularly useful in most cases. Using a PostCSS plugin will be a better option.
 
 ### postcss
 
@@ -144,7 +144,7 @@ module.exports = {
 - type: `boolean`
 - default: `true`
 
-  Set this to `false` to disable auto-loading of postcss config files.
+  Set this to `false` to disable auto-loading of PostCSS config files.
 
 ### cssSourceMap
 
diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index ed4e179ed..ec447a521 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -23,8 +23,8 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders` はデフォルトの loaderを上書きします。
-          // 次の設定では、"lang" 属性のない全ての <script> タグに
-          // coffee-loader が適用されます。
+          // 次の設定では、`lang` 属性のない全ての `<script>` タグに
+          // `coffee-loader` が適用されます。
           loaders: {
             js: 'coffee-loader'
           },
@@ -41,9 +41,9 @@ module.exports = {
           // - `html` の場合、デフォルトの loader によって返される結果は、
           //   コンパイルされた JavaScript レンダリング関数コードになります。
           //
-          // - `css` の場合、結果は vue-style-loader によって返されます。
+          // - `css` の場合、結果は `vue-style-loader` によって返されます。
           //   しかしこれはほとんどの場合特に有用ではありません。
-          //   postcss プラグインを使用する方が良い選択になります。
+          //   PostCSS プラグインを使用する方が良い選択になります。
           postLoaders: {
             html: 'babel-loader'
           },
diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
index c0dfe3124..7a82d8367 100644
--- a/docs/ja/features/postcss.md
+++ b/docs/ja/features/postcss.md
@@ -14,7 +14,7 @@
 
 ## インラインオプション
 
-あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の postcss の設定を指定することが出来ます。
+あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の PostCSS の設定を指定することが出来ます。
 
 webpack 1.x の例:
 
@@ -23,7 +23,7 @@ webpack 1.x の例:
 module.exports = {
   // 他の設定
   vue: {
-    // カスタムされた postcss プラグインを使用します
+    // カスタムされた PostCSS プラグインを使用します
     postcss: [require('postcss-cssnext')()]
   }
 }
diff --git a/docs/ja/options.md b/docs/ja/options.md
index c8960ee8a..791c5487f 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -76,7 +76,7 @@ module.exports = {
   config 形式は `loaders` と同じですが、` postLoaders` はデフォルト loader の後に適用されます。これを使用して言語ブロックを後処理することができます。ただしこれは少し複雑になります:
 
   - `html` の場合、デフォルトの loader によって返される結果は、コンパイルされた JavaScript レンダリング関数コードになります。
-  - `css` の場合、結果は` vue-style-loader` によって返されます。これはほとんどの場合特に有用ではありません。postcss プラグインを使用する方が良いでしょう。
+  - `css` の場合、結果は` vue-style-loader` によって返されます。これはほとんどの場合特に有用ではありません。PostCSS プラグインを使用する方が良いでしょう。
 
 ### postcss
 
diff --git a/docs/kr/configurations/advanced.md b/docs/kr/configurations/advanced.md
index 4debf1be1..c31c5cffc 100644
--- a/docs/kr/configurations/advanced.md
+++ b/docs/kr/configurations/advanced.md
@@ -25,8 +25,8 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders`는 기본 로더를 덮어씁니다.
-          // 다음 설정은 "lang" 속성이 없는
-          // 모든 <script> 태그가 coffee 로더와 함께 로드되도록 합니다
+          // 다음 설정은 `lang` 속성이 없는
+          // 모든 `<script>` 태그가 coffee 로더와 함께 로드되도록 합니다
           loaders: {
             js: 'coffee-loader'
           },
@@ -42,7 +42,7 @@ module.exports = {
           // - `html`의 경우, 기본 로더의 결과는 컴파일 된 JavaScript 렌더링 함수 코드가 됩니다.
 
           //  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고
-          // 대부분의 경우 별로 사용할 일은 없습니다. postcss 플러그인을 사용하는 것이 더 좋습니다.
+          // 대부분의 경우 별로 사용할 일은 없습니다. PostCSS 플러그인을 사용하는 것이 더 좋습니다.
           postLoaders: {
             html: 'babel-loader'
           },
diff --git a/docs/kr/features/postcss.md b/docs/kr/features/postcss.md
index 9c6678d7f..3ea5b9e10 100644
--- a/docs/kr/features/postcss.md
+++ b/docs/kr/features/postcss.md
@@ -14,7 +14,7 @@
 
 ## 인라인 옵션
 
-또는 `vue-loader`에 `postcss` 옵션을 사용해 `*.vue`파일을 위해 postcss 설정을 지정할 수 있습니다.
+또는 `vue-loader`에 `postcss` 옵션을 사용해 `*.vue`파일을 위해 PostCSS 설정을 지정할 수 있습니다.
 
 webpack 1버전 예제:
 
@@ -23,7 +23,7 @@ webpack 1버전 예제:
 module.exports = {
   // 기타 설정...
   vue: {
-    // 사용자 정의 postcss 플러그인 사용
+    // 사용자 정의 PostCSS 플러그인 사용
     postcss: [require('postcss-cssnext')()]
   }
 }
diff --git a/docs/kr/options.md b/docs/kr/options.md
index 304ec19cc..98da0484b 100644
--- a/docs/kr/options.md
+++ b/docs/kr/options.md
@@ -78,7 +78,7 @@ module: {
 
   - `html`의 경우, 기본 로더의 결과는 컴파일 된 JavaScript 렌더링 함수 코드가 됩니다.
 
-  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고 대부분의 경우 별로 사용할 일은 없습니다. postcss 플러그인을 사용하는 것이 더 좋습니다.
+  - `css`의 경우, 결과는 `vue-style-loader`가 반환하고 대부분의 경우 별로 사용할 일은 없습니다. PostCSS 플러그인을 사용하는 것이 더 좋습니다.
 
 
 ### postcss
diff --git a/docs/pt_BR/configurations/advanced.md b/docs/pt_BR/configurations/advanced.md
index 33d8ffc71..629561d3e 100644
--- a/docs/pt_BR/configurations/advanced.md
+++ b/docs/pt_BR/configurations/advanced.md
@@ -26,8 +26,8 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders` substituirá os carregadores padrões.
-          // A configuração a seguir fará com que todas as tags <script> sem
-          // o atributo "lang" sejam carrega com coffee-loader
+          // A configuração a seguir fará com que todas as tags `<script>` sem
+          // o atributo `lang` sejam carrega com `coffee-loader`
           loaders: {
             js: 'coffee-loader'
           },
@@ -44,9 +44,9 @@ module.exports = {
           // - Para `html`, o resultado retornado pelo carregador padrão
           //   será compilado em código de função de renderização JavaScript.
           //
-          // - Para `css`, o resultado será retornado por vue-style-loader
+          // - Para `css`, o resultado será retornado por `vue-style-loader`
           //   que não é particulamente útil em muitos casos. Usando um plugin
-          //   postcss será uma opção melhor.
+          //   PostCSS será uma opção melhor.
           postLoaders: {
             html: 'babel-loader'
           },
diff --git a/docs/pt_BR/features/postcss.md b/docs/pt_BR/features/postcss.md
index 798e500c9..da5e8d9ec 100644
--- a/docs/pt_BR/features/postcss.md
+++ b/docs/pt_BR/features/postcss.md
@@ -14,7 +14,7 @@ O uso de um arquivo de configuração permite que você compartilhe a mesma conf
 
 ## Opções em Linha
 
-Como alternativa, você pode especificar configurações postcss especificamente para arquivos `*.vue` usando a opção `postcss` para `vue-loader`.
+Como alternativa, você pode especificar configurações PostCSS especificamente para arquivos `*.vue` usando a opção `postcss` para `vue-loader`.
 
 Exemplo de uso no webpack 1.x:
 
@@ -23,7 +23,7 @@ Exemplo de uso no webpack 1.x:
 module.exports = {
   // outras configurações...
   vue: {
-    // use plugins personalizado de postcss
+    // use plugins personalizado de PostCSS
     postcss: [require('postcss-cssnext')()]
   }
 }
diff --git a/docs/pt_BR/options.md b/docs/pt_BR/options.md
index 0ca6037c8..9c04e7334 100644
--- a/docs/pt_BR/options.md
+++ b/docs/pt_BR/options.md
@@ -75,7 +75,7 @@ module.exports = {
 
   - Para `html`, o resultado retornado pelo carregador padrão será compilado em código de função de renderização JavaScript.
 
-  - Para `css`, o resultado será retornado por `vue-style-loader` que não é particularmente útil na maioria dos casos. Usando um plugin postcss será uma opção melhor.
+  - Para `css`, o resultado será retornado por `vue-style-loader` que não é particularmente útil na maioria dos casos. Usando um plugin PostCSS será uma opção melhor.
 
 ### postcss
 
diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
index 8a529af20..c61d81db5 100644
--- a/docs/ru/configurations/advanced.md
+++ b/docs/ru/configurations/advanced.md
@@ -25,8 +25,8 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // указанные `loaders` переопределят загрузчики используемые по умолчанию
-          // Конфигурация ниже будет обрабатывать все теги <script> без атрибута "lang"
-          // с помощью coffee-loader
+          // Конфигурация ниже будет обрабатывать все теги `<script>` без атрибута `lang`
+          // с помощью `coffee-loader`
           loaders: {
             js: 'coffee-loader'
           },
@@ -43,7 +43,7 @@ module.exports = {
           // - Для `html`, результат возвращаемый стандартным загрузчиком
           //   будет скомпилированный в JavaScript код render-функции.
           //
-          // - Для `css`, результат возвращаемый из vue-style-loader
+          // - Для `css`, результат возвращаемый из `vue-style-loader`
           //   что не является особенно полезным в большинстве случаев.
           //   Использование postcss-плагина будет лучшим вариантом.
           postLoaders: {
diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
index b84a22439..c29d5bda9 100644
--- a/docs/ru/features/postcss.md
+++ b/docs/ru/features/postcss.md
@@ -34,7 +34,7 @@
 module.exports = {
   // другие настройки...
   vue: {
-    // использование плагинов postcss
+    // использование плагинов PostCSS
     postcss: [require('postcss-cssnext')()]
   }
 }
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index 598d0df62..099529079 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -25,7 +25,7 @@ module.exports = {
         loader: 'vue-loader',
         options: {
           // `loaders` 覆盖默认 loaders。
-          // 以下配置会导致所有无 "lang" 特性的 <script> 标签加载 coffee-loader
+          // 以下配置会导致所有无 `lang` 特性的 `<script>` 标签加载 `coffee-loader`
           loaders: {
             js: 'coffee-loader'
           },
@@ -40,7 +40,7 @@ module.exports = {
           //
           // - 对于 `html`, 默认 loader 返回会编译为 JavaScript 渲染函数
           //
-          // - 对于 `css`, 由`vue-style-loader` 返回的结果通常不太有用。使用 postcss 插件将会是更好的选择。
+          // - 对于 `css`, 由`vue-style-loader` 返回的结果通常不太有用。使用 PostCSS 插件将会是更好的选择。
           postLoaders: {
             html: 'babel-loader'
           }
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 6bbcdbea1..53bca65c7 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -77,7 +77,7 @@ module.exports = {
 
   - 对于 `html`，默认 loader 返回结果会被编译为 JavaScript 渲染函数。
 
-  - 对于 `css`，由`vue-style-loader` 返回的结果通常不太有用。使用 postcss 插件将会是更好的选择。
+  - 对于 `css`，由`vue-style-loader` 返回的结果通常不太有用。使用 PostCSS 插件将会是更好的选择。
 
 ### postcss
 

From cdbf8a81a404488303a6c0ffe7a9a24738a3ce48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Fri, 22 Dec 2017 08:29:26 +0800
Subject: [PATCH 788/877] [docs][zh-cn] synced updates (#1097)

* [zh-cn] Webpack -> webpack and refined testing.md

* [docs][zh-cn] synced updates from #cda4973 to #ebd66fe

* Update postcss.md

* Update testing.md
---
 docs/zh-cn/README.md                        | 20 ++++++-------
 docs/zh-cn/configurations/advanced.md       |  4 +--
 docs/zh-cn/configurations/asset-url.md      |  4 +--
 docs/zh-cn/configurations/custom-blocks.md  |  2 +-
 docs/zh-cn/configurations/extract-css.md    |  4 +--
 docs/zh-cn/configurations/pre-processors.md |  8 ++---
 docs/zh-cn/features/es2015.md               |  2 +-
 docs/zh-cn/features/postcss.md              | 33 ++++++++++++++++++---
 docs/zh-cn/options.md                       | 23 +++++++++-----
 docs/zh-cn/start/spec.md                    |  6 ++--
 docs/zh-cn/workflow/linting.md              |  6 ++--
 docs/zh-cn/workflow/production.md           |  2 +-
 docs/zh-cn/workflow/testing-with-mocks.md   | 10 +++----
 docs/zh-cn/workflow/testing.md              |  8 ++---
 14 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index be23ad2a6..dbae15b1e 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -2,32 +2,32 @@
 
 ### `vue-loader` 是什么？
 
-`vue-loader` 是一个 Webpack 的 loader，可以将用下面这个格式编写的 Vue 组件转换为 JavaScript 模块：
+`vue-loader` 是一个 webpack 的 loader，可以将用下面这个格式编写的 Vue 组件转换为 JavaScript 模块：
 
 ![screenshot](http://blog.evanyou.me/images/vue-component.png)
 
 这里有一些 `vue-loader` 提供的很酷的特性：
 
 - 默认支持 ES2015；
-- 允许对 Vue 组件的组成部分使用其它 Webpack loader，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
+- 允许对 Vue 组件的组成部分使用其它 webpack loader，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
 - `.vue` 文件中允许自定义节点，然后使用自定义的 loader 进行处理；
-- 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 Webpack loader 进行处理；
+- 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 webpack loader 进行处理；
 - 对每个组件模拟出 CSS 作用域；
 - 支持开发期组件的热重载。
 
-简而言之，编写 Vue.js 应用程序时，组合使用 Webpack 和 `vue-loader` 能带来一个现代，灵活并且非常强大的前端工作流程。
+简而言之，编写 Vue.js 应用程序时，组合使用 webpack 和 `vue-loader` 能带来一个现代，灵活并且非常强大的前端工作流程。
 
-### Webpack 是什么?
+### webpack 是什么?
 
-如果你已经熟悉了 Webpack，随时可以跳过下面的说明。如果你没有使用过 Webpack，下面是一个快速介绍：
+如果你已经熟悉了 webpack，随时可以跳过下面的说明。如果你没有使用过 webpack，下面是一个快速介绍：
 
-[Webpack](https://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出它们的依赖关系，将它们打包为可部署的静态资源。
+[webpack](https://webpack.github.io/) 是一个模块打包工具。它将一堆文件中的每个文件都作为一个模块，找出它们的依赖关系，将它们打包为可部署的静态资源。
 
 ![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
-一个基本的例子，想像我们有一些 CommonJS 模块，它们不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过 `<script>` 标签加载。Webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
+一个基本的例子，想像我们有一些 CommonJS 模块，它们不能直接在浏览器中运行，所以我们需要打包成一个文件，这样就可以通过 `<script>` 标签加载。webpack 可以遵循 `require()` 调用的依赖关系，为我们完成这些工作。
 
-但是 Webpack 可以做的不止这些。通过“loader”，我们可以配置 Webpack 以任何方式去转换所有类型的文件。包括以下例子：
+但是 webpack 可以做的不止这些。通过“loader”，我们可以配置 webpack 以任何方式去转换所有类型的文件。包括以下例子：
 
 - 转换 ES2015，CoffeeScript 或者 TypeScript 模块为普通的 ES5 CommonJS 模块；
 - 可以选择在编译之前检验你的源代码；
@@ -35,4 +35,4 @@
 - 将 SASS 文件转换为纯 CSS，然后将其转换成 JavaScript 片段，将生成的 CSS 作为 `<style>` 标签插入页面；
 - 处理 HTML 或者 CSS 中引用的图片，移动到配置的路径中，并且使用 md5 hash 重命名。
 
-当你理解 Webpack 原理后会感觉它是如此强大，它可以大大优化你的前端工作流程。它主要的缺点是配置复杂麻烦，但是使用本指南，应该可以帮助你找到 Vue.js 和 `vue-loader` 使用时的最常见问题的解决方案。
+当你理解 webpack 原理后会感觉它是如此强大，它可以大大优化你的前端工作流程。它主要的缺点是配置复杂麻烦，但是使用本指南，应该可以帮助你找到 Vue.js 和 `vue-loader` 使用时的最常见问题的解决方案。
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index 099529079..04e5c1ab0 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -12,7 +12,7 @@
 
 > 注意 `preLoaders` 和 `postLoaders` 只在 10.3.0+ 版本支持
 
-### Webpack 2.x
+### webpack 2.x
 
 ``` js
 module.exports = {
@@ -54,7 +54,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` js
 // webpack.config.js
diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index 195731385..ec498cdd1 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -14,10 +14,10 @@
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
-因为 `.png` 不是一个 JavaScript 文件，你需要配置 Webpack 使用 [file-loader](https://github.com/webpack/file-loader) 或者 [url-loader](https://github.com/webpack/url-loader) 去处理它们。`vue-cli` 脚手器工具已经为你配置好了。
+因为 `.png` 不是一个 JavaScript 文件，你需要配置 webpack 使用 [file-loader](https://github.com/webpack/file-loader) 或者 [url-loader](https://github.com/webpack/url-loader) 去处理它们。`vue-cli` 脚手器工具已经为你配置好了。
 
 使用它们的好处：
 
-1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，Webpack 将会在打包输出中自动重写文件路径为正确的URL。
+1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，webpack 将会在打包输出中自动重写文件路径为正确的URL。
 
 2. `url-loader` 允许你有条件将文件转换为内联的 base-64 URL (当文件小于给定的阈值)，这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index b80fecf48..2273f3367 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -42,7 +42,7 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// Webpack 2.x
+// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/zh-cn/configurations/extract-css.md b/docs/zh-cn/configurations/extract-css.md
index 531360816..b0d0aa38d 100644
--- a/docs/zh-cn/configurations/extract-css.md
+++ b/docs/zh-cn/configurations/extract-css.md
@@ -39,7 +39,7 @@ module.exports = {
 
 将所有 Vue 组件中的所有已处理的 CSS 提取为单个 CSS 文件配置示例：
 
-### Webpack 2.x
+### webpack 2.x
 
 
 ``` js
@@ -70,7 +70,7 @@ module.exports = {
 }
 ```
 
-### Webpack 1.x
+### webpack 1.x
 
 ``` bash
 npm install extract-text-webpack-plugin --save-dev
diff --git a/docs/zh-cn/configurations/pre-processors.md b/docs/zh-cn/configurations/pre-processors.md
index 65e6a50b7..0f40ea0e8 100644
--- a/docs/zh-cn/configurations/pre-processors.md
+++ b/docs/zh-cn/configurations/pre-processors.md
@@ -1,6 +1,6 @@
 # 使用预处理器
 
-在 Webpack 中，所有的预处理器需要匹配对应的 loader。`vue-loader` 允许你使用其它 Webpack loader 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loader。
+在 webpack 中，所有的预处理器需要匹配对应的 loader。`vue-loader` 允许你使用其它 webpack loader 处理 Vue 组件的某一部分。它会根据 `lang` 属性自动推断出要使用的 loader。
 
 ### CSS
 
@@ -87,7 +87,7 @@ npm install coffee-loader --save-dev
 
 ### 模版
 
-模版的处理方式略有不同，因为大多数 Webpack 模版处理器 (比如 `pug-loader`) 会返回模版处理函数，而不是编译的 HTML 字符串，我们使用原始的 `pug` 替代 `pug-loader`：
+模版的处理方式略有不同，因为大多数 webpack 模版处理器 (比如 `pug-loader`) 会返回模版处理函数，而不是编译的 HTML 字符串，我们使用原始的 `pug` 替代 `pug-loader`：
 
 ``` bash
 npm install pug --save-dev
@@ -104,7 +104,7 @@ div
 
 ### 行内 Loader Requests
 
-你可以在 `lang` 属性中使用 [Webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction)：
+你可以在 `lang` 属性中使用 [webpack loader requests](https://webpack.github.io/docs/loaders.html#introduction)：
 
 ``` html
 <style lang="sass?outputStyle=expanded">
@@ -112,4 +112,4 @@ div
 </style>
 ```
 
-但是，这使你的 Vue 组件只适用于 Webpack，不能与 Browserify 和 [vueify](https://github.com/vuejs/vueify) 一同使用。**如果你打算将你的 Vue 组件作为可重复使用的第三方组件，请避免使用这个语法。**
+但是，这使你的 Vue 组件只适用于 webpack，不能与 Browserify 和 [vueify](https://github.com/vuejs/vueify) 一同使用。**如果你打算将你的 Vue 组件作为可重复使用的第三方组件，请避免使用这个语法。**
diff --git a/docs/zh-cn/features/es2015.md b/docs/zh-cn/features/es2015.md
index a85fdd7d1..9dee83231 100644
--- a/docs/zh-cn/features/es2015.md
+++ b/docs/zh-cn/features/es2015.md
@@ -58,7 +58,7 @@ export default {
 
 ### 转换普通 `.js` 文件
 
-由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 Webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 Webpack 中配置 `babel-loader` 或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
+由于 `vue-loader` 只处理 `.vue` 文件，你需要告诉 webpack 如何使用 `babel-loader` 或者 `buble-loader` 处理普通 `.js` 文件，在 webpack 中配置 `babel-loader` 或者 `buble-loader`。脚手架工具 `vue-cli` 已经为你做了这些。
 
 ### 使用 `.babelrc` 配置 Babel
 
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
index bc63415e0..4f1a8c3e3 100644
--- a/docs/zh-cn/features/postcss.md
+++ b/docs/zh-cn/features/postcss.md
@@ -4,7 +4,7 @@
 
 ## 使用配置文件
 
-`vue-loader` 从 11.0 版本开始支持通过 [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) 自动加载同一个配置文件：
+`vue-loader` 支持通过 [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) 自动加载同一个配置文件：
 
 - `postcss.config.js`
 - `.postcssrc`
@@ -12,24 +12,35 @@
 
 使用配置文件允许你在由 `postcss-loader` 处理的普通CSS文件和 `*.vue` 文件中的 CSS 之间共享相同的配置，这是推荐的做法。
 
+## 配合 `postcss-loader` 使用
+
+因为 `vue-loader` 内部通过 PostCSS 处理其样式，你只需要对标准的 CSS 文件应用 `postcss-loader` 即可。即便你的工程中存在 PostCSS 配置文件，也无需在样式块上指定 `lang="postcss"`。
+
+有时用户可能只是出于语法高亮的目的使用 `lang="postcss"`。从 13.6.0 开始，如果没有 loader (通过 `vue-loader` 自身的 `loaders` 选项) 显式配置下列 PostCSS 扩展，则它们只会简单的进行 `vue-loader` 的默认 PostCSS 转换：
+
+- `postcss`
+- `pcss`
+- `sugarss`
+- `sss`
+
 ## 内联选项
 
 或者，你可以使用 `vue-loader` 的 `postcss` 选项来为 `.vue` 文件指定配置。
 
-Webpack 1.x 例子：
+webpack 1.x 例子：
 
 ``` js
 // webpack.config.js
 module.exports = {
   // 其它配置……
   vue: {
-    // 使用自定义 postcss 插件
+    // 使用自定义 PostCSS 插件
     postcss: [require('postcss-cssnext')()]
   }
 }
 ```
 
-Webpack 2.x 例子：
+webpack 2.x 例子：
 
 ``` js
 // webpack.config.js
@@ -66,3 +77,17 @@ module.exports = {
     }
   }
   ```
+
+### 禁止自动加载配置文件
+
+在 13.6.0+ 版本中，自动加载 PostCSS 配置文件可以通过指定 `postcss.useConfigFile: false` 来禁用：
+
+``` js
+postcss: {
+  useConfigFile: false,
+  plugins: [/* ... */],
+  options: {/* ... */}
+}
+```
+
+这样做会使得 `*.vue` 文件内部的 PostCSS 配置完全由内联配置所控制。
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 53bca65c7..189a76f1d 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -1,8 +1,8 @@
 # 选项参考
 
-## Webpack 1 和 2 之间的使用差异
+## webpack 1 和 2 之间的使用差异
 
-Webpack 2：配置直接放到 loader rule 中。
+webpack 2：配置直接放到 loader rule 中。
 
 ``` js
 module.exports = {
@@ -21,7 +21,7 @@ module.exports = {
 }
 ```
 
-Webpack 1.x：在 Webpack 配置中添加根节点 `vue` 块。
+webpack 1.x：在 webpack 配置中添加根节点 `vue` 块。
 
 ``` js
 module.exports = {
@@ -36,7 +36,7 @@ module.exports = {
 
 - 类型：`{ [lang: string]: string }`
 
-  指定 Webpack loader 对象覆盖用于 `*.vue` 文件内的语言块的默认 loader。如果指定，该键对应于语言块的 `lang` 属性。每种类型的默认 `lang` 是：
+  指定 webpack loader 对象覆盖用于 `*.vue` 文件内的语言块的默认 loader。如果指定，该键对应于语言块的 `lang` 属性。每种类型的默认 `lang` 是：
 
   - `<template>`: `html`
   - `<script>`: `js`
@@ -45,7 +45,7 @@ module.exports = {
   例如，使用 `babel-loader` 和 `eslint-loader` 处理所有的 `<script>` 块：
 
   ``` js
-  // Webpack 2.x config
+  // webpack 2.x config
   module: {
     rules: [
       {
@@ -138,6 +138,15 @@ module.exports = {
 
     向 PostCSS 插件提供上下文。详见 [postcss-loader 文档](https://github.com/postcss/postcss-loader#context-ctx)。
 
+### postcss.useConfigFile
+
+> 13.6.0 新增
+
+- 类型：`boolean`
+- 默认值：`true`
+
+  设为 `false` 之后可以禁止自动加载 PostCSS 配置文件。
+
 ### cssSourceMap
 
 - 类型: `Boolean`
@@ -145,7 +154,7 @@ module.exports = {
 
   是否开启 CSS 的 source maps，关闭可以避免 `css-loader` 的 some relative path related bugs 同时可以加快构建速度。
 
-  注意，这个值会在 Webpack 配置中没有 `devtool` 的情况下自动设置为 `false`。
+  注意，这个值会在 webpack 配置中没有 `devtool` 的情况下自动设置为 `false`。
 
 ### esModule
 
@@ -182,7 +191,7 @@ module.exports = {
 - 类型: `{ [tag: string]: string | Array<string> }`
 - 默认值: `{ img: 'src', image: 'xlink:href' }`
 
-  在模版编译过程中，编译器可以将某些属性，如 `src` 路径，转换为 `require` 调用，以便目标资源可以由 Webpack 处理。默认配置会转换 `<img>` 标签上的 `src` 属性和 SVG 的 `<image>` 标签上的 `xlink：href` 属性。
+  在模版编译过程中，编译器可以将某些属性，如 `src` 路径，转换为 `require` 调用，以便目标资源可以由 webpack 处理。默认配置会转换 `<img>` 标签上的 `src` 属性和 SVG 的 `<image>` 标签上的 `xlink：href` 属性。
 
 ### buble
 
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 4bbd5e4f5..e915fe0cc 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -56,7 +56,7 @@ export default {
 
 - 每个 `.vue` 文件最多包含一个 `<script>` 块。
 
-- 该脚本在类 CommonJS 环境中执行 (就像通过 Webpack 打包的正常 js 模块)，这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
+- 该脚本在类 CommonJS 环境中执行 (就像通过 webpack 打包的正常 js 模块)，这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
 
 - 脚本必须导出 Vue.js 组件对象。也可以导出由 `Vue.extend()` 创建的扩展对象，但是普通对象是更好的选择。
 
@@ -68,13 +68,13 @@ export default {
 
 - `<style>` 标签可以有 `scoped` 或者 `module` 属性 (查看 [CSS 作用域](../features/scoped-css.md)和 [CSS Modules](../features/css-modules.md)) 以帮助你将样式封装到当前组件。具有不同封装模式的多个 `<style>` 标签可以在同一个组件中混合使用。
 
-- 默认情况下，将会使用 `style-loader` 提取内容，并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 Webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md)。
+- 默认情况下，将会使用 `style-loader` 提取内容，并通过 `<style>` 标签动态加入文档的 `<head>` 中，也可以[配置 webpack 将所有 styles 提取到单个 CSS 文件中](../configurations/extract-css.md)。
 
 ### 自定义块
 
 > 只在 vue-loader 10.2.0+ 中支持
 
-可以在 `.vue` 文件中添加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loader 来应用在对应的块上。Webpack loader 需要在 `vue-loader` 的选项 `loaders` 中指定。
+可以在 `.vue` 文件中添加额外的自定义块来实现项目的特定需求，例如 `<docs>` 块。`vue-loader` 将会使用标签名来查找对应的 webpack loader 来应用在对应的块上。webpack loader 需要在 `vue-loader` 的选项 `loaders` 中指定。
 
 更多细节，查看[自定义块](../configurations/custom-blocks.md)。
 
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
index fabdeb190..062a0861c 100644
--- a/docs/zh-cn/workflow/linting.md
+++ b/docs/zh-cn/workflow/linting.md
@@ -38,9 +38,9 @@ module.exports = {
 }
 ```
 
-注意 Webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
+注意 webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
 
-我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 lint 配置到 Webpack 的 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
+我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 lint 配置到 webpack 的 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
 
 ``` js
 // webpack.config.js
@@ -66,7 +66,7 @@ module.exports = {
 }
 ```
 
-For Webpack 2.x：
+For webpack 2.x：
 
 ``` js
 // webpack.config.js
diff --git a/docs/zh-cn/workflow/production.md b/docs/zh-cn/workflow/production.md
index fc5118908..9c26b85cd 100644
--- a/docs/zh-cn/workflow/production.md
+++ b/docs/zh-cn/workflow/production.md
@@ -34,6 +34,6 @@ module.exports = {
 
 1. 使用环境变量动态构建；
 
-2. 或者，使用两个分开的 Webpack 配置文件，一个用于开发环境，一个用于生产环境。把可能共用的配置放到第三个文件中，如 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) 所示。
+2. 或者，使用两个分开的 webpack 配置文件，一个用于开发环境，一个用于生产环境。把可能共用的配置放到第三个文件中，如 [vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) 所示。
 
 只要达到目标，怎么做取决于你。
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
index 4203bd146..4224f5064 100644
--- a/docs/zh-cn/workflow/testing-with-mocks.md
+++ b/docs/zh-cn/workflow/testing-with-mocks.md
@@ -4,6 +4,8 @@
 
 `vue-loader` 提供了一个可以使用 [inject-loader](https://github.com/plasticine/inject-loader) 将任意依赖项注入到 `*.vue` 组件的特性。大体思路是：我们使用 `inject-loader` 为该模块创建一个 “模块工厂” 功能，而不是直接导入组件模块。当使用 mock 对象调用此函数时，它会返回模块的实例，并注入到 mock 中。
 
+> 注意：你必须在注入模式下禁用 `esModule` 选项，否则会报错。
+
 假设我们有一个这样的组件：
 
 ``` html
@@ -14,9 +16,9 @@
 
 <script>
 // this dependency needs to be mocked
-import SomeService from '../service'
+const SomeService = require('../service')
 
-export default {
+module.exports = {
   data () {
     return {
       msg: SomeService.msg
@@ -28,10 +30,8 @@ export default {
 
 以下是使用 mock 导入的方法：
 
-> 注意: inject-loader@3.x 当前是不稳定的。
-
 ``` bash
-npm install inject-loader@^2.0.0 --save-dev
+npm install inject-loader --save-dev
 ```
 
 ``` js
diff --git a/docs/zh-cn/workflow/testing.md b/docs/zh-cn/workflow/testing.md
index 8c5bd5f9f..bb6c72ff5 100644
--- a/docs/zh-cn/workflow/testing.md
+++ b/docs/zh-cn/workflow/testing.md
@@ -2,7 +2,7 @@
 
 > [webpack vue-cli 模板](https://github.com/vuejs-templates/webpack)为你提供预配置的单元测试和 e2e 测试设置。
 
-当测试 `*.vue` 文件时，我们不能使用基于 CommonJS 的简单测试运行器，因为它不知道如何处理 `*.vue` 文件。而是应该使用 Webpack + vue-loader 打包我们的测试文件。推荐的设置是使用 [Karma](https://karma-runner.github.io/0.13/index.html) 和 [karma-webpack](https://github.com/webpack/karma-webpack)。
+当测试 `*.vue` 文件时，我们不能使用基于 CommonJS 的简单测试运行器，因为它不知道如何处理 `*.vue` 文件。而是应该使用 webpack + vue-loader 打包我们的测试文件。推荐的设置是使用 [Karma](https://karma-runner.github.io/0.13/index.html) 和 [karma-webpack](https://github.com/webpack/karma-webpack)。
 
 Karma 是一个启动浏览器并为你运行测试的测试运行器。你可以选择要测试的浏览器以及你要使用的测试框架 (例如 Mocha 或 Jasmine)。以下是一个在 [PhantomJS](http://phantomjs.org/) 中使用 [Jasmine](https://jasmine.github.io/edge/introduction.html) 测试框架运行测试的 Karma 配置示例：
 
@@ -10,7 +10,7 @@ Karma 是一个启动浏览器并为你运行测试的测试运行器。你可
 npm install\
   karma karma-webpack\
   karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs\
+  karma-phantomjs-launcher phantomjs-prebuilt\
   --save-dev
 ```
 
@@ -33,7 +33,7 @@ module.exports = function (config) {
     },
     // 使用 webpack 配置
     webpack: webpackConfig,
-    // avoid walls of useless text
+    // 避免被无用文本刷屏
     webpackMiddleware: {
       noInfo: true
     },
@@ -46,7 +46,7 @@ module.exports = function (config) {
 
 ``` js
 // test/index.js
-// require all test files using special Webpack feature
+// 通过该特殊 webpack 特性引入所有测试文件
 // https://webpack.github.io/docs/context.html#require-context
 var testsContext = require.context('.', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)

From a8a38eb2fca5d1118ed2fd52ba450251e4a4ed84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Fri, 22 Dec 2017 08:37:19 +0800
Subject: [PATCH 789/877] [fixed #965] more friendly error message for loading
 PostCSS config (#1095)

* more friendly error message for loading postcss config fix #965

* added an argument in the callback of test() to test webpack warnings

* removed duplicated expect code

* supported analysing webpack & jsdom errors

* added test case for postcss config file error
---
 lib/style-compiler/load-postcss-config.js |  7 ++-
 test/test.js                              | 60 ++++++++++++++---------
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index 1eac6fab0..5cf897b5b 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -23,9 +23,12 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
     loaded = load(ctx, config.path, { argv: false }).catch(err => {
       // postcss-load-config throws error when no config file is found,
       // but for us it's optional. only emit other errors
-      if (err.message.indexOf('No PostCSS Config found') < 0) {
-        loaderContext.emitError(err)
+      if (err.message.indexOf('No PostCSS Config found') >= 0) {
+        return
       }
+      const friendlyErr = new Error(`Error on Loading PostCSS Config: ${err.message}`)
+      Error.captureStackTrace(friendlyErr, err)
+      loaderContext.emitError(friendlyErr)
     })
   }
 
diff --git a/test/test.js b/test/test.js
index 1164cb010..758381b5e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -39,7 +39,7 @@ function genId (file) {
   return hash(path.join('test', 'fixtures', file))
 }
 
-function bundle (options, cb) {
+function bundle (options, cb, wontThrowError) {
   const vueOptions = options.vue
   delete options.vue
   const config = Object.assign({}, globalConfig, options)
@@ -54,41 +54,41 @@ function bundle (options, cb) {
   const webpackCompiler = webpack(config)
   webpackCompiler.outputFileSystem = mfs
   webpackCompiler.run((err, stats) => {
-    expect(err).to.be.null
-    if (stats.compilation.errors.length) {
-      stats.compilation.errors.forEach((err) => {
-        console.error(err.message)
-      })
-    }
-    if (stats.compilation.errors) {
-      stats.compilation.errors.forEach(err => {
-        console.error(err.message)
-      })
+    const errors = stats.compilation.errors
+    if (!wontThrowError) {
+      expect(err).to.be.null
+      if (errors && errors.length) {
+        errors.forEach(error => {
+          console.error(error.message)
+        })
+      }
+      expect(errors).to.be.empty
     }
-    expect(stats.compilation.errors).to.be.empty
-    cb(mfs.readFileSync('/test.build.js').toString(), stats.compilation.warnings)
+    cb(mfs.readFileSync('/test.build.js').toString(), stats, err)
   })
 }
 
-function test (options, assert) {
-  bundle(options, (code, warnings) => {
+function test (options, assert, wontThrowError) {
+  bundle(options, (code, stats, err) => {
     jsdom.env({
       html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
       src: [code],
-      done: (err, window) => {
-        if (err) {
-          console.log(err[0].data.error.stack)
-          expect(err).to.be.null
+      done: (errors, window) => {
+        if (errors) {
+          console.log(errors[0].data.error.stack)
+          if (!wontThrowError) {
+            expect(errors).to.be.null
+          }
         }
         const module = interopDefault(window.vueModule)
         const instance = {}
         if (module && module.beforeCreate) {
           module.beforeCreate.forEach(hook => hook.call(instance))
         }
-        assert(window, module, window.vueModule, instance)
+        assert(window, module, window.vueModule, instance, errors, { stats, err })
       }
     })
-  })
+  }, wontThrowError)
 }
 
 function mockRender (options, data = {}) {
@@ -511,7 +511,23 @@ describe('vue-loader', () => {
     })
   })
 
-  it('postcss options', done => {
+  it('load postcss config file with js syntax error', done => {
+    fs.writeFileSync('.postcssrc.js', 'module.exports = { hello }')
+    test({
+      entry: './test/fixtures/basic.vue'
+    }, (window, module, vueModule, instance, jsdomErr, webpackInfo) => {
+      const { stats: { compilation: { warnings, errors }}, err } = webpackInfo
+      expect(jsdomErr).to.be.null
+      expect(err).to.be.null
+      expect(warnings).to.be.empty
+      expect(errors.length).to.equal(1)
+      expect(errors[0].message).match(/^Error on Loading PostCSS Config\:/)
+      fs.unlinkSync('.postcssrc.js')
+      done()
+    }, true)
+  })
+
+  it('postcss lang', done => {
     test({
       entry: './test/fixtures/postcss-lang.vue'
     }, (window) => {

From a2eec052fb223f842af077327ff7b231f0fe6a3f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 21 Dec 2017 19:42:43 -0500
Subject: [PATCH 790/877] feat: update default transformToRequire values

---
 lib/template-compiler/modules/transform-require.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index 820275927..33a4c04d5 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -1,6 +1,8 @@
 // vue compiler module for transforming `<tag>:<attribute>` to `require`
 
 const defaultOptions = {
+  video: ['src', 'poster'],
+  source: 'src',
   img: 'src',
   image: 'xlink:href'
 }

From 4993dc464c7c4962920b27f600eef6ca40d4aad3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 21 Dec 2017 19:45:02 -0500
Subject: [PATCH 791/877] 13.6.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee67d2465..8f40c59fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.6.0",
+  "version": "13.6.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e2d11e1f8..6ea53f30d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.6.0",
+  "version": "13.6.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From d8094e7e10ea8bae53565d476f45a49913b0f816 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 21 Dec 2017 19:47:19 -0500
Subject: [PATCH 792/877] tweak postcss config error message

---
 lib/style-compiler/load-postcss-config.js | 2 +-
 test/test.js                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index 5cf897b5b..13f394ea8 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -26,7 +26,7 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
       if (err.message.indexOf('No PostCSS Config found') >= 0) {
         return
       }
-      const friendlyErr = new Error(`Error on Loading PostCSS Config: ${err.message}`)
+      const friendlyErr = new Error(`Error loading PostCSS config: ${err.message}`)
       Error.captureStackTrace(friendlyErr, err)
       loaderContext.emitError(friendlyErr)
     })
diff --git a/test/test.js b/test/test.js
index 758381b5e..4b293bfc0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -521,7 +521,7 @@ describe('vue-loader', () => {
       expect(err).to.be.null
       expect(warnings).to.be.empty
       expect(errors.length).to.equal(1)
-      expect(errors[0].message).match(/^Error on Loading PostCSS Config\:/)
+      expect(errors[0].message).match(/^Error loading PostCSS config\:/)
       fs.unlinkSync('.postcssrc.js')
       done()
     }, true)

From acaf6a648bd0e4bfc005852bd496c70ff7c9757f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 30 Dec 2017 23:49:26 -0500
Subject: [PATCH 793/877] fix: fix sourceMap lines off

---
 lib/parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 07f415ad5..6dcc7d9c3 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -49,7 +49,7 @@ function generateSourceMap (filename, source, generated, sourceRoot) {
       map.addMapping({
         source: filename,
         original: {
-          line: index + 1,
+          line: index,
           column: 0
         },
         generated: {

From 26cad3d467d1a8033ac84e0ca00e6392a66ccaf2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 30 Dec 2017 23:58:04 -0500
Subject: [PATCH 794/877] remove cacheBusting

---
 docs/en/options.md |  9 ---------
 lib/loader.js      |  3 ---
 lib/parser.js      | 10 +++-------
 lib/selector.js    |  2 +-
 test/test.js       | 24 ------------------------
 5 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index 681417dda..9c1a86140 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -311,15 +311,6 @@ module.exports = {
 
 Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees returned by render functions into plain strings, which improves SSR performance. In some cases you might want to explicitly turn it off because the resulting render functions can only be used for SSR and cannot be used for client-side rendering or testing.
 
-### cacheBusting
-
-> New in 13.2.0
-
-- type: `boolean`
-- default: `true` in development mode, `false` in production mode.
-
-Whether generate source maps with cache busting by appending a hash query to the file name. Turning this off can help with source map debugging.
-
 ### hotReload
 
 > New in 13.5.0
diff --git a/lib/loader.js b/lib/loader.js
index 8720f7250..45edc130e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -104,14 +104,12 @@ module.exports = function (content) {
     hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
 
   let output = ''
-  const bustCache = !isProduction && options.cacheBusting !== false
 
   const parts = parse(
     content,
     fileName,
     this.sourceMap,
     sourceRoot,
-    bustCache,
     cssSourceMap
   )
 
@@ -685,7 +683,6 @@ module.exports = function (content) {
         ? type
         : 'customBlocks') +
       '&index=' + index +
-      (bustCache ? '&bustCache' : '') +
       '!'
     )
   }
diff --git a/lib/parser.js b/lib/parser.js
index 6dcc7d9c3..d07496d29 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -6,19 +6,15 @@ const SourceMapGenerator = require('source-map').SourceMapGenerator
 const splitRE = /\r?\n/g
 const emptyRE = /^(?:\/\/)?\s*$/
 
-module.exports = (content, filename, needMap, sourceRoot, bustCache, needCSSMap) => {
+module.exports = (content, filename, needMap, sourceRoot, needCSSMap) => {
   const cacheKey = hash(filename + content)
-  // source-map cache busting for hot-reloadded modules
-  const filenameWithHash = bustCache
-    ? filename + '?' + cacheKey
-    : filename
   let output = cache.get(cacheKey)
   if (output) return output
   output = compiler.parseComponent(content, { pad: 'line' })
   if (needMap) {
     if (output.script && !output.script.src) {
       output.script.map = generateSourceMap(
-        filenameWithHash,
+        filename,
         content,
         output.script.content,
         sourceRoot
@@ -28,7 +24,7 @@ module.exports = (content, filename, needMap, sourceRoot, bustCache, needCSSMap)
       output.styles.forEach(style => {
         if (!style.src) {
           style.map = generateSourceMap(
-            filenameWithHash,
+            filename,
             content,
             style.content,
             sourceRoot
diff --git a/lib/selector.js b/lib/selector.js
index f6739a4e1..e344d42e8 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -13,7 +13,7 @@ module.exports = function (content) {
   let filename = path.basename(this.resourcePath)
   filename = filename.substring(0, filename.lastIndexOf(path.extname(filename))) + '.vue'
   const sourceRoot = path.dirname(path.relative(context, this.resourcePath))
-  const parts = parse(content, filename, this.sourceMap, sourceRoot, query.bustCache)
+  const parts = parse(content, filename, this.sourceMap, sourceRoot)
   let part = parts[query.type]
   if (Array.isArray(part)) {
     part = part[query.index]
diff --git a/test/test.js b/test/test.js
index 4b293bfc0..e87d7bc82 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1014,30 +1014,6 @@ describe('vue-loader', () => {
     })
   })
 
-  it('cacheBusting: false', done => {
-    test({
-      entry: './test/fixtures/basic.vue',
-      vue: {
-        cacheBusting: false
-      }
-    }, (window, module, rawModule) => {
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-
-      // <h2 class="red">{{msg}}</h2>
-      expect(vnode.tag).to.equal('h2')
-      expect(vnode.data.staticClass).to.equal('red')
-      expect(vnode.children[0].text).to.equal('hi')
-
-      expect(module.data().msg).to.contain('Hello from Component A!')
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
-      done()
-    })
-  })
-
   it('functional template', done => {
     test({
       entry: './test/fixtures/functional-root.vue',

From 069a09cf8f066d389a87b8f080e9fe1aaa7be318 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 31 Dec 2017 00:05:14 -0500
Subject: [PATCH 795/877] 13.6.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f40c59fb..6263ec648 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.6.1",
+  "version": "13.6.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6ea53f30d..631578869 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.6.1",
+  "version": "13.6.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 31f52116e05cf55b923f70e232a0818940e77f45 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Tue, 2 Jan 2018 11:38:42 +0300
Subject: [PATCH 796/877] [RU] Translation update (#1107)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример

* options.md новая секция

* hot-reload.md новая секция

* testing-with-mocks.md новые правки

* postcss.md правки

* options.md новые правки

* options.md правки
---
 docs/ru/options.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/docs/ru/options.md b/docs/ru/options.md
index 15ba137e9..a50b9e6f6 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -311,15 +311,6 @@ module.exports = {
 
 Включает оптимизацию компиляции в Vue 2.4 SSR, которая компилирует в простые строки часть деревьев vdom возвращаемых render-функциями, что улучшает производительность SSR. В некоторых случаях вам может потребоваться явно отключить оптимизацию, поскольку результирующие render-функции могут быть использованы только для SSR и не могут использоваться для рендеринга на стороне клиента или тестирования.
 
-### cacheBusting
-
-> Добавлено в версии 13.2.0
-
-- Тип: `boolean`
-- По умолчанию: `true` в режиме разработки, `false` в режиме production.
-
-Генерировать ли source maps при перезагрузке кэша, добавив хэш-запрос в имени файла. Выключение этой опции может помочь при отладке с использованием source map.
-
 ### hotReload
 
 > Добавлено в версии 13.5.0

From c2fd0f91a95c429116069ce1f85d83ac7f7ac8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Thu, 4 Jan 2018 15:24:23 +0800
Subject: [PATCH 797/877] [docs] removed cacheBusting in zh-cn and jp (#1110)

---
 docs/ja/options.md    | 9 ---------
 docs/zh-cn/options.md | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/docs/ja/options.md b/docs/ja/options.md
index 791c5487f..1ed95796b 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -145,15 +145,6 @@ module.exports = {
 
   注意: もしメインの webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
 
-### cacheBusting
-
-> 13.2.0 で新規追加
-
-- 型: `boolean`
-- デフォルト: 開発モードで `true`、プロダクションモードで `false`
-
-ファイル名にハッシュクエリを追加することによってキャッシュを破損を伴うソースマップを生成するかどうか。これをオフにするとソースマップデバッギングにも役に立ちます。
-
 ### esModule
 
 - 型: `boolean`
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 189a76f1d..4d65d13a5 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -307,15 +307,6 @@ module.exports = {
 
 开启 Vue 2.4 服务端渲染的编译优化之后，渲染函数将会把返回的 vdom 树的一部分编译为字符串，以提升服务端渲染的性能。在一些情况下，你可能想要明确的将其关掉，因为该渲染函数只能用于服务端渲染，而不能用于客户端渲染或测试环境。
 
-### cacheBusting
-
-> 13.2.0 新增
-
-- 类型：`boolean`
-- 默认值：在开发环境下是 `true`，在生产环境下是 `false`。
-
-是否通过给文件名后加哈希查询值来避免生成的 source map 被缓存。关掉这一选项有益于 source map 调试。
-
 ### hotReload
 
 > 13.5.0 新增

From 4e6f328799d7eadea1c662ebc1abe4a8ddc61ece Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 8 Jan 2018 15:52:40 -0500
Subject: [PATCH 798/877] refactor transformToRequire url handling

---
 .../modules/transform-require.js              | 20 +++++++------------
 .../modules/transform-srcset.js               | 16 ++-------------
 lib/template-compiler/url-to-require.js       | 13 ++++++++++++
 3 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 lib/template-compiler/url-to-require.js

diff --git a/lib/template-compiler/modules/transform-require.js b/lib/template-compiler/modules/transform-require.js
index 33a4c04d5..1e523be50 100644
--- a/lib/template-compiler/modules/transform-require.js
+++ b/lib/template-compiler/modules/transform-require.js
@@ -1,5 +1,7 @@
 // vue compiler module for transforming `<tag>:<attribute>` to `require`
 
+const urlToRequire = require('../url-to-require')
+
 const defaultOptions = {
   video: ['src', 'poster'],
   source: 'src',
@@ -34,19 +36,11 @@ function transform (node, options) {
 
 function rewrite (attr, name) {
   if (attr.name === name) {
-    let value = attr.value
-    const isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
-    if (!isStatic) {
-      return
-    }
-    const firstChar = value.charAt(1)
-    if (firstChar === '.' || firstChar === '~') {
-      if (firstChar === '~') {
-        const secondChar = value.charAt(2)
-        value = '"' + value.slice(secondChar === '/' ? 3 : 2)
-      }
-      attr.value = `require(${value})`
+    const value = attr.value
+    // only transform static URLs
+    if (value.charAt(0) === '"' && value.charAt(value.length - 1) === '"') {
+      attr.value = urlToRequire(value.slice(1, -1))
+      return true
     }
-    return true
   }
 }
diff --git a/lib/template-compiler/modules/transform-srcset.js b/lib/template-compiler/modules/transform-srcset.js
index 2779eeae6..f5ff40ead 100644
--- a/lib/template-compiler/modules/transform-srcset.js
+++ b/lib/template-compiler/modules/transform-srcset.js
@@ -1,5 +1,7 @@
 // vue compiler module for transforming `img:srcset` to a number of `require`s
 
+const urlToRequire = require('../url-to-require')
+
 module.exports = () => ({
   postTransformNode: node => {
     transform(node)
@@ -43,17 +45,3 @@ function transform (node) {
     })
   }
 }
-
-function urlToRequire (url) {
-  // same logic as in transform-require.js
-  const firstChar = url.charAt(0)
-  if (firstChar === '.' || firstChar === '~') {
-    if (firstChar === '~') {
-      const secondChar = url.charAt(1)
-      url = url.slice(secondChar === '/' ? 2 : 1)
-    }
-    return `require("${url}")`
-  } else {
-    return `"${url}"`
-  }
-}
diff --git a/lib/template-compiler/url-to-require.js b/lib/template-compiler/url-to-require.js
new file mode 100644
index 000000000..fcd13d55e
--- /dev/null
+++ b/lib/template-compiler/url-to-require.js
@@ -0,0 +1,13 @@
+module.exports = function urlToRequire (url) {
+  // same logic as in transform-require.js
+  const firstChar = url.charAt(0)
+  if (firstChar === '.' || firstChar === '~' || firstChar === '@') {
+    if (firstChar === '~') {
+      const secondChar = url.charAt(1)
+      url = url.slice(secondChar === '/' ? 2 : 1)
+    }
+    return `require("${url}")`
+  } else {
+    return `"${url}"`
+  }
+}

From 2f5fe3fd329f46dbe24e38a8bea4e5919094898f Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 8 Jan 2018 15:54:37 -0500
Subject: [PATCH 799/877] 13.7.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6263ec648..5f2bd41d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.6.2",
+  "version": "13.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 631578869..6e57bd705 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.6.2",
+  "version": "13.7.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 781df8cc8143b90137ff13974102581a538c24a6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 8 Jan 2018 16:08:39 -0500
Subject: [PATCH 800/877] docs: more detailed rules for asset url transforming

---
 docs/en/configurations/asset-url.md    | 18 ++++++++++++++++++
 docs/zh-cn/configurations/asset-url.md | 20 +++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/docs/en/configurations/asset-url.md b/docs/en/configurations/asset-url.md
index d2ba4c16c..5f9b1809b 100644
--- a/docs/en/configurations/asset-url.md
+++ b/docs/en/configurations/asset-url.md
@@ -14,8 +14,26 @@ will be compiled into:
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
+### Transform Rules
+
+- If the URL is an absolute path (e.g. `/images/foo.png`), it will be preserved as-is.
+
+- If the URL starts with `.`, it's interpreted as a relative module request and resolved based on the folder structure on your file system.
+
+- If the URL starts with `~`, anything after it is interpreted as a module request. This means you can even reference assets inside node modules:
+
+  ``` html
+  <img src="~/some-npm-package/foo.png">
+  ```
+
+- (13.7.0+) If the URL starts with `@`, it's also interpreted as a module request. This is useful if your webpack config has an alias for `@`, which by default points to `/src` in any project created by `vue-cli`.
+
+### Related Loaders
+
 Because `.png` is not a JavaScript file, you will need to configure webpack to use [file-loader](https://github.com/webpack/file-loader) or [url-loader](https://github.com/webpack/url-loader) to handle them. The project scaffolded with `vue-cli` has also configured this for you.
 
+### Why
+
 The benefits of all this are:
 
 1. `file-loader` allows you to designate where to copy and place the asset file, and how to name it using version hashes for better caching. Moreover, this also means **you can just place images next to your `*.vue` files and use relative paths based on the folder structure instead of worrying about deployment URLs**. With proper config, webpack will auto-rewrite the file paths into correct URLs in the bundled output.
diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index ec498cdd1..2601b56e4 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -14,9 +14,27 @@
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
+### 编译规则
+
+- 如果路径是绝对路径，会原样保留。
+
+- 如果路径以 `.` 开头，将会被看作相对的模块依赖，并按照你的本地文件系统上的目录结构进行解析。
+
+- 如果路径以 `~` 开头，其后的部分将会被看作模块依赖。这意味着你可以用该特性来引用一个 node 依赖中的资源：
+
+  ``` html
+  <img src="~/some-npm-package/foo.png">
+  ```
+
+- (13.7.0+) 如果路径以 `@` 开头，也会被看作模块依赖。如果你的 webpack 配置中给 `@` 配置了 alias，这就很有用了。所有 `vue-cli` 创建的项目都默认配置了将 `@` 指向 `/src`。
+
+### 相关 Loader 配置
+
 因为 `.png` 不是一个 JavaScript 文件，你需要配置 webpack 使用 [file-loader](https://github.com/webpack/file-loader) 或者 [url-loader](https://github.com/webpack/url-loader) 去处理它们。`vue-cli` 脚手器工具已经为你配置好了。
 
-使用它们的好处：
+### 为什么要编译路径
+
+这样做的好处：
 
 1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，webpack 将会在打包输出中自动重写文件路径为正确的URL。
 

From d6bd84c933b252ddc011b7d0674d51a293e1a1ec Mon Sep 17 00:00:00 2001
From: ts0307 <ts0307@gmail.com>
Date: Thu, 11 Jan 2018 00:32:53 +0800
Subject: [PATCH 801/877] =?UTF-8?q?=E8=BF=99=20=3D>=20=E7=9D=80=20(#1115)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

这意味这你可以 `require()` 其它依赖。 => 这意味着你可以 `require()` 其它依赖。
---
 docs/zh-cn/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index e915fe0cc..3e122304c 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -56,7 +56,7 @@ export default {
 
 - 每个 `.vue` 文件最多包含一个 `<script>` 块。
 
-- 该脚本在类 CommonJS 环境中执行 (就像通过 webpack 打包的正常 js 模块)，这意味这你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
+- 该脚本在类 CommonJS 环境中执行 (就像通过 webpack 打包的正常 js 模块)，这意味着你可以 `require()` 其它依赖。在 ES2015 支持下，你也可以使用 `import` 和 `export` 语法。
 
 - 脚本必须导出 Vue.js 组件对象。也可以导出由 `Vue.extend()` 创建的扩展对象，但是普通对象是更好的选择。
 

From 72f5d090843dfbe267d4f3bf9b6e6fb261ad8ba1 Mon Sep 17 00:00:00 2001
From: ts0307 <ts0307@gmail.com>
Date: Thu, 11 Jan 2018 17:17:58 +0800
Subject: [PATCH 802/877] =?UTF-8?q?=E5=89=8D=20=3D>=20=E9=97=B4=20(#1119)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the whitespaces between HTML tags in templates will be ignored.

模版中 HTML 标签之前的空格将会被忽略。 => 模版中 HTML 标签之间的空格将会被忽略。
---
 docs/zh-cn/options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 4d65d13a5..50308c14f 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -168,7 +168,7 @@ module.exports = {
 - 类型: `Boolean`
 - 默认值: `true`
 
-  如果设置为 `false`，模版中 HTML 标签之前的空格将会被忽略。
+  如果设置为 `false`，模版中 HTML 标签之间的空格将会被忽略。
 
 ### compilerModules
 

From 9201e05bc926f9cf3815ac6eeb5580f3da3032fb Mon Sep 17 00:00:00 2001
From: ts0307 <ts0307@gmail.com>
Date: Thu, 11 Jan 2018 22:22:34 +0800
Subject: [PATCH 803/877] =?UTF-8?q?modules=20=E9=80=89=E9=A1=B9=20=3D>=20d?=
 =?UTF-8?q?irectives=20=E9=80=89=E9=A1=B9=20(#1120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In about details, see more directives option of vue-template-compiler.

相关细节请查阅 vue-template-compiler 的 modules 选项。 => 相关细节请查阅 vue-template-compiler 的 directives 选项。
---
 docs/zh-cn/options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 50308c14f..63195a077 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -184,7 +184,7 @@ module.exports = {
 
   > 版本说明：在 v12.x 中，从 v12.2.3+ 开始支持
 
-  为 `vue-template-compiler` 配置 `directives` 选项。相关细节请查阅 `vue-template-compiler` 的 [`modules` 选项](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options)。
+  为 `vue-template-compiler` 配置 `directives` 选项。相关细节请查阅 `vue-template-compiler` 的 [`directives` 选项](https://github.com/vuejs/vue/blob/dev/packages/vue-template-compiler/README.md#compilercompiletemplate-options)。
 
 ### transformToRequire
 

From 31d309da5ac06c14f0de21504be4e577f9798eb5 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sat, 13 Jan 2018 23:38:27 -0500
Subject: [PATCH 804/877] fix: importLoaders should be a number when cssModules
 are used

---
 docs/en/features/css-modules.md    | 2 +-
 docs/ja/features/css-modules.md    | 2 +-
 docs/kr/features/css-modules.md    | 2 +-
 docs/pt_BR/features/css-modules.md | 4 ++--
 docs/ru/features/css-modules.md    | 2 +-
 docs/zh-cn/features/css-modules.md | 2 +-
 lib/loader.js                      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index af9fb3d66..52dccfac0 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -81,7 +81,7 @@ CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader
 ``` js
 {
   modules: true,
-  importLoaders: true,
+  importLoaders: 1,
   localIdentName: '[hash:base64]'
 }
 ```
diff --git a/docs/ja/features/css-modules.md b/docs/ja/features/css-modules.md
index 380bc2839..2486066dc 100644
--- a/docs/ja/features/css-modules.md
+++ b/docs/ja/features/css-modules.md
@@ -81,7 +81,7 @@ CSS モジュールは [css-loader](https://github.com/webpack/css-loader) に
 ``` js
 {
   modules: true,
-  importLoaders: true,
+  importLoaders: 1,
   localIdentName: '[hash:base64]'
 }
 ```
diff --git a/docs/kr/features/css-modules.md b/docs/kr/features/css-modules.md
index 35db4f1a6..c9a1874db 100644
--- a/docs/kr/features/css-modules.md
+++ b/docs/kr/features/css-modules.md
@@ -81,7 +81,7 @@ CSS 모듈은 [css-loader](https://github.com/webpack/css-loader)를 통해 처
 ``` js
 {
   modules: true,
-  importLoaders: true,
+  importLoaders: 1,
   localIdentName: '[hash:base64]'
 }
 ```
diff --git a/docs/pt_BR/features/css-modules.md b/docs/pt_BR/features/css-modules.md
index c1fbba6bb..60a4cee63 100644
--- a/docs/pt_BR/features/css-modules.md
+++ b/docs/pt_BR/features/css-modules.md
@@ -81,7 +81,7 @@ Módulos CSS são processados via [css-loader](https://github.com/webpack/css-lo
 ```js
 {
   modules: true,
-  importLoaders: true,
+  importLoaders: 1,
   localIdentName: '[hash:base64]'
 }
 ```
@@ -114,4 +114,4 @@ module: {
     }
   ]
 }
-```
\ No newline at end of file
+```
diff --git a/docs/ru/features/css-modules.md b/docs/ru/features/css-modules.md
index 778b1e482..ed86ca0ae 100644
--- a/docs/ru/features/css-modules.md
+++ b/docs/ru/features/css-modules.md
@@ -81,7 +81,7 @@ CSS-модули обрабатываются с помощью [css-loader](htt
 ``` js
 {
   modules: true,
-  importLoaders: true,
+  importLoaders: 1,
   localIdentName: '[hash:base64]'
 }
 ```
diff --git a/docs/zh-cn/features/css-modules.md b/docs/zh-cn/features/css-modules.md
index d9f24be47..6f81fbf6b 100644
--- a/docs/zh-cn/features/css-modules.md
+++ b/docs/zh-cn/features/css-modules.md
@@ -81,7 +81,7 @@ CSS Modules 处理是通过 [css-loader](https://github.com/webpack/css-loader)
 ``` js
 {
   modules: true,
-  importLoaders: true,
+  importLoaders: 1,
   localIdentName: '[hash:base64]'
 }
 ```
diff --git a/lib/loader.js b/lib/loader.js
index 45edc130e..75ef7a6ff 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -513,7 +513,7 @@ module.exports = function (content) {
     }
     const OPTIONS = {
       localIdentName: '[hash:base64]',
-      importLoaders: true
+      importLoaders: 1
     }
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, (m, $1, $2) => {
       // $1: !css-loader

From 35723b0e1f28701c28ce1a60bedc578e73b1d069 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Mon, 15 Jan 2018 05:02:22 +0300
Subject: [PATCH 805/877] [RU] Translation update (#1125)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример

* options.md новая секция

* hot-reload.md новая секция

* testing-with-mocks.md новые правки

* postcss.md правки

* options.md новые правки

* options.md правки

* asset-url.md добавлены разъяснения
---
 docs/ru/configurations/asset-url.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/ru/configurations/asset-url.md b/docs/ru/configurations/asset-url.md
index e81b605f1..5fde44942 100644
--- a/docs/ru/configurations/asset-url.md
+++ b/docs/ru/configurations/asset-url.md
@@ -14,8 +14,26 @@
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
 
+### Правила преобразования
+
+- Если URL является абсолютным путём (например, `/images/foo.png`), он будет оставлен как есть.
+
+- Если URL начинается с `.`, он будет истолковываться как относительный запрос модуля и разрешаться на основе структуры каталогов вашей файловой системы.
+
+- Если URL начинается с `~`, то всё что после него будет истолковываться как запрос модуля. Это означает, что вы можете ссылаться на ресурсы даже внутри node_modules:
+
+  ``` html
+  <img src="~/some-npm-package/foo.png">
+  ```
+
+- (13.7.0+) Если URL начинается с `@`, то также будет истолковываться как запрос модуля. Это полезно если в вашей конфигурации webpack есть псевдоним для `@`, который по умолчанию указывает на `/src` в любом проекте, созданном через `vue-cli`.
+
+### Связанные загрузчики
+
 Так как `.png` это не JavaScript-файл, вам необходимо настроить webpack использовать [file-loader](https://github.com/webpack/file-loader) или [url-loader](https://github.com/webpack/url-loader) для их обработки. Проект создаваемый с помощью `vue-cli` уже сделает это за вас.
 
+### Почему
+
 Преимущества подобного подхода:
 
 1. `file-loader` позволяет определить куда нужно скопировать и поместить файл, а также как именовать его с добавлением в имя хэша для лучшего кеширования. Кроме того, это означает что **вы можете просто поместить изображения рядом с вашим `*.vue` файлами и использовать относительные пути, основанные на структуре каталогов, не беспокоясь об адресах при развёртывании**. При правильной конфигурации, webpack будет автоматически заменять пути к файлам в корректные URL в итоговой сборке.

From d9d7fa4a53e5e8a1a7451782d5da399625d24fec Mon Sep 17 00:00:00 2001
From: sqal <sqal08@gmail.com>
Date: Mon, 15 Jan 2018 03:03:59 +0100
Subject: [PATCH 806/877] docs: remove cacheBusting from table of contents
 (#1124)

---
 docs/en/SUMMARY.md    | 3 +--
 docs/ja/SUMMARY.md    | 3 +--
 docs/ru/SUMMARY.md    | 3 +--
 docs/zh-cn/SUMMARY.md | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 0fd34890f..a5ccfd555 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -33,5 +33,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
-  - [cacheBusting](options.md#cachebusting)
+  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
index cf00a72aa..b9203f55a 100644
--- a/docs/ja/SUMMARY.md
+++ b/docs/ja/SUMMARY.md
@@ -33,5 +33,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
-  - [cacheBusting](options.md#cachebusting)
+  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index b19128686..29a1e3b57 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -33,5 +33,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
-  - [cacheBusting](options.md#cachebusting)
\ No newline at end of file
+  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index 1874ba71c..d8e58fde5 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -33,5 +33,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
-  - [cacheBusting](options.md#cachebusting)
+  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file

From 653d92b6364ed174de2b992b8c995a5dc3f06768 Mon Sep 17 00:00:00 2001
From: ts0307 <ts0307@gmail.com>
Date: Mon, 15 Jan 2018 10:04:15 +0800
Subject: [PATCH 807/877] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=9C=89=E8=AF=AF=20?=
 =?UTF-8?q?(#1118)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原文:so a "reload" instead of re-render is required to ensure consistent behavior.

所以将“重新加载”替换为重新渲染是必须的 => 所以将重新渲染替换为“重新加载”是必须的
---
 docs/zh-cn/features/hot-reload.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/features/hot-reload.md b/docs/zh-cn/features/hot-reload.md
index b1601b854..b0442ccd4 100644
--- a/docs/zh-cn/features/hot-reload.md
+++ b/docs/zh-cn/features/hot-reload.md
@@ -8,7 +8,7 @@
 
 - 当编辑一个组件的 `<template>` 时，这个组件实例将就地重新渲染，并保留当前所有的私有状态。能够做到这一点是因为模板被编译成了新的无副作用的渲染函数。
 
-- 当编辑一个组件的 `<script>` 时，这个组件实例将就地销毁并重新创建。(应用中其它组件的状态将会被保留) 是因为 `<script>` 可能包含带有副作用的生命周期钩子，所以将“重新加载”替换为重新渲染是必须的，这样做可以确保组件行为的一致性。这也意味着，如果你的组件带有全局副作用，则整个页面将会被重新加载。
+- 当编辑一个组件的 `<script>` 时，这个组件实例将就地销毁并重新创建。(应用中其它组件的状态将会被保留) 是因为 `<script>` 可能包含带有副作用的生命周期钩子，所以将重新渲染替换为重新加载是必须的，这样做可以确保组件行为的一致性。这也意味着，如果你的组件带有全局副作用，则整个页面将会被重新加载。
 
 - `<style>` 会通过 `vue-style-loader` 自行热重载，所以它不会影响应用的状态。
 

From 436ac944000ea8b4ba718cc6d4fe3becd682f1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Zabrze=C5=84ski?= <d.zabrzenski@livechatinc.com>
Date: Mon, 15 Jan 2018 03:05:14 +0100
Subject: [PATCH 808/877] update `marked` to latest version (#1114)

---
 package-lock.json | 40 ++++++++++++++++++++--------------------
 package.json      |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5f2bd41d3..2ac43b111 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3622,22 +3622,22 @@
             }
           }
         },
-        "string-width": {
-          "version": "1.0.2",
+        "string_decoder": {
+          "version": "1.0.1",
           "bundled": true,
           "dev": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "safe-buffer": "5.0.1"
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
+        "string-width": {
+          "version": "1.0.2",
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "5.0.1"
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
           }
         },
         "stringstream": {
@@ -5101,9 +5101,9 @@
       }
     },
     "marked": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
-      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
+      "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==",
       "dev": true
     },
     "math-expression-evaluator": {
@@ -8699,6 +8699,15 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -8710,15 +8719,6 @@
         "strip-ansi": "3.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "stringify-object": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.1.tgz",
diff --git a/package.json b/package.json
index 6e57bd705..98bfe8c04 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "js-yaml": "^3.9.1",
     "jsdom": "^9.2.1",
     "lint-staged": "^4.0.2",
-    "marked": "^0.3.6",
+    "marked": "^0.3.12",
     "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
     "mocha": "^4.0.1",

From 00ef1e59c7a168a391873ed707cd3a78ab70a3ab Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 Jan 2018 18:30:36 -0500
Subject: [PATCH 809/877] feat: import component normalizer with esm

---
 lib/loader.js                             |  18 ++--
 lib/runtime/component-normalizer.esm.js   | 103 ++++++++++++++++++++++
 lib/{ => runtime}/component-normalizer.js |   2 +-
 3 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 lib/runtime/component-normalizer.esm.js
 rename lib/{ => runtime}/component-normalizer.js (97%)

diff --git a/lib/loader.js b/lib/loader.js
index 75ef7a6ff..51a4c6caa 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -11,7 +11,8 @@ const selectorPath = normalize.lib('selector')
 const styleCompilerPath = normalize.lib('style-compiler/index')
 const templateCompilerPath = normalize.lib('template-compiler/index')
 const templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
-const componentNormalizerPath = normalize.lib('component-normalizer')
+const componentNormalizerPath = normalize.lib('runtime/component-normalizer')
+const componentNormalizerESMPath = normalize.lib('runtime/component-normalizer.esm')
 
 // dep loaders
 const styleLoaderPath = normalize.dep('vue-style-loader')
@@ -260,10 +261,17 @@ module.exports = function (content) {
   //   scopeId,
   //   moduleIdentifier (server only)
   // )
-  output +=
-    'var normalizeComponent = require(' +
-    loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-    ')\n'
+  if (!options.esModule) {
+    output +=
+      'var normalizeComponent = require(' +
+      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
+      ')\n'
+  } else {
+    output +=
+      `import normalizeComponent from ` +
+      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerESMPath) +
+      '\n'
+  }
 
   // <script>
   output += '/* script */\n'
diff --git a/lib/runtime/component-normalizer.esm.js b/lib/runtime/component-normalizer.esm.js
new file mode 100644
index 000000000..75a5402bb
--- /dev/null
+++ b/lib/runtime/component-normalizer.esm.js
@@ -0,0 +1,103 @@
+/* globals __VUE_SSR_CONTEXT__ */
+
+// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
+// This module is a runtime utility for cleaner component module output and will
+// be included in the final webpack user bundle.
+
+export default function normalizeComponent (
+  rawScriptExports,
+  compiledTemplate,
+  functionalTemplate,
+  injectStyles,
+  scopeId,
+  moduleIdentifier /* server only */
+) {
+  var esModule
+  var scriptExports = rawScriptExports = rawScriptExports || {}
+
+  // ES6 modules interop
+  var type = typeof rawScriptExports.default
+  if (type === 'object' || type === 'function') {
+    esModule = rawScriptExports
+    scriptExports = rawScriptExports.default
+  }
+
+  // Vue.extend constructor export interop
+  var options = typeof scriptExports === 'function'
+    ? scriptExports.options
+    : scriptExports
+
+  // render functions
+  if (compiledTemplate) {
+    options.render = compiledTemplate.render
+    options.staticRenderFns = compiledTemplate.staticRenderFns
+    options._compiled = true
+  }
+
+  // functional template
+  if (functionalTemplate) {
+    options.functional = true
+  }
+
+  // scopedId
+  if (scopeId) {
+    options._scopeId = scopeId
+  }
+
+  var hook
+  if (moduleIdentifier) { // server build
+    hook = function (context) {
+      // 2.3 injection
+      context =
+        context || // cached call
+        (this.$vnode && this.$vnode.ssrContext) || // stateful
+        (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
+      // 2.2 with runInNewContext: true
+      if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
+        context = __VUE_SSR_CONTEXT__
+      }
+      // inject component styles
+      if (injectStyles) {
+        injectStyles.call(this, context)
+      }
+      // register component module identifier for async chunk inferrence
+      if (context && context._registeredComponents) {
+        context._registeredComponents.add(moduleIdentifier)
+      }
+    }
+    // used by ssr in case component is cached and beforeCreate
+    // never gets called
+    options._ssrRegister = hook
+  } else if (injectStyles) {
+    hook = injectStyles
+  }
+
+  if (hook) {
+    var functional = options.functional
+    var existing = functional
+      ? options.render
+      : options.beforeCreate
+
+    if (!functional) {
+      // inject component registration as beforeCreate hook
+      options.beforeCreate = existing
+        ? [].concat(existing, hook)
+        : [hook]
+    } else {
+      // for template-only hot-reload because in that case the render fn doesn't
+      // go through the normalizer
+      options._injectStyles = hook
+      // register for functioal component in vue file
+      options.render = function renderWithStyleInjection (h, context) {
+        hook.call(context)
+        return existing(h, context)
+      }
+    }
+  }
+
+  return {
+    esModule: esModule,
+    exports: scriptExports,
+    options: options
+  }
+}
diff --git a/lib/component-normalizer.js b/lib/runtime/component-normalizer.js
similarity index 97%
rename from lib/component-normalizer.js
rename to lib/runtime/component-normalizer.js
index e6b13fc04..fc726e026 100644
--- a/lib/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -1,6 +1,6 @@
 /* globals __VUE_SSR_CONTEXT__ */
 
-// IMPORTANT: Do NOT use ES2015 features in this file.
+// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
 // This module is a runtime utility for cleaner component module output and will
 // be included in the final webpack user bundle.
 

From 4f3c37915c28778cab78513de6162bb11937735e Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 Jan 2018 23:40:52 -0500
Subject: [PATCH 810/877] use yarn

---
 package-lock.json | 9674 ---------------------------------------------
 package.json      |    2 +-
 yarn.lock         | 4851 +++++++++++++++++++++++
 3 files changed, 4852 insertions(+), 9675 deletions(-)
 delete mode 100644 package-lock.json
 create mode 100644 yarn.lock

diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 2ac43b111..000000000
--- a/package-lock.json
+++ /dev/null
@@ -1,9674 +0,0 @@
-{
-  "name": "vue-loader",
-  "version": "13.7.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "abab": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
-      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=",
-      "dev": true
-    },
-    "acorn": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
-      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
-      "dev": true
-    },
-    "acorn-dynamic-import": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
-      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "acorn-globals": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
-      "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
-      "dev": true,
-      "requires": {
-        "acorn": "4.0.13"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "acorn-jsx": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
-      "requires": {
-        "acorn": "3.3.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "ajv": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-      "dev": true,
-      "requires": {
-        "co": "4.6.0",
-        "json-stable-stringify": "1.0.1"
-      }
-    },
-    "ajv-keywords": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-      "dev": true
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "dev": true,
-      "requires": {
-        "kind-of": "3.2.2",
-        "longest": "1.0.1",
-        "repeat-string": "1.6.1"
-      }
-    },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-      "dev": true
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-      "requires": {
-        "color-convert": "1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-      "dev": true,
-      "requires": {
-        "micromatch": "2.3.11",
-        "normalize-path": "2.1.1"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "1.1.0"
-          }
-        }
-      }
-    },
-    "app-root-path": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
-      "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "requires": {
-        "sprintf-js": "1.0.3"
-      }
-    },
-    "arr-diff": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "1.1.0"
-      }
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "1.0.3"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
-    },
-    "asn1.js": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
-      "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "requires": {
-        "util": "0.10.3"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "assertion-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
-      "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=",
-      "dev": true
-    },
-    "async": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.4"
-      }
-    },
-    "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "autoprefixer": {
-      "version": "6.7.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
-      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000745",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "1.0.30000745",
-            "electron-to-chromium": "1.3.24"
-          }
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-      "dev": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "babel-core": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.0",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.5.0",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.4",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.7",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
-      "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
-      "dev": true,
-      "requires": {
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "detect-indent": "4.0.0",
-        "jsesc": "1.3.0",
-        "lodash": "4.17.4",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "babel-helper-builder-binary-assignment-operator-visitor": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
-      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
-      "dev": true,
-      "requires": {
-        "babel-helper-explode-assignable-expression": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-call-delegate": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
-      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-define-map": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
-      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-helper-explode-assignable-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
-      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
-      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dev": true,
-      "requires": {
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-get-function-arity": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
-      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-hoist-variables": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
-      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-optimise-call-expression": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
-      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-regex": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
-      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-helper-remap-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helper-replace-supers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
-      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true,
-      "requires": {
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-helpers": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
-      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
-      }
-    },
-    "babel-loader": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.2.tgz",
-      "integrity": "sha512-jRwlFbINAeyDStqK6Dd5YuY0k5YuzQUvlz2ZamuXrXmxav3pNqe9vfJ402+2G+OmlJSXxCOpB6Uz0INM7RQe2A==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "1.0.0",
-        "loader-utils": "1.1.0",
-        "mkdirp": "0.5.1"
-      }
-    },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-check-es2015-constants": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
-      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-syntax-async-functions": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
-      "dev": true
-    },
-    "babel-plugin-syntax-exponentiation-operator": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
-      "dev": true
-    },
-    "babel-plugin-syntax-trailing-function-commas": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
-      "dev": true
-    },
-    "babel-plugin-transform-async-to-generator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
-      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
-      "dev": true,
-      "requires": {
-        "babel-helper-remap-async-to-generator": "6.24.1",
-        "babel-plugin-syntax-async-functions": "6.13.0",
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-arrow-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
-      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoped-functions": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
-      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-block-scoping": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
-      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-plugin-transform-es2015-classes": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
-      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
-      "requires": {
-        "babel-helper-define-map": "6.26.0",
-        "babel-helper-function-name": "6.24.1",
-        "babel-helper-optimise-call-expression": "6.24.1",
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-computed-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
-      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-destructuring": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
-      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-duplicate-keys": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
-      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-for-of": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
-      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-function-name": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
-      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true,
-      "requires": {
-        "babel-helper-function-name": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
-      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-amd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
-      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-commonjs": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
-      "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-strict-mode": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-systemjs": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
-      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true,
-      "requires": {
-        "babel-helper-hoist-variables": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-modules-umd": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
-      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true,
-      "requires": {
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-object-super": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
-      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true,
-      "requires": {
-        "babel-helper-replace-supers": "6.24.1",
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-parameters": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
-      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true,
-      "requires": {
-        "babel-helper-call-delegate": "6.24.1",
-        "babel-helper-get-function-arity": "6.24.1",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-shorthand-properties": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
-      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-spread": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
-      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-sticky-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
-      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true,
-      "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-template-literals": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
-      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-typeof-symbol": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
-      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-es2015-unicode-regex": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
-      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true,
-      "requires": {
-        "babel-helper-regex": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "regexpu-core": "2.0.0"
-      }
-    },
-    "babel-plugin-transform-exponentiation-operator": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
-      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
-      "dev": true,
-      "requires": {
-        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
-        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
-        "babel-runtime": "6.26.0"
-      }
-    },
-    "babel-plugin-transform-regenerator": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
-      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "0.10.1"
-      }
-    },
-    "babel-plugin-transform-strict-mode": {
-      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
-      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0"
-      }
-    },
-    "babel-preset-env": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.0.tgz",
-      "integrity": "sha512-OVgtQRuOZKckrILgMA5rvctvFZPv72Gua9Rt006AiPoB0DJKGN07UmaQA+qRrYgK71MVct8fFhT0EyNWYorVew==",
-      "dev": true,
-      "requires": {
-        "babel-plugin-check-es2015-constants": "6.22.0",
-        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
-        "babel-plugin-transform-async-to-generator": "6.24.1",
-        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
-        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
-        "babel-plugin-transform-es2015-classes": "6.24.1",
-        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
-        "babel-plugin-transform-es2015-destructuring": "6.23.0",
-        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
-        "babel-plugin-transform-es2015-for-of": "6.23.0",
-        "babel-plugin-transform-es2015-function-name": "6.24.1",
-        "babel-plugin-transform-es2015-literals": "6.22.0",
-        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
-        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
-        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
-        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
-        "babel-plugin-transform-es2015-object-super": "6.24.1",
-        "babel-plugin-transform-es2015-parameters": "6.24.1",
-        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
-        "babel-plugin-transform-es2015-spread": "6.22.0",
-        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
-        "babel-plugin-transform-es2015-template-literals": "6.22.0",
-        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
-        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
-        "babel-plugin-transform-exponentiation-operator": "6.24.1",
-        "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "2.5.1",
-        "invariant": "2.2.2",
-        "semver": "5.4.1"
-      }
-    },
-    "babel-register": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
-      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "core-js": "2.5.1",
-        "home-or-tmp": "2.0.0",
-        "lodash": "4.17.4",
-        "mkdirp": "0.5.1",
-        "source-map-support": "0.4.18"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-messages": "6.23.0",
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "debug": "2.6.9",
-        "globals": "9.18.0",
-        "invariant": "2.2.2",
-        "lodash": "4.17.4"
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "esutils": "2.0.2",
-        "lodash": "4.17.4",
-        "to-fast-properties": "1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
-    },
-    "binary-extensions": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
-      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
-    },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "dev": true,
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-      "dev": true,
-      "requires": {
-        "expand-range": "1.8.2",
-        "preserve": "0.2.0",
-        "repeat-element": "1.1.2"
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browser-stdout": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-      "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz",
-      "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "1.0.3",
-        "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.3",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "1.0.8",
-        "browserify-des": "1.0.0",
-        "evp_bytestokey": "1.0.3"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-      "dev": true,
-      "requires": {
-        "cipher-base": "1.0.4",
-        "des.js": "1.0.0",
-        "inherits": "2.0.3"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "randombytes": "2.0.5"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "elliptic": "6.4.0",
-        "inherits": "2.0.3",
-        "parse-asn1": "5.1.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-      "dev": true,
-      "requires": {
-        "pako": "0.2.9"
-      }
-    },
-    "browserslist": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.5.1.tgz",
-      "integrity": "sha512-jAvM2ku7YDJ+leAq3bFH1DE0Ylw+F+EQDq4GkqZfgPEqpWYw9ofQH85uKSB9r3Tv7XDbfqVtE+sdvKJW7IlPJA==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "1.0.30000745",
-        "electron-to-chromium": "1.3.24"
-      }
-    },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "dev": true,
-      "requires": {
-        "base64-js": "1.2.1",
-        "ieee754": "1.1.8",
-        "isarray": "1.0.0"
-      }
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "0.2.0"
-      }
-    },
-    "callsites": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-      "dev": true
-    },
-    "caniuse-api": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
-      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000745",
-        "lodash.memoize": "4.1.2",
-        "lodash.uniq": "4.5.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "1.0.30000745",
-            "electron-to-chromium": "1.3.24"
-          }
-        }
-      }
-    },
-    "caniuse-db": {
-      "version": "1.0.30000745",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000745.tgz",
-      "integrity": "sha1-slmmFzej5IxPtLaxvETt6yZM1CI=",
-      "dev": true
-    },
-    "caniuse-lite": {
-      "version": "1.0.30000745",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000745.tgz",
-      "integrity": "sha1-INb+3hFXpJNRM1ApRvx+DmuIDaU=",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-      "dev": true,
-      "requires": {
-        "align-text": "0.1.4",
-        "lazy-cache": "1.0.4"
-      }
-    },
-    "chai": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
-      "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
-      "dev": true,
-      "requires": {
-        "assertion-error": "1.0.2",
-        "check-error": "1.0.2",
-        "deep-eql": "3.0.1",
-        "get-func-name": "2.0.0",
-        "pathval": "1.1.0",
-        "type-detect": "4.0.3"
-      }
-    },
-    "chalk": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-      "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
-      "requires": {
-        "ansi-styles": "3.2.0",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "4.4.0"
-      }
-    },
-    "character-parser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
-      "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
-      "dev": true,
-      "requires": {
-        "is-regex": "1.0.4"
-      }
-    },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
-    },
-    "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-      "dev": true,
-      "requires": {
-        "anymatch": "1.3.2",
-        "async-each": "1.0.1",
-        "fsevents": "1.1.2",
-        "glob-parent": "2.0.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "ci-info": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz",
-      "integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==",
-      "dev": true
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
-    "clap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
-      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "clean-css": {
-      "version": "3.4.28",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
-      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
-      "dev": true,
-      "requires": {
-        "commander": "2.8.1",
-        "source-map": "0.4.4"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.8.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-          "dev": true,
-          "requires": {
-            "graceful-readlink": "1.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
-    "cli-cursor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "1.0.1"
-      }
-    },
-    "cli-spinners": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-      "integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
-      "dev": true
-    },
-    "cli-truncate": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz",
-      "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "0.0.4",
-        "string-width": "1.0.2"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "cliui": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-      "dev": true,
-      "requires": {
-        "center-align": "0.1.3",
-        "right-align": "0.1.3",
-        "wordwrap": "0.0.2"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true
-        }
-      }
-    },
-    "clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
-      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
-      "dev": true
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
-    },
-    "coa": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
-      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
-      "dev": true,
-      "requires": {
-        "q": "1.5.0"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "coffee-loader": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/coffee-loader/-/coffee-loader-0.7.3.tgz",
-      "integrity": "sha1-+tvG79b8fsyIxbMEaiwpIGa8tUo=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0"
-      }
-    },
-    "coffee-script": {
-      "version": "1.12.7",
-      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
-      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
-      "dev": true
-    },
-    "color": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-      "dev": true,
-      "requires": {
-        "clone": "1.0.2",
-        "color-convert": "1.9.0",
-        "color-string": "0.3.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "color-string": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "colormin": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
-      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
-      "dev": true,
-      "requires": {
-        "color": "0.11.4",
-        "css-color-names": "0.0.4",
-        "has": "1.0.1"
-      }
-    },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "typedarray": "0.0.6"
-      }
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "0.1.4"
-      }
-    },
-    "consolidate": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz",
-      "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=",
-      "requires": {
-        "bluebird": "3.5.1"
-      }
-    },
-    "constantinople": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz",
-      "integrity": "sha1-dWnKqKo/jVk11i4fqW+fcCzYHHk=",
-      "dev": true,
-      "requires": {
-        "acorn": "3.3.0",
-        "is-expression": "2.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-type-parser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz",
-      "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-      "dev": true
-    },
-    "core-js": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
-      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "cosmiconfig": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-      "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.10.0",
-        "minimist": "1.2.0",
-        "object-assign": "4.1.1",
-        "os-homedir": "1.0.2",
-        "parse-json": "2.2.0",
-        "require-from-string": "1.2.1"
-      }
-    },
-    "create-ecdh": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "elliptic": "6.4.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
-      "dev": true,
-      "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "sha.js": "2.4.9"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
-      "dev": true,
-      "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
-      }
-    },
-    "cross-spawn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.1",
-        "shebang-command": "1.2.0",
-        "which": "1.3.0"
-      }
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "dev": true,
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "dev": true,
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        }
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
-      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "1.0.0",
-        "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.0",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "diffie-hellman": "5.0.2",
-        "inherits": "2.0.3",
-        "pbkdf2": "3.0.14",
-        "public-encrypt": "4.0.0",
-        "randombytes": "2.0.5"
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true
-    },
-    "css-loader": {
-      "version": "0.28.7",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
-      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "css-selector-tokenizer": "0.7.0",
-        "cssnano": "3.10.0",
-        "icss-utils": "2.1.0",
-        "loader-utils": "1.1.0",
-        "lodash.camelcase": "4.3.0",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-modules-extract-imports": "1.1.0",
-        "postcss-modules-local-by-default": "1.2.0",
-        "postcss-modules-scope": "1.1.0",
-        "postcss-modules-values": "1.3.0",
-        "postcss-value-parser": "3.3.0",
-        "source-list-map": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "css-parse": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-      "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
-      "dev": true
-    },
-    "css-selector-tokenizer": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
-      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
-      "dev": true,
-      "requires": {
-        "cssesc": "0.1.0",
-        "fastparse": "1.1.1",
-        "regexpu-core": "1.0.0"
-      },
-      "dependencies": {
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "dev": true,
-          "requires": {
-            "regenerate": "1.3.3",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
-          }
-        }
-      }
-    },
-    "cssesc": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
-      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "6.7.7",
-        "decamelize": "1.2.0",
-        "defined": "1.0.0",
-        "has": "1.0.1",
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-calc": "5.3.1",
-        "postcss-colormin": "2.2.2",
-        "postcss-convert-values": "2.6.1",
-        "postcss-discard-comments": "2.0.4",
-        "postcss-discard-duplicates": "2.1.0",
-        "postcss-discard-empty": "2.1.0",
-        "postcss-discard-overridden": "0.1.1",
-        "postcss-discard-unused": "2.2.3",
-        "postcss-filter-plugins": "2.0.2",
-        "postcss-merge-idents": "2.1.7",
-        "postcss-merge-longhand": "2.0.2",
-        "postcss-merge-rules": "2.1.2",
-        "postcss-minify-font-values": "1.0.5",
-        "postcss-minify-gradients": "1.0.5",
-        "postcss-minify-params": "1.2.2",
-        "postcss-minify-selectors": "2.1.1",
-        "postcss-normalize-charset": "1.1.1",
-        "postcss-normalize-url": "3.0.8",
-        "postcss-ordered-values": "2.2.3",
-        "postcss-reduce-idents": "2.4.0",
-        "postcss-reduce-initial": "1.0.1",
-        "postcss-reduce-transforms": "1.0.4",
-        "postcss-svgo": "2.1.6",
-        "postcss-unique-selectors": "2.0.2",
-        "postcss-value-parser": "3.3.0",
-        "postcss-zindex": "2.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "csso": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
-      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
-      "dev": true,
-      "requires": {
-        "clap": "1.2.3",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz",
-      "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "0.2.37",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
-      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
-      "dev": true,
-      "requires": {
-        "cssom": "0.3.2"
-      }
-    },
-    "d": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true,
-      "requires": {
-        "es5-ext": "0.10.31"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "date-fns": {
-      "version": "1.28.5",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.28.5.tgz",
-      "integrity": "sha1-JXz8RdMi30XvVlhmWWfuhBzXP68=",
-      "dev": true
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
-    "de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
-      "dev": true
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "4.0.3"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true,
-      "requires": {
-        "globby": "5.0.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "rimraf": "2.6.2"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "2.0.1"
-      }
-    },
-    "diff": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-      "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
-      "dev": true
-    },
-    "diffie-hellman": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "miller-rabin": "4.0.1",
-        "randombytes": "2.0.5"
-      }
-    },
-    "doctrine": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
-      "dev": true,
-      "requires": {
-        "esutils": "2.0.2",
-        "isarray": "1.0.0"
-      }
-    },
-    "doctypes": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
-      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk=",
-      "dev": true
-    },
-    "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.1.3",
-        "entities": "1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-          "dev": true
-        }
-      }
-    },
-    "domain-browser": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.3.0"
-      }
-    },
-    "domutils": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
-      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0.1.0",
-        "domelementtype": "1.3.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "jsbn": "0.1.1"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.3.24",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz",
-      "integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=",
-      "dev": true
-    },
-    "elegant-spinner": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz",
-      "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=",
-      "dev": true
-    },
-    "elliptic": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
-      "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.3",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0",
-        "minimalistic-crypto-utils": "1.0.1"
-      }
-    },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
-    },
-    "enhanced-resolve": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
-      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.4.1",
-        "object-assign": "4.1.1",
-        "tapable": "0.2.8"
-      }
-    },
-    "entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
-      "dev": true,
-      "requires": {
-        "prr": "0.0.0"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
-      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "requires": {
-        "is-arrayish": "0.2.1"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.31.tgz",
-      "integrity": "sha1-e7k4yVp/G59ygJLcCcQe3MOY7v4=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
-      "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.31",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "es6-map": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
-      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.31",
-        "es6-iterator": "2.0.1",
-        "es6-set": "0.1.5",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-set": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
-      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.31",
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1",
-        "event-emitter": "0.3.5"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.31"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.31",
-        "es6-iterator": "2.0.1",
-        "es6-symbol": "3.1.1"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
-      "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
-      "dev": true,
-      "requires": {
-        "esprima": "3.1.3",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "optionator": "0.8.2",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "escope": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
-      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true,
-      "requires": {
-        "es6-map": "0.1.5",
-        "es6-weak-map": "2.0.2",
-        "esrecurse": "4.2.0",
-        "estraverse": "4.2.0"
-      }
-    },
-    "eslint": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
-      "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "chalk": "1.1.3",
-        "concat-stream": "1.6.0",
-        "debug": "2.6.9",
-        "doctrine": "2.0.0",
-        "escope": "3.6.0",
-        "espree": "3.5.1",
-        "esquery": "1.0.0",
-        "estraverse": "4.2.0",
-        "esutils": "2.0.2",
-        "file-entry-cache": "2.0.0",
-        "glob": "7.1.2",
-        "globals": "9.18.0",
-        "ignore": "3.3.5",
-        "imurmurhash": "0.1.4",
-        "inquirer": "0.12.0",
-        "is-my-json-valid": "2.16.1",
-        "is-resolvable": "1.0.0",
-        "js-yaml": "3.10.0",
-        "json-stable-stringify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.4",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "pluralize": "1.2.1",
-        "progress": "1.1.8",
-        "require-uncached": "1.0.3",
-        "shelljs": "0.7.8",
-        "strip-bom": "3.0.0",
-        "strip-json-comments": "2.0.1",
-        "table": "3.8.3",
-        "text-table": "0.2.0",
-        "user-home": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-html": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz",
-      "integrity": "sha1-fImIOrDIX6XSi2ZqFKTpBqqQuJc=",
-      "dev": true,
-      "requires": {
-        "htmlparser2": "3.9.2"
-      }
-    },
-    "eslint-plugin-vue-libs": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.2.1.tgz",
-      "integrity": "sha512-GSmpfPqSX4d1Etnuh/w98qLw1voc1HYAF9nqROUTwKVz/d3mJEnuR9rJn8XDzBG1ddErBgO11kLI3TUVMNdJ+A==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-html": "2.0.3"
-      }
-    },
-    "espree": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
-      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
-      "dev": true,
-      "requires": {
-        "acorn": "5.1.2",
-        "acorn-jsx": "3.0.1"
-      }
-    },
-    "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
-    },
-    "esquery": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-      "dev": true,
-      "requires": {
-        "estraverse": "4.2.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
-      "dev": true,
-      "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true
-    },
-    "event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
-      "requires": {
-        "d": "1.0.0",
-        "es5-ext": "0.10.31"
-      }
-    },
-    "events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-      "dev": true
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "1.3.4",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "execa": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
-      "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "5.1.0",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
-      }
-    },
-    "exit-hook": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
-      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-      "dev": true,
-      "requires": {
-        "is-posix-bracket": "0.1.1"
-      }
-    },
-    "expand-range": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-      "dev": true,
-      "requires": {
-        "fill-range": "2.2.3"
-      }
-    },
-    "expose-loader": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.3.tgz",
-      "integrity": "sha1-NfvTZZeJ5PqoH1nei36fw55GbVE=",
-      "dev": true
-    },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-      "dev": true
-    },
-    "extglob": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "1.0.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        }
-      }
-    },
-    "extract-text-webpack-plugin": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.1.tgz",
-      "integrity": "sha512-zv0/Cg2mU8uMzeQQ3oyfJvZU4Iv/GbQYUIr/HU+8pZetT/0W3xj6XAbxoG4gsp8SbnYcFd4BOsCAZPl9NvplPw==",
-      "dev": true,
-      "requires": {
-        "async": "2.5.0",
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0",
-        "webpack-sources": "1.0.1"
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fastparse": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
-      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
-      "dev": true
-    },
-    "figures": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "1.0.5",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
-      "requires": {
-        "flat-cache": "1.3.0",
-        "object-assign": "4.1.1"
-      }
-    },
-    "file-loader": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz",
-      "integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0"
-      }
-    },
-    "filename-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-      "dev": true,
-      "requires": {
-        "is-number": "2.1.0",
-        "isobject": "2.1.0",
-        "randomatic": "1.1.7",
-        "repeat-element": "1.1.2",
-        "repeat-string": "1.6.1"
-      }
-    },
-    "find-cache-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
-      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
-      "dev": true,
-      "requires": {
-        "commondir": "1.0.1",
-        "make-dir": "1.0.0",
-        "pkg-dir": "2.0.0"
-      }
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "requires": {
-        "locate-path": "2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
-      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
-      "dev": true,
-      "requires": {
-        "circular-json": "0.3.3",
-        "del": "2.2.2",
-        "graceful-fs": "4.1.11",
-        "write": "0.2.1"
-      }
-    },
-    "flatten": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
-      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "requires": {
-        "for-in": "1.0.2"
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-      "dev": true,
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.17"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
-      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "2.7.0",
-        "node-pre-gyp": "0.6.36"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ajv": {
-          "version": "4.11.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "co": "4.6.0",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.2.9"
-          }
-        },
-        "asn1": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "assert-plus": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "asynckit": {
-          "version": "0.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws-sign2": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aws4": {
-          "version": "1.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "balanced-match": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true
-        },
-        "bcrypt-pbkdf": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "tweetnacl": "0.14.5"
-          }
-        },
-        "block-stream": {
-          "version": "0.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        },
-        "boom": {
-          "version": "2.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "brace-expansion": {
-          "version": "1.1.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "balanced-match": "0.4.2",
-            "concat-map": "0.0.1"
-          }
-        },
-        "buffer-shims": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "caseless": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "co": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "combined-stream": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "delayed-stream": "1.0.0"
-          }
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "cryptiles": {
-          "version": "2.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1"
-          }
-        },
-        "dashdash": {
-          "version": "1.14.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.4.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delayed-stream": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ecc-jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "extend": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "extsprintf": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "forever-agent": {
-          "version": "0.6.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "form-data": {
-          "version": "2.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
-            "mime-types": "2.1.15"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "inherits": "2.0.3",
-            "mkdirp": "0.5.1",
-            "rimraf": "2.6.1"
-          }
-        },
-        "fstream-ignore": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fstream": "1.0.11",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4"
-          }
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "1.1.1",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
-          }
-        },
-        "getpass": {
-          "version": "0.1.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "har-schema": {
-          "version": "1.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "har-validator": {
-          "version": "4.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ajv": "4.11.8",
-            "har-schema": "1.0.5"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "hawk": {
-          "version": "3.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "boom": "2.10.1",
-            "cryptiles": "2.0.5",
-            "hoek": "2.16.3",
-            "sntp": "1.0.9"
-          }
-        },
-        "hoek": {
-          "version": "2.16.3",
-          "bundled": true,
-          "dev": true
-        },
-        "http-signature": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "0.2.0",
-            "jsprim": "1.4.0",
-            "sshpk": "1.13.0"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "number-is-nan": "1.0.1"
-          }
-        },
-        "is-typedarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "isstream": {
-          "version": "0.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jodid25519": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsbn": "0.1.1"
-          }
-        },
-        "jsbn": {
-          "version": "0.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-schema": {
-          "version": "0.2.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "json-stable-stringify": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "jsonify": "0.0.0"
-          }
-        },
-        "json-stringify-safe": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsonify": {
-          "version": "0.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "jsprim": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "assert-plus": "1.0.0",
-            "extsprintf": "1.0.2",
-            "json-schema": "0.2.3",
-            "verror": "1.3.6"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "mime-db": {
-          "version": "1.27.0",
-          "bundled": true,
-          "dev": true
-        },
-        "mime-types": {
-          "version": "2.1.15",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mime-db": "1.27.0"
-          }
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "node-pre-gyp": {
-          "version": "0.6.36",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "mkdirp": "0.5.1",
-            "nopt": "4.0.1",
-            "npmlog": "4.1.0",
-            "rc": "1.2.1",
-            "request": "2.81.0",
-            "rimraf": "2.6.1",
-            "semver": "5.3.0",
-            "tar": "2.2.1",
-            "tar-pack": "3.4.0"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1.1.0",
-            "osenv": "0.1.4"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "1.1.4",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "oauth-sign": {
-          "version": "0.8.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "performance-now": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "qs": {
-          "version": "6.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "0.4.2",
-            "ini": "1.3.4",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "buffer-shims": "1.0.0",
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "string_decoder": "1.0.1",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aws-sign2": "0.6.0",
-            "aws4": "1.6.0",
-            "caseless": "0.12.0",
-            "combined-stream": "1.0.5",
-            "extend": "3.0.1",
-            "forever-agent": "0.6.1",
-            "form-data": "2.1.4",
-            "har-validator": "4.2.1",
-            "hawk": "3.1.3",
-            "http-signature": "1.1.1",
-            "is-typedarray": "1.0.0",
-            "isstream": "0.1.2",
-            "json-stringify-safe": "5.0.1",
-            "mime-types": "2.1.15",
-            "oauth-sign": "0.8.2",
-            "performance-now": "0.2.0",
-            "qs": "6.4.0",
-            "safe-buffer": "5.0.1",
-            "stringstream": "0.0.5",
-            "tough-cookie": "2.3.2",
-            "tunnel-agent": "0.6.0",
-            "uuid": "3.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "7.1.2"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sntp": {
-          "version": "1.0.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "hoek": "2.16.3"
-          }
-        },
-        "sshpk": {
-          "version": "1.13.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "asn1": "0.2.3",
-            "assert-plus": "1.0.0",
-            "bcrypt-pbkdf": "1.0.1",
-            "dashdash": "1.14.1",
-            "ecc-jsbn": "0.1.1",
-            "getpass": "0.1.7",
-            "jodid25519": "1.0.2",
-            "jsbn": "0.1.1",
-            "tweetnacl": "0.14.5"
-          },
-          "dependencies": {
-            "assert-plus": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
-          }
-        },
-        "stringstream": {
-          "version": "0.0.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "2.1.1"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "0.0.9",
-            "fstream": "1.0.11",
-            "inherits": "2.0.3"
-          }
-        },
-        "tar-pack": {
-          "version": "3.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "2.6.8",
-            "fstream": "1.0.11",
-            "fstream-ignore": "1.0.5",
-            "once": "1.4.0",
-            "readable-stream": "2.2.9",
-            "rimraf": "2.6.1",
-            "tar": "2.2.1",
-            "uid-number": "0.0.6"
-          }
-        },
-        "tough-cookie": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "punycode": "1.4.1"
-          }
-        },
-        "tunnel-agent": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
-        "tweetnacl": {
-          "version": "0.14.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "uuid": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "verror": {
-          "version": "1.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "extsprintf": "1.0.2"
-          }
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "dev": true,
-      "requires": {
-        "is-property": "1.0.2"
-      }
-    },
-    "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-      "dev": true
-    },
-    "get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
-      "dev": true
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz",
-      "integrity": "sha512-TtY/sbOemiMKPRUDDanGCSgBYe7Mf0vbRsWnBZ+9yghpZ1MvcpSpuZFjHdEeY/LZjZy0vdLjS77L6HosisFiug==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "gitbook-plugin-edit-link": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz",
-      "integrity": "sha1-2PzZJ+ztgeemYqctWdtgnq/X5y8=",
-      "dev": true
-    },
-    "gitbook-plugin-github": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gitbook-plugin-github/-/gitbook-plugin-github-3.0.0.tgz",
-      "integrity": "sha1-Z0V9+YpX6o75slGLiDQNs3ClMXs=",
-      "dev": true
-    },
-    "gitbook-plugin-theme-vuejs": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/gitbook-plugin-theme-vuejs/-/gitbook-plugin-theme-vuejs-1.1.0.tgz",
-      "integrity": "sha512-PxFkLJdhowOP0hQhafSZ05sMegCpr1GSNnMe9RilXNB2Vz2XG2WtHITNGmemM4WpULLhWCT1WTqyLodwBwqFEA==",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-      "dev": true,
-      "requires": {
-        "glob-parent": "2.0.0",
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-      "dev": true,
-      "requires": {
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
-    },
-    "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true,
-      "requires": {
-        "array-union": "1.0.2",
-        "arrify": "1.0.1",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-      "dev": true
-    },
-    "growl": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
-      "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
-      "dev": true
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "dev": true,
-      "requires": {
-        "ajv": "5.2.3",
-        "har-schema": "2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.2.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        }
-      }
-    },
-    "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "dev": true,
-      "requires": {
-        "function-bind": "1.1.1"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
-    },
-    "hash-base": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      }
-    },
-    "hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ="
-    },
-    "hash.js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "dev": true,
-      "requires": {
-        "boom": "4.3.1",
-        "cryptiles": "3.1.2",
-        "hoek": "4.2.0",
-        "sntp": "2.0.2"
-      }
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "1.1.3",
-        "minimalistic-assert": "1.0.0",
-        "minimalistic-crypto-utils": "1.0.1"
-      }
-    },
-    "hoek": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-      "dev": true
-    },
-    "home-or-tmp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
-      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-      "dev": true
-    },
-    "html-comment-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
-      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
-      "dev": true
-    },
-    "html-encoding-sniffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz",
-      "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "1.0.1"
-      }
-    },
-    "htmlparser2": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1.3.0",
-        "domhandler": "2.4.1",
-        "domutils": "1.6.2",
-        "entities": "1.1.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
-      }
-    },
-    "https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
-      "dev": true
-    },
-    "husky": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-0.14.3.tgz",
-      "integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
-      "dev": true,
-      "requires": {
-        "is-ci": "1.0.10",
-        "normalize-path": "1.0.0",
-        "strip-indent": "2.0.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz",
-      "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=",
-      "dev": true
-    },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-      "dev": true
-    },
-    "icss-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
-      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
-      "dev": true,
-      "requires": {
-        "postcss": "6.0.13"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
-      "dev": true
-    },
-    "ignore": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
-      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
-      "dev": true
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "2.0.1"
-      }
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "inject-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/inject-loader/-/inject-loader-3.0.1.tgz",
-      "integrity": "sha512-0Kd4NqMJUhknG4ECiJ/mgyHJBpfBBWZ3IKHl2BLNQiFtMO7/xiv9mmHl7mGvE0iKrBeQAZdMcQP3sMXZN0cqeg==",
-      "dev": true,
-      "requires": {
-        "babel-core": "6.26.0"
-      }
-    },
-    "inquirer": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
-      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "1.4.0",
-        "ansi-regex": "2.1.1",
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "cli-width": "2.2.0",
-        "figures": "1.7.0",
-        "lodash": "4.17.4",
-        "readline2": "1.0.1",
-        "run-async": "0.1.0",
-        "rx-lite": "3.1.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "through": "2.3.8"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "interpret": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
-      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
-      "dev": true
-    },
-    "invariant": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
-      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-      "dev": true,
-      "requires": {
-        "loose-envify": "1.3.1"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "dev": true
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "1.10.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
-      "dev": true
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
-      "requires": {
-        "builtin-modules": "1.1.1"
-      }
-    },
-    "is-ci": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz",
-      "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
-      "dev": true,
-      "requires": {
-        "ci-info": "1.1.1"
-      }
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-      "dev": true
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "dev": true,
-      "requires": {
-        "is-primitive": "2.0.0"
-      }
-    },
-    "is-expression": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz",
-      "integrity": "sha1-kb6dR968/vB3l36XIr5tz7RGXvA=",
-      "dev": true,
-      "requires": {
-        "acorn": "3.3.0",
-        "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "1.0.1"
-      }
-    },
-    "is-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "2.1.1"
-      }
-    },
-    "is-my-json-valid": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
-      "dev": true,
-      "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
-      }
-    },
-    "is-number": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-      "dev": true,
-      "requires": {
-        "kind-of": "3.2.2"
-      }
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "1.0.2"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-      "dev": true
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-      "dev": true
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1"
-      }
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
-      "dev": true
-    },
-    "is-resolvable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-      "dev": true,
-      "requires": {
-        "tryit": "1.0.3"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
-    },
-    "is-svg": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
-      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "1.1.1"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "requires": {
-        "isarray": "1.0.0"
-      }
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "jest-get-type": {
-      "version": "21.2.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz",
-      "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==",
-      "dev": true
-    },
-    "jest-validate": {
-      "version": "21.2.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-21.2.1.tgz",
-      "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==",
-      "dev": true,
-      "requires": {
-        "chalk": "2.1.0",
-        "jest-get-type": "21.2.0",
-        "leven": "2.1.0",
-        "pretty-format": "21.2.1"
-      }
-    },
-    "js-base64": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
-      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
-      "dev": true
-    },
-    "js-stringify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
-      "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
-      "requires": {
-        "argparse": "1.0.9",
-        "esprima": "4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
-    },
-    "jsdom": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz",
-      "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=",
-      "dev": true,
-      "requires": {
-        "abab": "1.0.4",
-        "acorn": "4.0.13",
-        "acorn-globals": "3.1.0",
-        "array-equal": "1.0.0",
-        "content-type-parser": "1.0.1",
-        "cssom": "0.3.2",
-        "cssstyle": "0.2.37",
-        "escodegen": "1.9.0",
-        "html-encoding-sniffer": "1.0.1",
-        "nwmatcher": "1.4.2",
-        "parse5": "1.5.1",
-        "request": "2.83.0",
-        "sax": "1.2.4",
-        "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.3",
-        "webidl-conversions": "4.0.2",
-        "whatwg-encoding": "1.0.1",
-        "whatwg-url": "4.8.0",
-        "xml-name-validator": "2.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        }
-      }
-    },
-    "jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-      "dev": true
-    },
-    "json-loader": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true
-    },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "dev": true,
-      "requires": {
-        "jsonify": "0.0.0"
-      }
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
-    },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "jstransformer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
-      "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
-      "dev": true,
-      "requires": {
-        "is-promise": "2.1.0",
-        "promise": "7.3.1"
-      }
-    },
-    "kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-      "dev": true,
-      "requires": {
-        "is-buffer": "1.1.5"
-      }
-    },
-    "lazy-cache": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-      "dev": true
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "1.0.0"
-      }
-    },
-    "leven": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
-      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
-      }
-    },
-    "lint-staged": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.2.3.tgz",
-      "integrity": "sha512-Ks1vMyVpp3ldeFDN9sIcHcFDh0v3X6Y6LOdT0Wl86/BSDM2R8PVcuFODkh0Dav7Ni/asUPKONfXRWZM9YO85IQ==",
-      "dev": true,
-      "requires": {
-        "app-root-path": "2.0.1",
-        "chalk": "2.1.0",
-        "cosmiconfig": "1.1.0",
-        "execa": "0.8.0",
-        "is-glob": "4.0.0",
-        "jest-validate": "21.2.1",
-        "listr": "0.12.0",
-        "lodash": "4.17.4",
-        "log-symbols": "2.1.0",
-        "minimatch": "3.0.4",
-        "npm-which": "3.0.1",
-        "p-map": "1.2.0",
-        "staged-git-files": "0.0.4",
-        "stringify-object": "3.2.1"
-      },
-      "dependencies": {
-        "cosmiconfig": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-1.1.0.tgz",
-          "integrity": "sha1-DeoPmATv37kp+7GxiOJVU+oFPTc=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.1.11",
-            "js-yaml": "3.10.0",
-            "minimist": "1.2.0",
-            "object-assign": "4.1.1",
-            "os-homedir": "1.0.2",
-            "parse-json": "2.2.0",
-            "pinkie-promise": "2.0.1",
-            "require-from-string": "1.2.1"
-          }
-        }
-      }
-    },
-    "listr": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
-      "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "cli-truncate": "0.2.1",
-        "figures": "1.7.0",
-        "indent-string": "2.1.0",
-        "is-promise": "2.1.0",
-        "is-stream": "1.1.0",
-        "listr-silent-renderer": "1.1.1",
-        "listr-update-renderer": "0.2.0",
-        "listr-verbose-renderer": "0.4.0",
-        "log-symbols": "1.0.2",
-        "log-update": "1.0.2",
-        "ora": "0.2.3",
-        "p-map": "1.2.0",
-        "rxjs": "5.4.3",
-        "stream-to-observable": "0.1.0",
-        "strip-ansi": "3.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "log-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-          "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "listr-silent-renderer": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz",
-      "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=",
-      "dev": true
-    },
-    "listr-update-renderer": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
-      "integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "cli-truncate": "0.2.1",
-        "elegant-spinner": "1.0.1",
-        "figures": "1.7.0",
-        "indent-string": "3.2.0",
-        "log-symbols": "1.0.2",
-        "log-update": "1.0.2",
-        "strip-ansi": "3.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "indent-string": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
-          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
-          "dev": true
-        },
-        "log-symbols": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-          "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "listr-verbose-renderer": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.0.tgz",
-      "integrity": "sha1-RNwBuww0oDxXIVTU0Izemx3FYg8=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "date-fns": "1.28.5",
-        "figures": "1.7.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "strip-bom": "3.0.0"
-      }
-    },
-    "loader-runner": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
-      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-      "requires": {
-        "big.js": "3.2.0",
-        "emojis-list": "2.1.0",
-        "json5": "0.5.1"
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "dev": true
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.template": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
-      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "3.0.0",
-        "lodash.templatesettings": "4.1.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
-      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "3.0.0"
-      }
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz",
-      "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "2.1.0"
-      }
-    },
-    "log-update": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
-      "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "1.4.0",
-        "cli-cursor": "1.0.2"
-      }
-    },
-    "longest": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
-      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-      "dev": true,
-      "requires": {
-        "js-tokens": "3.0.2"
-      }
-    },
-    "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-      "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
-      }
-    },
-    "macaddress": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
-      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
-      "dev": true
-    },
-    "make-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
-      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
-      "dev": true,
-      "requires": {
-        "pify": "2.3.0"
-      }
-    },
-    "marked": {
-      "version": "0.3.12",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz",
-      "integrity": "sha512-k4NaW+vS7ytQn6MgJn3fYpQt20/mOgYM5Ft9BYMfQJDz2QT6yEeS9XJ8k2Nw8JTeWK/znPPW2n3UJGzyYEiMoA==",
-      "dev": true
-    },
-    "math-expression-evaluator": {
-      "version": "1.2.17",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
-      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
-      "dev": true
-    },
-    "md5.js": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-      "dev": true,
-      "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "hash-base": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3",
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
-    },
-    "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "1.1.0"
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "0.1.4",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "micromatch": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-      "dev": true,
-      "requires": {
-        "arr-diff": "2.0.0",
-        "array-unique": "0.2.1",
-        "braces": "1.8.5",
-        "expand-brackets": "0.1.5",
-        "extglob": "0.3.2",
-        "filename-regex": "2.0.1",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1",
-        "kind-of": "3.2.2",
-        "normalize-path": "2.1.1",
-        "object.omit": "2.0.1",
-        "parse-glob": "3.0.4",
-        "regex-cache": "0.4.4"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "1.1.0"
-          }
-        }
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0"
-      }
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.30.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
-      "dev": true
-    },
-    "minimalistic-assert": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "1.1.8"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "mocha": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",
-      "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.0",
-        "commander": "2.11.0",
-        "debug": "3.1.0",
-        "diff": "3.3.1",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.3",
-        "he": "1.1.1",
-        "mkdirp": "0.5.1",
-        "supports-color": "4.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
-      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
-      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
-      "dev": true,
-      "optional": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node-libs-browser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
-      "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",
-      "dev": true,
-      "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.1.4",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.11.1",
-        "domain-browser": "1.1.7",
-        "events": "1.1.1",
-        "https-browserify": "0.0.1",
-        "os-browserify": "0.2.1",
-        "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.3",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.7.2",
-        "string_decoder": "0.10.31",
-        "timers-browserify": "2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "normalize-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-newline/-/normalize-newline-3.0.0.tgz",
-      "integrity": "sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM=",
-      "dev": true
-    },
-    "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "2.5.0",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
-        "validate-npm-package-license": "3.0.1"
-      }
-    },
-    "normalize-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-      "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=",
-      "dev": true
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
-    },
-    "normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
-      }
-    },
-    "npm-path": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.3.tgz",
-      "integrity": "sha1-Fc/04ciaONp39W9gVbJPl137K74=",
-      "dev": true,
-      "requires": {
-        "which": "1.3.0"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "requires": {
-        "path-key": "2.0.1"
-      }
-    },
-    "npm-which": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz",
-      "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
-      "dev": true,
-      "requires": {
-        "commander": "2.11.0",
-        "npm-path": "2.0.3",
-        "which": "1.3.0"
-      }
-    },
-    "null-loader": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz",
-      "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=",
-      "dev": true
-    },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "nwmatcher": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.2.tgz",
-      "integrity": "sha512-QMkCGQFYp5p+zwU3INntLmz1HMfSx9dMVJMYKmE1yuSf/22Wjo6VPFa405mCLUuQn9lbQvH2DZN9lt10ZNvtAg==",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-      "dev": true,
-      "requires": {
-        "for-own": "0.1.5",
-        "is-extendable": "0.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1.0.2"
-      }
-    },
-    "onetime": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-      "dev": true
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
-      }
-    },
-    "ora": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
-      "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "cli-cursor": "1.0.2",
-        "cli-spinners": "0.1.2",
-        "object-assign": "4.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "os-browserify": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
-      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
-    "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-      "dev": true,
-      "requires": {
-        "execa": "0.7.0",
-        "lcid": "1.0.0",
-        "mem": "1.1.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "5.1.0",
-            "get-stream": "3.0.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
-          }
-        }
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
-      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
-      "dev": true
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "1.1.0"
-      }
-    },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-      "dev": true
-    },
-    "pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
-      "dev": true
-    },
-    "parse-asn1": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
-      "dev": true,
-      "requires": {
-        "asn1.js": "4.9.1",
-        "browserify-aes": "1.0.8",
-        "create-hash": "1.1.3",
-        "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.14"
-      }
-    },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-      "dev": true,
-      "requires": {
-        "glob-base": "0.3.0",
-        "is-dotfile": "1.0.3",
-        "is-extglob": "1.0.0",
-        "is-glob": "2.0.1"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "requires": {
-        "error-ex": "1.3.1"
-      }
-    },
-    "parse5": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
-    },
-    "path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "dev": true,
-      "requires": {
-        "pify": "2.3.0"
-      }
-    },
-    "pathval": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
-      "dev": true
-    },
-    "pbkdf2": {
-      "version": "3.0.14",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-      "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "ripemd160": "2.0.1",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "2.0.4"
-      }
-    },
-    "pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "requires": {
-        "find-up": "2.1.0"
-      }
-    },
-    "pluralize": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
-      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
-      "dev": true
-    },
-    "postcss": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",
-      "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",
-      "requires": {
-        "chalk": "2.1.0",
-        "source-map": "0.6.1",
-        "supports-color": "4.4.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "postcss-calc": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
-      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "postcss-message-helpers": "2.0.0",
-        "reduce-css-calc": "1.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-colormin": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
-      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
-      "dev": true,
-      "requires": {
-        "colormin": "1.1.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-convert-values": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
-      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
-      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-duplicates": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
-      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-empty": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
-      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-overridden": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
-      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-discard-unused": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
-      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-filter-plugins": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
-      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "uniqid": "4.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-load-config": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1",
-        "postcss-load-options": "1.2.0",
-        "postcss-load-plugins": "2.3.0"
-      }
-    },
-    "postcss-load-options": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-load-plugins": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-      "requires": {
-        "cosmiconfig": "2.2.2",
-        "object-assign": "4.1.1"
-      }
-    },
-    "postcss-merge-idents": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
-      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-longhand": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
-      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
-      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
-      "dev": true,
-      "requires": {
-        "browserslist": "1.7.7",
-        "caniuse-api": "1.6.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "browserslist": {
-          "version": "1.7.7",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
-          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
-          "dev": true,
-          "requires": {
-            "caniuse-db": "1.0.30000745",
-            "electron-to-chromium": "1.3.24"
-          }
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-      "dev": true
-    },
-    "postcss-minify-font-values": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
-      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
-      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
-      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "uniqs": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
-      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "1.0.2",
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-selector-parser": "2.2.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-      "dev": true,
-      "requires": {
-        "postcss": "6.0.13"
-      }
-    },
-    "postcss-modules-local-by-default": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
-      "dev": true,
-      "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.13"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
-      "dev": true,
-      "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.13"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
-      "dev": true,
-      "requires": {
-        "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.13"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
-      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
-      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
-      "dev": true,
-      "requires": {
-        "is-absolute-url": "2.1.0",
-        "normalize-url": "1.9.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
-      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-idents": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
-      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
-      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
-      "dev": true,
-      "requires": {
-        "postcss": "5.2.18"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
-      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "requires": {
-        "flatten": "1.0.2",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
-      }
-    },
-    "postcss-svgo": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
-      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
-      "dev": true,
-      "requires": {
-        "is-svg": "2.1.0",
-        "postcss": "5.2.18",
-        "postcss-value-parser": "3.3.0",
-        "svgo": "0.7.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
-      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "1.0.2",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "postcss-value-parser": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
-      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
-      "dev": true
-    },
-    "postcss-zindex": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
-      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
-      "dev": true,
-      "requires": {
-        "has": "1.0.1",
-        "postcss": "5.2.18",
-        "uniqs": "2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "5.2.18",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
-          "dev": true,
-          "requires": {
-            "chalk": "1.1.3",
-            "js-base64": "2.3.2",
-            "source-map": "0.5.7",
-            "supports-color": "3.2.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "1.0.0"
-          }
-        }
-      }
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-      "dev": true
-    },
-    "preserve": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-      "dev": true
-    },
-    "prettier": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.7.4.tgz",
-      "integrity": "sha1-XoYkrpNjyA+V7GRFhOzfVddPk/o="
-    },
-    "pretty-format": {
-      "version": "21.2.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-21.2.1.tgz",
-      "integrity": "sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "3.0.0",
-        "ansi-styles": "3.2.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        }
-      }
-    },
-    "private": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-      "dev": true
-    },
-    "progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
-      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
-      "dev": true
-    },
-    "promise": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dev": true,
-      "requires": {
-        "asap": "2.0.6"
-      }
-    },
-    "prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
-      "dev": true
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
-    },
-    "public-encrypt": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
-      "dev": true,
-      "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "parse-asn1": "5.1.0",
-        "randombytes": "2.0.5"
-      }
-    },
-    "pug": {
-      "version": "2.0.0-rc.4",
-      "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz",
-      "integrity": "sha512-SL7xovj6E2Loq9N0UgV6ynjMLW4urTFY/L/Fprhvz13Xc5vjzkjZjI1QHKq31200+6PSD8PyU6MqrtCTJj6/XA==",
-      "dev": true,
-      "requires": {
-        "pug-code-gen": "2.0.0",
-        "pug-filters": "2.1.5",
-        "pug-lexer": "3.1.0",
-        "pug-linker": "3.0.3",
-        "pug-load": "2.0.9",
-        "pug-parser": "4.0.0",
-        "pug-runtime": "2.0.3",
-        "pug-strip-comments": "1.0.2"
-      }
-    },
-    "pug-attrs": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz",
-      "integrity": "sha1-i+KyIlVo/6ddG4Zpgr/59BEa/8s=",
-      "dev": true,
-      "requires": {
-        "constantinople": "3.1.0",
-        "js-stringify": "1.0.2",
-        "pug-runtime": "2.0.3"
-      }
-    },
-    "pug-code-gen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz",
-      "integrity": "sha512-E4oiJT+Jn5tyEIloj8dIJQognbiNNp0i0cAJmYtQTFS0soJ917nlIuFtqVss3IXMEyQKUew3F4gIkBpn18KbVg==",
-      "dev": true,
-      "requires": {
-        "constantinople": "3.1.0",
-        "doctypes": "1.1.0",
-        "js-stringify": "1.0.2",
-        "pug-attrs": "2.0.2",
-        "pug-error": "1.3.2",
-        "pug-runtime": "2.0.3",
-        "void-elements": "2.0.1",
-        "with": "5.1.1"
-      }
-    },
-    "pug-error": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz",
-      "integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY=",
-      "dev": true
-    },
-    "pug-filters": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz",
-      "integrity": "sha512-xkw71KtrC4sxleKiq+cUlQzsiLn8pM5+vCgkChW2E6oNOzaqTSIBKIQ5cl4oheuDzvJYCTSYzRaVinMUrV4YLQ==",
-      "dev": true,
-      "requires": {
-        "clean-css": "3.4.28",
-        "constantinople": "3.1.0",
-        "jstransformer": "1.0.0",
-        "pug-error": "1.3.2",
-        "pug-walk": "1.1.5",
-        "resolve": "1.4.0",
-        "uglify-js": "2.8.29"
-      }
-    },
-    "pug-lexer": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
-      "integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
-      "dev": true,
-      "requires": {
-        "character-parser": "2.2.0",
-        "is-expression": "3.0.0",
-        "pug-error": "1.3.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "4.0.13",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-          "dev": true
-        },
-        "is-expression": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
-          "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
-          "dev": true,
-          "requires": {
-            "acorn": "4.0.13",
-            "object-assign": "4.1.1"
-          }
-        }
-      }
-    },
-    "pug-linker": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz",
-      "integrity": "sha512-DCKczglCXOzJ1lr4xUj/lVHYvS+lGmR2+KTCjZjtIpdwaN7lNOoX2SW6KFX5X4ElvW+6ThwB+acSUg08UJFN5A==",
-      "dev": true,
-      "requires": {
-        "pug-error": "1.3.2",
-        "pug-walk": "1.1.5"
-      }
-    },
-    "pug-load": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz",
-      "integrity": "sha512-BDdZOCru4mg+1MiZwRQZh25+NTRo/R6/qArrdWIf308rHtWA5N9kpoUskRe4H6FslaQujC+DigH9LqlBA4gf6Q==",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "pug-walk": "1.1.5"
-      }
-    },
-    "pug-parser": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz",
-      "integrity": "sha512-ocEUFPdLG9awwFj0sqi1uiZLNvfoodCMULZzkRqILryIWc/UUlDlxqrKhKjAIIGPX/1SNsvxy63+ayEGocGhQg==",
-      "dev": true,
-      "requires": {
-        "pug-error": "1.3.2",
-        "token-stream": "0.0.1"
-      }
-    },
-    "pug-runtime": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz",
-      "integrity": "sha1-mBYmB7D86eJU1CfzOYelrucWi9o=",
-      "dev": true
-    },
-    "pug-strip-comments": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz",
-      "integrity": "sha1-0xOvoBvMN0mA4TmeI+vy65vchRM=",
-      "dev": true,
-      "requires": {
-        "pug-error": "1.3.2"
-      }
-    },
-    "pug-walk": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz",
-      "integrity": "sha512-rJlH1lXerCIAtImXBze3dtKq/ykZMA4rpO9FnPcIgsWcxZLOvd8zltaoeOVFyBSSqCkhhJWbEbTMga8UxWUUSA==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-      "dev": true
-    },
-    "query-string": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
-      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
-      "dev": true,
-      "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
-      }
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-      "dev": true,
-      "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "3.2.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "1.1.5"
-              }
-            }
-          }
-        },
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        }
-      }
-    },
-    "randombytes": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "raw-loader": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
-      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-      "dev": true
-    },
-    "read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "2.0.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "2.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "dev": true,
-      "requires": {
-        "find-up": "2.1.0",
-        "read-pkg": "2.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
-      }
-    },
-    "readdirp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
-        "set-immediate-shim": "1.0.1"
-      }
-    },
-    "readline2": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
-      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "mute-stream": "0.0.5"
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "1.4.0"
-      }
-    },
-    "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "0.4.2",
-        "math-expression-evaluator": "1.2.17",
-        "reduce-function-call": "1.0.2"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "dev": true
-        }
-      }
-    },
-    "reduce-function-call": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
-      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
-      "dev": true,
-      "requires": {
-        "balanced-match": "0.4.2"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-          "dev": true
-        }
-      }
-    },
-    "regenerate": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
-      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
-      "dev": true
-    },
-    "regenerator-runtime": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-      "dev": true
-    },
-    "regenerator-transform": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "6.26.0",
-        "babel-types": "6.26.0",
-        "private": "0.1.7"
-      }
-    },
-    "regex-cache": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-      "dev": true,
-      "requires": {
-        "is-equal-shallow": "0.1.3"
-      }
-    },
-    "regexpu-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
-      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
-      "requires": {
-        "regenerate": "1.3.3",
-        "regjsgen": "0.2.0",
-        "regjsparser": "0.1.5"
-      }
-    },
-    "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
-      "requires": {
-        "jsesc": "0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "1.0.2"
-      }
-    },
-    "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.1",
-        "har-validator": "5.0.3",
-        "hawk": "6.0.2",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.1",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.1.0"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-from-string": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg="
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "0.1.0",
-        "resolve-from": "1.0.1"
-      }
-    },
-    "resolve": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
-      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
-      "requires": {
-        "path-parse": "1.0.5"
-      }
-    },
-    "resolve-from": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-      "dev": true,
-      "requires": {
-        "exit-hook": "1.1.1",
-        "onetime": "1.1.0"
-      }
-    },
-    "right-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-      "dev": true,
-      "requires": {
-        "align-text": "0.1.4"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
-      "dev": true,
-      "requires": {
-        "hash-base": "2.0.2",
-        "inherits": "2.0.3"
-      }
-    },
-    "run-async": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
-      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-      "dev": true,
-      "requires": {
-        "once": "1.4.0"
-      }
-    },
-    "rx-lite": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
-      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
-      "dev": true
-    },
-    "rxjs": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz",
-      "integrity": "sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==",
-      "dev": true,
-      "requires": {
-        "symbol-observable": "1.0.4"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-      "dev": true
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-      "dev": true,
-      "requires": {
-        "ajv": "5.2.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.2.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        }
-      }
-    },
-    "semver": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-      "dev": true
-    },
-    "serialize-javascript": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz",
-      "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=",
-      "dev": true
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
-      "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "shelljs": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
-      "dev": true,
-      "requires": {
-        "glob": "7.1.2",
-        "interpret": "1.0.4",
-        "rechoir": "0.6.2"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "skeleton-loader": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/skeleton-loader/-/skeleton-loader-1.1.3.tgz",
-      "integrity": "sha1-DEmgiLdLi0hELeViBgWa0F5a+fA=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0"
-      }
-    },
-    "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
-      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
-      "dev": true
-    },
-    "sntp": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
-      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
-      "dev": true,
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
-    "sort-keys": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
-      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
-      "dev": true,
-      "requires": {
-        "is-plain-obj": "1.1.0"
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "dev": true,
-      "requires": {
-        "spdx-license-ids": "1.2.2"
-      }
-    },
-    "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-      "dev": true
-    },
-    "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-      "dev": true
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "dev": true,
-      "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "staged-git-files": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-0.0.4.tgz",
-      "integrity": "sha1-15fhtVHKemOd7AI33G60u5vhfTU=",
-      "dev": true
-    },
-    "stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
-      }
-    },
-    "stream-http": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
-      }
-    },
-    "stream-to-observable": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
-      "integrity": "sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=",
-      "dev": true
-    },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "stringify-object": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.1.tgz",
-      "integrity": "sha512-jPcQYw/52HUPP8uOE4kkjxl5bB9LfHkKCTptIk3qw7ozP5XMIMlHMLjt00GGSwW6DJAf/njY5EU6Vpwl4LlBKQ==",
-      "dev": true,
-      "requires": {
-        "get-own-enumerable-property-symbols": "2.0.1",
-        "is-obj": "1.0.1",
-        "is-regexp": "1.0.0"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-      "dev": true
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "2.1.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "strip-indent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
-      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "stylus": {
-      "version": "0.54.5",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
-      "dev": true,
-      "requires": {
-        "css-parse": "1.7.0",
-        "debug": "2.6.9",
-        "glob": "7.0.6",
-        "mkdirp": "0.5.1",
-        "sax": "0.5.8",
-        "source-map": "0.1.43"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.0.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
-          }
-        },
-        "sax": {
-          "version": "0.5.8",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": "1.0.1"
-          }
-        }
-      }
-    },
-    "stylus-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.1.tgz",
-      "integrity": "sha1-d/SzT9Aw0lsmF7z1UT21sHMMQIk=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "lodash.clonedeep": "4.5.0",
-        "when": "3.6.4"
-      }
-    },
-    "sugarss": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.0.tgz",
-      "integrity": "sha1-ZeUbOVhDL7cNVFGmi7M+MtDPHvc=",
-      "dev": true,
-      "requires": {
-        "postcss": "6.0.13"
-      }
-    },
-    "supports-color": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-      "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
-      "requires": {
-        "has-flag": "2.0.0"
-      }
-    },
-    "svgo": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
-      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
-      "dev": true,
-      "requires": {
-        "coa": "1.0.4",
-        "colors": "1.1.2",
-        "csso": "2.3.2",
-        "js-yaml": "3.7.0",
-        "mkdirp": "0.5.1",
-        "sax": "1.2.4",
-        "whet.extend": "0.9.9"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
-          "dev": true,
-          "requires": {
-            "argparse": "1.0.9",
-            "esprima": "2.7.3"
-          }
-        }
-      }
-    },
-    "symbol-observable": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
-      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=",
-      "dev": true
-    },
-    "symbol-tree": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
-      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
-      "dev": true
-    },
-    "table": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
-      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
-      "dev": true,
-      "requires": {
-        "ajv": "4.11.8",
-        "ajv-keywords": "1.5.1",
-        "chalk": "1.1.3",
-        "lodash": "4.17.4",
-        "slice-ansi": "0.0.4",
-        "string-width": "2.1.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "3.0.0"
-              }
-            }
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "tapable": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
-      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
-      "dev": true
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
-      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "1.0.5"
-      }
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "token-stream": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz",
-      "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo=",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
-      "dev": true
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "1.1.2"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz",
-      "integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=",
-      "dev": true
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.7",
-        "uglify-to-browserify": "1.0.2",
-        "yargs": "3.10.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "dev": true,
-      "optional": true
-    },
-    "uglifyjs-webpack-plugin": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.7",
-        "uglify-js": "2.8.29",
-        "webpack-sources": "1.0.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
-    },
-    "uniqid": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
-      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
-      "dev": true,
-      "requires": {
-        "macaddress": "0.2.8"
-      }
-    },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-loader": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
-      "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "mime": "1.4.1",
-        "schema-utils": "0.3.0"
-      }
-    },
-    "user-home": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "1.0.2"
-      }
-    },
-    "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-      "dev": true
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
-      }
-    },
-    "vendors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
-      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
-    },
-    "vue": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.0.tgz",
-      "integrity": "sha512-KngZQLLe/N2Bvl3qu0xgqQHemm9MNz9y73D7yJ5tVavOKyhSgCLARYzrXJzYtoeadUSrItzV36VrHywLGVUx7w==",
-      "dev": true
-    },
-    "vue-hot-reload-api": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz",
-      "integrity": "sha512-Hn0jdFiNfNx4+Nxz1vokYUsP3mwpn9r/XomLrXA+KafYaiR7LNQG1fxtpVklD4KxD5GluXRiSoWNDf0H9BdsJw=="
-    },
-    "vue-server-renderer": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.5.0.tgz",
-      "integrity": "sha512-MtezRePHgGvof90VfBL3GkdYc8ZFYLvk7IDJ4JP8g7PcBZ3im+yn1edYGBeYdN15T9UFlZnROSf/1M6fBBnP1Q==",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "hash-sum": "1.0.2",
-        "he": "1.1.1",
-        "lodash.template": "4.4.0",
-        "lodash.uniq": "4.5.0",
-        "resolve": "1.4.0",
-        "serialize-javascript": "1.4.0",
-        "source-map": "0.5.6"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "vue-style-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.0.3.tgz",
-      "integrity": "sha512-P/ihpaZKU23T1kq3E0y4c+F8sbm1HQO69EFYoLoGMSGVAHroHsGir/WQ9qUavP8dyFYHmXenzHaJ/nqd8vfaxw==",
-      "requires": {
-        "hash-sum": "1.0.2",
-        "loader-utils": "1.1.0"
-      }
-    },
-    "vue-template-compiler": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.0.tgz",
-      "integrity": "sha512-W4hDoXXpCwfilO1MRTDM4EHm1DC1mU1wS8WyvEo119cUtxdaPuq/dD0OJbSEIkeW8fdT07qGCSnLOfPlmrKRqw==",
-      "dev": true,
-      "requires": {
-        "de-indent": "1.0.2",
-        "he": "1.1.1"
-      }
-    },
-    "vue-template-es2015-compiler": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz",
-      "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg=="
-    },
-    "watchpack": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
-      "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=",
-      "dev": true,
-      "requires": {
-        "async": "2.5.0",
-        "chokidar": "1.7.0",
-        "graceful-fs": "4.1.11"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
-    },
-    "webpack": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.7.1.tgz",
-      "integrity": "sha512-8MR+gVfxsvtx4J1UlbRGkUJEpDQUBFmisRmpPO5cVLgF21R8UMChX39OOjDz63a+m/iswGoqATszdZB2VCsYuA==",
-      "dev": true,
-      "requires": {
-        "acorn": "5.1.2",
-        "acorn-dynamic-import": "2.0.2",
-        "ajv": "5.2.3",
-        "ajv-keywords": "2.1.0",
-        "async": "2.5.0",
-        "enhanced-resolve": "3.4.1",
-        "escope": "3.6.0",
-        "interpret": "1.0.4",
-        "json-loader": "0.5.7",
-        "json5": "0.5.1",
-        "loader-runner": "2.3.0",
-        "loader-utils": "1.1.0",
-        "memory-fs": "0.4.1",
-        "mkdirp": "0.5.1",
-        "node-libs-browser": "2.0.0",
-        "source-map": "0.5.7",
-        "supports-color": "4.4.0",
-        "tapable": "0.2.8",
-        "uglifyjs-webpack-plugin": "0.4.6",
-        "watchpack": "1.4.0",
-        "webpack-sources": "1.0.1",
-        "yargs": "8.0.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.2.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
-          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
-          "dev": true,
-          "requires": {
-            "co": "4.6.0",
-            "fast-deep-equal": "1.0.0",
-            "json-schema-traverse": "0.3.1",
-            "json-stable-stringify": "1.0.1"
-          }
-        },
-        "ajv-keywords": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
-          "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wrap-ansi": "2.1.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "1.1.0",
-                "is-fullwidth-code-point": "1.0.0",
-                "strip-ansi": "3.0.1"
-              }
-            }
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          },
-          "dependencies": {
-            "is-fullwidth-code-point": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "3.0.0"
-              }
-            }
-          }
-        },
-        "yargs": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
-          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "2.1.0",
-            "read-pkg-up": "2.0.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "7.0.0"
-          }
-        }
-      }
-    },
-    "webpack-sources": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
-      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "2.0.0",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "whatwg-encoding": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz",
-      "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.13"
-      }
-    },
-    "whatwg-url": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz",
-      "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=",
-      "dev": true,
-      "requires": {
-        "tr46": "0.0.3",
-        "webidl-conversions": "3.0.1"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
-          "dev": true
-        }
-      }
-    },
-    "when": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
-      "dev": true
-    },
-    "whet.extend": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
-      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-      "dev": true,
-      "requires": {
-        "isexe": "2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "window-size": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-      "dev": true
-    },
-    "with": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
-      "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
-      "dev": true,
-      "requires": {
-        "acorn": "3.3.0",
-        "acorn-globals": "3.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-          "dev": true
-        }
-      }
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true,
-      "requires": {
-        "mkdirp": "0.5.1"
-      }
-    },
-    "xml-name-validator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
-      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-      "dev": true
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
-    },
-    "yargs": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-      "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-      "dev": true,
-      "requires": {
-        "camelcase": "1.2.1",
-        "cliui": "2.1.0",
-        "decamelize": "1.2.0",
-        "window-size": "0.1.0"
-      }
-    },
-    "yargs-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-      "dev": true,
-      "requires": {
-        "camelcase": "4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        }
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
index 98bfe8c04..e5b9b3aa8 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "resolve": "^1.4.0",
     "source-map": "^0.6.1",
     "vue-hot-reload-api": "^2.2.0",
-    "vue-style-loader": "^3.0.0",
+    "vue-style-loader": "^3.1.1",
     "vue-template-es2015-compiler": "^1.6.0"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..1087c4314
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4851 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abab@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+acorn-dynamic-import@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+  dependencies:
+    acorn "^4.0.3"
+
+acorn-globals@^3.0.0, acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn@^3.0.4, acorn@^3.1.0, acorn@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^4.0.3, acorn@^4.0.4, acorn@~4.0.2:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+
+acorn@^5.0.0, acorn@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
+
+ajv-keywords@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+
+ajv-keywords@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+
+ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.1.0, ansi-styles@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+app-root-path@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1.js@^4.0.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+assertion-error@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async@^2.1.2, async@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+  dependencies:
+    lodash "^4.14.0"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.25.0, babel-core@^6.26.0, babel-core@~6:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
+babel-generator@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.6"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-preset-env@^1.6.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^2.1.2"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
+balanced-match@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+base64-js@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+
+binary-extensions@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+bluebird@^3.1.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+brace-expansion@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
+browser-stdout@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
+browserslist@^2.1.2:
+  version "2.11.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
+  dependencies:
+    caniuse-lite "^1.0.30000792"
+    electron-to-chromium "^1.3.30"
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000799"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000799.tgz#0904953de93f3f492647e58c1a1bda7a73a0cb0b"
+
+caniuse-lite@^1.0.30000792:
+  version "1.0.30000792"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chai@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
+  dependencies:
+    assertion-error "^1.0.1"
+    check-error "^1.0.1"
+    deep-eql "^3.0.0"
+    get-func-name "^2.0.0"
+    pathval "^1.0.0"
+    type-detect "^4.0.0"
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
+character-parser@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
+  dependencies:
+    is-regex "^1.0.3"
+
+check-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
+chokidar@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+ci-info@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+
+clap@^1.0.9:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+  dependencies:
+    chalk "^1.1.3"
+
+clean-css@^3.3.0:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  dependencies:
+    commander "2.8.x"
+    source-map "0.4.x"
+
+cli-cursor@^1.0.1, cli-cursor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-spinners@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
+
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+clone@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+coa@~1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+  dependencies:
+    q "^1.1.2"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+coffee-loader@^0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.7.3.tgz#fadbc6efd6fc7ecc88c5b3046a2c292066bcb54a"
+  dependencies:
+    loader-utils "^1.0.2"
+
+coffee-script@^1.12.7:
+  version "1.12.7"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+
+color-convert@^1.3.0, color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@^2.11.0, commander@^2.9.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+consolidate@^0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
+  dependencies:
+    bluebird "^3.1.1"
+
+constantinople@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"
+  dependencies:
+    acorn "^3.1.0"
+    is-expression "^2.0.1"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
+content-type-parser@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+
+convert-source-map@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
+core-js@^2.4.0, core-js@^2.5.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cosmiconfig@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-1.1.0.tgz#0dea0f9804efdfb929fbb1b188e25553ea053d37"
+  dependencies:
+    graceful-fs "^4.1.2"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.0.1"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    pinkie-promise "^2.0.0"
+    require-from-string "^1.1.0"
+
+cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.4.3"
+    minimist "^1.2.0"
+    object-assign "^4.1.0"
+    os-homedir "^1.0.1"
+    parse-json "^2.2.0"
+    require-from-string "^1.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+
+css-loader@^0.28.4:
+  version "0.28.9"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.9.tgz#68064b85f4e271d7ce4c48a58300928e535d1c95"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano "^3.10.0"
+    icss-utils "^2.1.0"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.1.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.2.0"
+    postcss-modules-local-by-default "^1.2.0"
+    postcss-modules-scope "^1.1.0"
+    postcss-modules-values "^1.3.0"
+    postcss-value-parser "^3.3.0"
+    source-list-map "^2.0.0"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+cssnano@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-fns@^1.27.2:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
+de-indent@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+
+debug@*, debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.1.1, debug@^2.2.0, debug@^2.6.8:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-eql@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  dependencies:
+    type-detect "^4.0.0"
+
+deep-extend@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
+diff@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
+
+diffie-hellman@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+doctrine@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  dependencies:
+    esutils "^2.0.2"
+
+doctypes@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
+
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
+  version "1.3.31"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f"
+
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+
+elliptic@^6.0.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+enhanced-resolve@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    object-assign "^4.0.1"
+    tapable "^0.2.7"
+
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.3:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.6.tgz#c386ce8a6283f14fc09563b71560908c9bf53026"
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.38"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.5.6"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-plugin-html@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz#7c89883ab0c85fa5d28b666a14a4e906aa90b897"
+  dependencies:
+    htmlparser2 "^3.8.2"
+
+eslint-plugin-vue-libs@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue-libs/-/eslint-plugin-vue-libs-1.2.1.tgz#d50f3ebef50c4076dae84e8cff3a3c350f6bac44"
+  dependencies:
+    eslint-plugin-html "^2.0.0"
+
+eslint@^3.19.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.5.2"
+    debug "^2.1.1"
+    doctrine "^2.0.0"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
+
+espree@^3.4.0:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
+  dependencies:
+    acorn "^5.2.1"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
+
+esrecurse@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  dependencies:
+    estraverse "^4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+expose-loader@^0.7.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.4.tgz#9bcdd3878b5da9107930b55a03f65afe90b3314a"
+
+extend@~3.0.0, extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extract-text-webpack-plugin@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
+  dependencies:
+    async "^2.4.1"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+    webpack-sources "^1.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
+figures@^1.3.5, figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-loader@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8"
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^0.3.0"
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
+find-up@^2.0.0, find-up@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  dependencies:
+    locate-path "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+form-data@~2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.39"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+
+get-own-enumerable-property-symbols@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+gitbook-plugin-edit-link@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz#d8fcd927eced81e7a662a72d59db609eafd7e72f"
+
+gitbook-plugin-github@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gitbook-plugin-github/-/gitbook-plugin-github-3.0.0.tgz#67457df98a57ea8ef9b2518b88340db370a5317b"
+
+gitbook-plugin-theme-vuejs@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/gitbook-plugin-theme-vuejs/-/gitbook-plugin-theme-vuejs-1.1.0.tgz#dc779c8e58113440a55755c2470fc3912948a9cc"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^9.14.0, globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growl@1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hash-base@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
+  dependencies:
+    inherits "^2.0.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash-sum@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
+
+hawk@3.1.3, hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+he@1.1.1, he@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+hoek@4.x.x:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+htmlparser2@^3.8.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+
+husky@^0.14.3:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+  dependencies:
+    is-ci "^1.0.10"
+    normalize-path "^1.0.0"
+    strip-indent "^2.0.0"
+
+iconv-lite@0.4.19:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+
+icss-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  dependencies:
+    postcss "^6.0.1"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+ignore@^3.2.0:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  dependencies:
+    repeating "^2.0.0"
+
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+inject-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-3.0.1.tgz#844a4596150cf6b864c2f79806d40a2caee4c2c7"
+  dependencies:
+    babel-core "~6"
+
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    lodash "^4.3.0"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
+invariant@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-ci@^1.0.10:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  dependencies:
+    ci-info "^1.0.0"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-expression@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-2.1.0.tgz#91be9d47debcfef077977e9722be6dcfb4465ef0"
+  dependencies:
+    acorn "~3.3.0"
+    object-assign "^4.0.1"
+
+is-expression@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-3.0.0.tgz#39acaa6be7fd1f3471dc42c7416e61c24317ac9f"
+  dependencies:
+    acorn "~4.0.2"
+    object-assign "^4.0.1"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-my-json-valid@^2.10.0:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-promise@^2.0.0, is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-regex@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jest-get-type@^21.2.0:
+  version "21.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
+
+jest-validate@^21.1.0:
+  version "21.2.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7"
+  dependencies:
+    chalk "^2.0.1"
+    jest-get-type "^21.2.0"
+    leven "^2.1.0"
+    pretty-format "^21.2.1"
+
+js-base64@^2.1.9:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
+
+js-stringify@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.9.1:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^9.2.1:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+  dependencies:
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
+    whatwg-encoding "^1.0.1"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json-loader@^0.5.4:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jstransformer@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"
+  dependencies:
+    is-promise "^2.0.0"
+    promise "^7.0.1"
+
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+leven@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+lint-staged@^4.0.2:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.3.0.tgz#ed0779ad9a42c0dc62bb3244e522870b41125879"
+  dependencies:
+    app-root-path "^2.0.0"
+    chalk "^2.1.0"
+    commander "^2.11.0"
+    cosmiconfig "^1.1.0"
+    execa "^0.8.0"
+    is-glob "^4.0.0"
+    jest-validate "^21.1.0"
+    listr "^0.12.0"
+    lodash "^4.17.4"
+    log-symbols "^2.0.0"
+    minimatch "^3.0.0"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    staged-git-files "0.0.4"
+    stringify-object "^3.2.0"
+
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+
+listr-update-renderer@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz#ca80e1779b4e70266807e8eed1ad6abe398550f9"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
+  dependencies:
+    chalk "^1.1.3"
+    cli-cursor "^1.0.2"
+    date-fns "^1.27.2"
+    figures "^1.7.0"
+
+listr@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.12.0.tgz#6bce2c0f5603fa49580ea17cd6a00cc0e5fa451a"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    figures "^1.7.0"
+    indent-string "^2.1.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.2.0"
+    listr-verbose-renderer "^0.4.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    ora "^0.2.3"
+    p-map "^1.1.1"
+    rxjs "^5.0.0-beta.11"
+    stream-to-observable "^0.1.0"
+    strip-ansi "^3.0.1"
+
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
+locate-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  dependencies:
+    p-locate "^2.0.0"
+    path-exists "^3.0.0"
+
+lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
+lodash.template@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+    lodash.templatesettings "^4.0.0"
+
+lodash.templatesettings@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  dependencies:
+    lodash._reinterpolate "~3.0.0"
+
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  dependencies:
+    chalk "^1.0.0"
+
+log-symbols@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  dependencies:
+    chalk "^2.0.1"
+
+log-update@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+  dependencies:
+    ansi-escapes "^1.0.0"
+    cli-cursor "^1.0.2"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+lru-cache@^4.0.1, lru-cache@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
+make-dir@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
+  dependencies:
+    pify "^3.0.0"
+
+marked@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
+
+math-expression-evaluator@^1.2.14:
+  version "1.2.17"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+
+md5.js@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+micromatch@^2.1.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@~1.30.0:
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
+  version "2.1.17"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  dependencies:
+    mime-db "~1.30.0"
+
+mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+
+minimalistic-assert@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794"
+  dependencies:
+    browser-stdout "1.3.0"
+    commander "2.11.0"
+    debug "3.1.0"
+    diff "3.3.1"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.3"
+    he "1.1.1"
+    mkdirp "0.5.1"
+    supports-color "4.4.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mute-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+
+nan@^2.3.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+node-libs-browser@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.6.39:
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+  dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-newline/-/normalize-newline-3.0.0.tgz#1cbea804aba436001f83938ab21ec039d69ae9d3"
+
+normalize-package-data@^2.3.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+
+normalize-path@^2.0.0, normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+npm-path@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
+  dependencies:
+    which "^1.2.10"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  dependencies:
+    path-key "^2.0.0"
+
+npm-which@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
+  dependencies:
+    commander "^2.9.0"
+    npm-path "^2.0.2"
+    which "^1.2.10"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+null-loader@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-0.1.1.tgz#17be9abfcd3ff0e1512f6fc4afcb1f5039378fae"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+once@^1.3.0, once@^1.3.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+ora@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^1.0.2"
+    cli-spinners "^0.1.2"
+    object-assign "^4.0.1"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+
+p-limit@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
+
+p-locate@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  dependencies:
+    p-limit "^1.1.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
+parse-asn1@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  dependencies:
+    pify "^2.0.0"
+
+pathval@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+
+pbkdf2@^3.0.3:
+  version "3.0.14"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
+pluralize@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-load-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+    postcss-load-options "^1.2.0"
+    postcss-load-plugins "^2.3.0"
+
+postcss-load-options@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+  dependencies:
+    cosmiconfig "^2.1.0"
+    object-assign "^4.1.0"
+
+postcss-load-plugins@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+  dependencies:
+    cosmiconfig "^2.1.1"
+    object-assign "^4.1.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
+  dependencies:
+    postcss "^6.0.1"
+
+postcss-modules-local-by-default@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-scope@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+  dependencies:
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
+
+postcss-modules-values@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+  dependencies:
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+  version "5.2.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
+postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.8:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
+  dependencies:
+    chalk "^2.3.0"
+    source-map "^0.6.1"
+    supports-color "^5.1.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+prettier@^1.7.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
+
+pretty-format@^21.2.1:
+  version "21.2.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36"
+  dependencies:
+    ansi-regex "^3.0.0"
+    ansi-styles "^3.2.0"
+
+private@^0.1.6, private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+progress@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+
+promise@^7.0.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+public-encrypt@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
+pug-attrs@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
+  dependencies:
+    constantinople "^3.0.1"
+    js-stringify "^1.0.1"
+    pug-runtime "^2.0.3"
+
+pug-code-gen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.0.tgz#96aea39a9e62f1ec5d2b6a5b42a29d528c70b43d"
+  dependencies:
+    constantinople "^3.0.1"
+    doctypes "^1.1.0"
+    js-stringify "^1.0.1"
+    pug-attrs "^2.0.2"
+    pug-error "^1.3.2"
+    pug-runtime "^2.0.3"
+    void-elements "^2.0.1"
+    with "^5.0.0"
+
+pug-error@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
+
+pug-filters@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.5.tgz#66bf6e80d97fbef829bab0aa35eddff33fc964f3"
+  dependencies:
+    clean-css "^3.3.0"
+    constantinople "^3.0.1"
+    jstransformer "1.0.0"
+    pug-error "^1.3.2"
+    pug-walk "^1.1.5"
+    resolve "^1.1.6"
+    uglify-js "^2.6.1"
+
+pug-lexer@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.1.0.tgz#fd087376d4a675b4f59f8fef422883434e9581a2"
+  dependencies:
+    character-parser "^2.1.1"
+    is-expression "^3.0.0"
+    pug-error "^1.3.2"
+
+pug-linker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.3.tgz#25f59eb750237f0368e59c3379764229c0189c41"
+  dependencies:
+    pug-error "^1.3.2"
+    pug-walk "^1.1.5"
+
+pug-load@^2.0.9:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.9.tgz#ee217c914cc1d9324d44b86c32d1df241d36de7a"
+  dependencies:
+    object-assign "^4.1.0"
+    pug-walk "^1.1.5"
+
+pug-parser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-4.0.0.tgz#c9f52322e4eabe4bf5beeba64ed18373bb627801"
+  dependencies:
+    pug-error "^1.3.2"
+    token-stream "0.0.1"
+
+pug-runtime@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
+
+pug-strip-comments@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
+  dependencies:
+    pug-error "^1.3.2"
+
+pug-walk@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.5.tgz#90e943acbcf7021e6454cf1b32245891cba6f851"
+
+pug@^2.0.0-rc.2:
+  version "2.0.0-rc.4"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-rc.4.tgz#b7b08f6599bd5302568042b7436984fb28c80a13"
+  dependencies:
+    pug-code-gen "^2.0.0"
+    pug-filters "^2.1.5"
+    pug-lexer "^3.1.0"
+    pug-linker "^3.0.3"
+    pug-load "^2.0.9"
+    pug-parser "^4.0.0"
+    pug-runtime "^2.0.3"
+    pug-strip-comments "^1.0.2"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+q@^1.1.2:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
+randomatic@^1.1.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+raw-loader@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+
+rc@^1.1.7:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.4.tgz#a0f606caae2a3b862bbd0ef85482c0125b315fa3"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
+regenerate@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+request@^2.79.0:
+  version "2.83.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-from-string@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+require-uncached@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve@^1.1.6, resolve@^1.2.0, resolve@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  dependencies:
+    hash-base "^2.0.0"
+    inherits "^2.0.1"
+
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  dependencies:
+    once "^1.3.0"
+
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+
+rxjs@^5.0.0-beta.11:
+  version "5.5.6"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
+  dependencies:
+    symbol-observable "1.0.1"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+
+sax@^1.2.1, sax@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  dependencies:
+    ajv "^5.0.0"
+
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
+serialize-javascript@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.10"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
+shelljs@^0.7.5:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+skeleton-loader@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/skeleton-loader/-/skeleton-loader-1.1.3.tgz#0c49a088b74b8b48442de56206059ad05e5af9f0"
+  dependencies:
+    loader-utils "^1.1.0"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.4.x:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+staged-git-files@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35"
+
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-http@^2.7.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.3"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-to-observable@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.1.0.tgz#45bf1d9f2d7dc09bed81f1c307c430e68b84cffe"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@^1.0.0, string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringify-object@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.1.tgz#2720c2eff940854c819f6ee252aaeb581f30624d"
+  dependencies:
+    get-own-enumerable-property-symbols "^2.0.1"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
+stringstream@~0.0.4, stringstream@~0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+stylus-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.1.tgz#77f4b34fd030d25b2617bcf5513db5b0730c4089"
+  dependencies:
+    loader-utils "^1.0.2"
+    lodash.clonedeep "^4.5.0"
+    when "~3.6.x"
+
+stylus@^0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
+sugarss@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
+  dependencies:
+    postcss "^6.0.14"
+
+supports-color@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+  dependencies:
+    has-flag "^2.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^4.0.0, supports-color@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  dependencies:
+    has-flag "^2.0.0"
+
+supports-color@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+  dependencies:
+    has-flag "^2.0.0"
+
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+table@^3.7.8:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+tapable@^0.2.7:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+
+tar-pack@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+timers-browserify@^2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
+  dependencies:
+    setimmediate "^1.0.4"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+token-stream@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/token-stream/-/token-stream-0.0.1.tgz#ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-detect@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.7.tgz#862bd2cf6058ad92799ff5a5b8cf7b6cec726198"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+uglify-js@^2.6.1, uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+uglifyjs-webpack-plugin@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
+url-loader@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
+  dependencies:
+    loader-utils "^1.0.2"
+    mime "^1.4.1"
+    schema-utils "^0.3.0"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  dependencies:
+    os-homedir "^1.0.0"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util@0.10.3, util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+uuid@^3.0.0, uuid@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+void-elements@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+
+vue-hot-reload-api@^2.2.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
+
+vue-server-renderer@^2.5.0:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.5.13.tgz#6a0d421a0fd3e2b7357b59495d744b7e9279d68e"
+  dependencies:
+    chalk "^1.1.3"
+    hash-sum "^1.0.2"
+    he "^1.1.0"
+    lodash.template "^4.4.0"
+    lodash.uniq "^4.5.0"
+    resolve "^1.2.0"
+    serialize-javascript "^1.3.0"
+    source-map "0.5.6"
+
+vue-style-loader@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.1.1.tgz#74fdef91a81d38bc0125746a1b5505e62d69e32c"
+  dependencies:
+    hash-sum "^1.0.2"
+    loader-utils "^1.0.2"
+
+vue-template-compiler@^2.5.0:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz#12a2aa0ecd6158ac5e5f14d294b0993f399c3d38"
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.1.0"
+
+vue-template-es2015-compiler@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
+
+vue@^2.5.0:
+  version "2.5.13"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.13.tgz#95bd31e20efcf7a7f39239c9aa6787ce8cf578e1"
+
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  dependencies:
+    async "^2.1.2"
+    chokidar "^1.7.0"
+    graceful-fs "^4.1.2"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+webpack-sources@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@^3.7.1:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
+    async "^2.1.2"
+    enhanced-resolve "^3.4.0"
+    escope "^3.6.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^4.2.1"
+    tapable "^0.2.7"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
+    webpack-sources "^1.0.1"
+    yargs "^8.0.2"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+  dependencies:
+    iconv-lite "0.4.19"
+
+whatwg-url@^4.3.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+when@~3.6.x:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@^1.2.10, which@^1.2.9:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  dependencies:
+    string-width "^1.0.2"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+with@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/with/-/with-5.1.1.tgz#fa4daa92daf32c4ea94ed453c81f04686b575dfe"
+  dependencies:
+    acorn "^3.1.0"
+    acorn-globals "^3.0.0"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+xml-name-validator@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"

From e6b5fd4a43f7ea4e86e0bf5134e682da51e550d2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 Jan 2018 23:41:04 -0500
Subject: [PATCH 811/877] feat: shadowMode

---
 lib/loader.js                           |  50 ++++++++----
 lib/runtime/component-normalizer.esm.js | 103 ------------------------
 lib/runtime/component-normalizer.js     |   2 +-
 3 files changed, 37 insertions(+), 118 deletions(-)
 delete mode 100644 lib/runtime/component-normalizer.esm.js

diff --git a/lib/loader.js b/lib/loader.js
index 51a4c6caa..63fb38fb9 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -12,7 +12,6 @@ const styleCompilerPath = normalize.lib('style-compiler/index')
 const templateCompilerPath = normalize.lib('template-compiler/index')
 const templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
 const componentNormalizerPath = normalize.lib('runtime/component-normalizer')
-const componentNormalizerESMPath = normalize.lib('runtime/component-normalizer.esm')
 
 // dep loaders
 const styleLoaderPath = normalize.dep('vue-style-loader')
@@ -64,6 +63,10 @@ module.exports = function (content) {
     query
   )
 
+  // shadow mode is an internal option
+  // enabled via vue-cli's --target web-component
+  const isShadowMode = !!options.shadowMode
+
   // disable esModule in inject mode
   // because import/export must be top-level
   if (query.inject) {
@@ -167,11 +170,12 @@ module.exports = function (content) {
   // add requires for styles
   let cssModules
   if (parts.styles.length) {
-    let styleInjectionCode = 'function injectStyle (ssrContext) {\n'
+    const needsLazyInjection = isServer || isShadowMode
+    let styleInjectionCode = 'function injectStyle (context) {\n'
     if (needsHotReload) {
       styleInjectionCode += `  if (disposed) return\n`
     }
-    if (isServer) {
+    if (needsLazyInjection) {
       styleInjectionCode += `var i\n`
     }
     parts.styles.forEach((style, i) => {
@@ -182,11 +186,11 @@ module.exports = function (content) {
 
       const hasStyleLoader = requireString.indexOf('style-loader') > -1
       const hasVueStyleLoader = requireString.indexOf('vue-style-loader') > -1
-      // vue-style-loader exposes inject functions during SSR so they are
-      // always called
+      // vue-style-loader exposes inject functions in SSR or shadow mode so they
+      // are always called
       const invokeStyle =
-        isServer && hasVueStyleLoader
-          ? code => `;(i=${code},i.__inject__&&i.__inject__(ssrContext),i)\n`
+        needsLazyInjection && hasVueStyleLoader
+          ? code => `;(i=${code},i.__inject__&&i.__inject__(context),i)\n`
           : code => `  ${code}\n`
 
       const moduleName = style.module === true ? '$style' : style.module
@@ -261,16 +265,16 @@ module.exports = function (content) {
   //   scopeId,
   //   moduleIdentifier (server only)
   // )
+  const componentNormalizerRequest = loaderUtils.stringifyRequest(
+    loaderContext,
+    '!' + componentNormalizerPath
+  )
   if (!options.esModule) {
     output +=
-      'var normalizeComponent = require(' +
-      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-      ')\n'
+      `var normalizeComponent = require(${componentNormalizerRequest}).default\n`
   } else {
     output +=
-      `import normalizeComponent from ` +
-      loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerESMPath) +
-      '\n'
+      `import normalizeComponent from ${componentNormalizerRequest}\n`
   }
 
   // <script>
@@ -332,10 +336,13 @@ module.exports = function (content) {
     '\n'
 
   // style
+  // the injection function is passed to the normalizer and injected into
+  // component lifecycle hooks. In shadow mode, we expose the inject function
+  // directly on the component's options so we don't pass it here.
   output += '/* styles */\n'
   output +=
     'var __vue_styles__ = ' +
-    (parts.styles.length ? 'injectStyle' : 'null') +
+    (parts.styles.length && !isShadowMode ? 'injectStyle' : 'null') +
     '\n'
 
   // scopeId
@@ -363,6 +370,21 @@ module.exports = function (content) {
     '  __vue_module_identifier__\n' +
     ')\n'
 
+  // expose style injection on options
+  // this will be used by vue-cli's web component entry
+  if (isShadowMode) {
+    // the shadow inject id will be the module id of the entry Vue component,
+    // which is the frist Vue component encountered in this compilation
+    let shadowInjectId = process.env.VUE_SHADOW_INJECT_ID
+    if (!shadowInjectId) {
+      shadowInjectId = process.env.VUE_SHADOW_INJECT_ID =
+        `__vue_shadow_injector__${moduleId.replace(`data-v-`, '')}`
+    }
+    output +=
+      `var shadowInjectId = Component.options.__shadowInjectId = '${shadowInjectId}'\n` +
+      `;(window[shadowInjectId] || (window[shadowInjectId] = [])).push(injectStyle)\n`
+  }
+
   // development-only code
   if (!isProduction) {
     // add filename in dev
diff --git a/lib/runtime/component-normalizer.esm.js b/lib/runtime/component-normalizer.esm.js
deleted file mode 100644
index 75a5402bb..000000000
--- a/lib/runtime/component-normalizer.esm.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/* globals __VUE_SSR_CONTEXT__ */
-
-// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
-// This module is a runtime utility for cleaner component module output and will
-// be included in the final webpack user bundle.
-
-export default function normalizeComponent (
-  rawScriptExports,
-  compiledTemplate,
-  functionalTemplate,
-  injectStyles,
-  scopeId,
-  moduleIdentifier /* server only */
-) {
-  var esModule
-  var scriptExports = rawScriptExports = rawScriptExports || {}
-
-  // ES6 modules interop
-  var type = typeof rawScriptExports.default
-  if (type === 'object' || type === 'function') {
-    esModule = rawScriptExports
-    scriptExports = rawScriptExports.default
-  }
-
-  // Vue.extend constructor export interop
-  var options = typeof scriptExports === 'function'
-    ? scriptExports.options
-    : scriptExports
-
-  // render functions
-  if (compiledTemplate) {
-    options.render = compiledTemplate.render
-    options.staticRenderFns = compiledTemplate.staticRenderFns
-    options._compiled = true
-  }
-
-  // functional template
-  if (functionalTemplate) {
-    options.functional = true
-  }
-
-  // scopedId
-  if (scopeId) {
-    options._scopeId = scopeId
-  }
-
-  var hook
-  if (moduleIdentifier) { // server build
-    hook = function (context) {
-      // 2.3 injection
-      context =
-        context || // cached call
-        (this.$vnode && this.$vnode.ssrContext) || // stateful
-        (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
-      // 2.2 with runInNewContext: true
-      if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
-        context = __VUE_SSR_CONTEXT__
-      }
-      // inject component styles
-      if (injectStyles) {
-        injectStyles.call(this, context)
-      }
-      // register component module identifier for async chunk inferrence
-      if (context && context._registeredComponents) {
-        context._registeredComponents.add(moduleIdentifier)
-      }
-    }
-    // used by ssr in case component is cached and beforeCreate
-    // never gets called
-    options._ssrRegister = hook
-  } else if (injectStyles) {
-    hook = injectStyles
-  }
-
-  if (hook) {
-    var functional = options.functional
-    var existing = functional
-      ? options.render
-      : options.beforeCreate
-
-    if (!functional) {
-      // inject component registration as beforeCreate hook
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    } else {
-      // for template-only hot-reload because in that case the render fn doesn't
-      // go through the normalizer
-      options._injectStyles = hook
-      // register for functioal component in vue file
-      options.render = function renderWithStyleInjection (h, context) {
-        hook.call(context)
-        return existing(h, context)
-      }
-    }
-  }
-
-  return {
-    esModule: esModule,
-    exports: scriptExports,
-    options: options
-  }
-}
diff --git a/lib/runtime/component-normalizer.js b/lib/runtime/component-normalizer.js
index fc726e026..75a5402bb 100644
--- a/lib/runtime/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -4,7 +4,7 @@
 // This module is a runtime utility for cleaner component module output and will
 // be included in the final webpack user bundle.
 
-module.exports = function normalizeComponent (
+export default function normalizeComponent (
   rawScriptExports,
   compiledTemplate,
   functionalTemplate,

From 8673266722893311c88cff189d7e31bef069aae9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 Jan 2018 23:42:46 -0500
Subject: [PATCH 812/877] use yorkie

---
 package.json |  9 +++++----
 yarn.lock    | 17 +++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index e5b9b3aa8..fd9678b37 100644
--- a/package.json
+++ b/package.json
@@ -23,13 +23,14 @@
   },
   "homepage": "https://github.com/vuejs/vue-loader",
   "scripts": {
-    "lint": "eslint lib test",
-    "lint:fix": "eslint lib test --fix",
-    "precommit": "lint-staged",
+    "lint": "eslint lib test --fix",
     "test": "eslint lib && mocha --slow 5000 --timeout 10000",
     "docs": "cd docs && gitbook install && gitbook serve",
     "docs:deploy": "bash ./docs/deploy.sh"
   },
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
   "lint-staged": {
     "lib/**/*.js": [
       "eslint --fix",
@@ -75,7 +76,7 @@
     "gitbook-plugin-edit-link": "^2.0.2",
     "gitbook-plugin-github": "^3.0.0",
     "gitbook-plugin-theme-vuejs": "^1.1.0",
-    "husky": "^0.14.3",
+    "yorkie": "^1.0.3",
     "inject-loader": "^3.0.1",
     "js-yaml": "^3.9.1",
     "jsdom": "^9.2.1",
diff --git a/yarn.lock b/yarn.lock
index 1087c4314..cc6ffbd5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2235,14 +2235,6 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
-
 iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -4849,3 +4841,12 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+
+yorkie@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-1.0.3.tgz#5c05db48c012def99c29b79685b6ba2e40c8c671"
+  dependencies:
+    execa "^0.8.0"
+    is-ci "^1.0.10"
+    normalize-path "^1.0.0"
+    strip-indent "^2.0.0"

From 3d5ac8b27cf71f9aded4f45fc235354ecb278fe6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 Jan 2018 23:45:43 -0500
Subject: [PATCH 813/877] bump vue-style-loader version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd9678b37..27666d667 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "resolve": "^1.4.0",
     "source-map": "^0.6.1",
     "vue-hot-reload-api": "^2.2.0",
-    "vue-style-loader": "^3.1.1",
+    "vue-style-loader": "^4.0.1",
     "vue-template-es2015-compiler": "^1.6.0"
   },
   "peerDependencies": {

From a438118c5cf0644fd6d9245b475b20b6b81a04af Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 30 Jan 2018 23:47:23 -0500
Subject: [PATCH 814/877] 14.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 27666d667..432d94c91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "13.7.0",
+  "version": "14.0.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 7fb1cd84a006b631102481a810cf201cdefe9e36 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 00:05:49 -0500
Subject: [PATCH 815/877] docs: remove webpack 1 reference, refer new cli

---
 docs/en/configurations/advanced.md      |  25 ------
 docs/en/configurations/custom-blocks.md |   1 -
 docs/en/configurations/extract-css.md   |  36 ---------
 docs/en/features/css-modules.md         |  11 ---
 docs/en/features/postcss.md             |  15 +---
 docs/en/options.md                      |  59 ++++++--------
 docs/en/start/setup.md                  |  11 ++-
 docs/en/workflow/linting.md             |  65 +++------------
 docs/en/workflow/production.md          |  10 +--
 docs/en/workflow/testing.md             | 100 +-----------------------
 10 files changed, 44 insertions(+), 289 deletions(-)

diff --git a/docs/en/configurations/advanced.md b/docs/en/configurations/advanced.md
index 8574fee44..f6c861392 100644
--- a/docs/en/configurations/advanced.md
+++ b/docs/en/configurations/advanced.md
@@ -12,8 +12,6 @@ To do that, specify the `loaders` option for `vue-loader`:
 
 > Note that `preLoaders` and `postLoaders` are only supported in 10.3.0+
 
-### webpack 2.x
-
 ``` js
 module.exports = {
   // other options...
@@ -59,27 +57,4 @@ module.exports = {
 }
 ```
 
-### webpack 1.x
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other options...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  },
-  // `vue-loader` configurations
-  vue: {
-    loaders: {
-      // same configuration rules as above
-    }
-  }
-}
-```
-
 A more practical usage of the advanced loader configuration is [extracting CSS inside components into a single file](./extract-css.md).
diff --git a/docs/en/configurations/custom-blocks.md b/docs/en/configurations/custom-blocks.md
index eac92d478..45a6a67d2 100644
--- a/docs/en/configurations/custom-blocks.md
+++ b/docs/en/configurations/custom-blocks.md
@@ -41,7 +41,6 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/en/configurations/extract-css.md b/docs/en/configurations/extract-css.md
index 457b923d9..3f5400e95 100644
--- a/docs/en/configurations/extract-css.md
+++ b/docs/en/configurations/extract-css.md
@@ -39,9 +39,6 @@ Note this only extracts `*.vue` files though - CSS imported in JavaScript still
 
 Example config to extract all the processed CSS in all Vue components into a single CSS file:
 
-### webpack 2.x
-
-
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
@@ -69,36 +66,3 @@ module.exports = {
   ]
 }
 ```
-
-### webpack 1.x
-
-``` bash
-npm install extract-text-webpack-plugin --save-dev
-```
-
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-
-module.exports = {
-  // other options...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-    ]
-  },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // you can also include <style lang="less"> or other langauges
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
-  plugins: [
-    new ExtractTextPlugin("style.css")
-  ]
-}
-```
diff --git a/docs/en/features/css-modules.md b/docs/en/features/css-modules.md
index 52dccfac0..52311d6ad 100644
--- a/docs/en/features/css-modules.md
+++ b/docs/en/features/css-modules.md
@@ -89,17 +89,6 @@ CSS Modules are processed via [css-loader](https://github.com/webpack/css-loader
 You can use vue-loader's `cssModules` option to provide additional query options to `css-loader`:
 
 ``` js
-// webpack 1
-vue: {
-  cssModules: {
-    // overwrite local ident name
-    localIdentName: '[path][name]---[local]---[hash:base64:5]',
-    // enable camelCase
-    camelCase: true
-  }
-}
-
-// webpack 2
 module: {
   rules: [
     {
diff --git a/docs/en/features/postcss.md b/docs/en/features/postcss.md
index 021471af0..fe00ff0c2 100644
--- a/docs/en/features/postcss.md
+++ b/docs/en/features/postcss.md
@@ -27,20 +27,7 @@ Sometimes the user may want to use `lang="postcss"` only for syntax highlighting
 
 Alternatively, you can specify PostCSS config specifically for `*.vue` files using the `postcss` option for `vue-loader`.
 
-Example usage in webpack 1.x:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other configs...
-  vue: {
-    // use custom PostCSS plugins
-    postcss: [require('postcss-cssnext')()]
-  }
-}
-```
-
-For webpack 2.x:
+Example:
 
 ``` js
 // webpack.config.js
diff --git a/docs/en/options.md b/docs/en/options.md
index 9c1a86140..601e1752a 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -1,10 +1,9 @@
 # Options Reference
 
-## Usage Difference Between webpack 1 & 2
-
-For webpack 2: pass the options directly to the loader rule.
+## Where to Place the Options
 
 ``` js
+// webpack.config.js
 module.exports = {
   // ...
   module: {
@@ -21,20 +20,9 @@ module.exports = {
 }
 ```
 
-For webpack 1.x: add a root `vue` block in your webpack config.
-
-``` js
-module.exports = {
-  // ...
-  vue: {
-    // `vue-loader` options
-  }
-}
-```
-
 ### loaders
 
-- type: `{ [lang: string]: string }`
+- type: `{ [lang: string]: string | Object | Array }`
 
   An object specifying webpack loaders to overwrite the default loaders used for language blocks inside `*.vue` files. The key corresponds to the `lang` attribute for language blocks, if specified. The default `lang` for each type is:
 
@@ -45,7 +33,6 @@ module.exports = {
   For example, to use `babel-loader` and `eslint-loader` to process all `<script>` blocks:
 
   ``` js
-  // webpack 2.x config
   module: {
     rules: [
       {
@@ -61,17 +48,36 @@ module.exports = {
   }
   ```
 
+  You can also use object or array syntax (note the options must be serializable):
+
+  ``` js
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: [
+              { loader: 'cache-loader' },
+              { loader: 'babel-loader', options: { presets: ['env'] } }
+            ]
+          }
+        }
+      }
+    ]
+  }
+  ```
+
 ### preLoaders
 
 - type: `{ [lang: string]: string }`
-- only supported in 10.3.0+
 
   The config format is the same as `loaders`, but `preLoaders` are applied to corresponding language blocks before the default loaders. You can use this to pre-process language blocks - a common use case would be build-time i18n.
 
 ### postLoaders
 
 - type: `{ [lang: string]: string }`
-- only supported in 10.3.0+
 
   The config format is the same as `loaders`, but `postLoaders` are applied after the default loaders. You can use this to post-process language blocks. However note that this is a bit more complicated:
 
@@ -81,7 +87,7 @@ module.exports = {
 
 ### postcss
 
-> Note: in 11.0.0+ it is recommended to use a PostCSS config file instead. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+> Note: It is recommended to use a PostCSS config file instead so that your styles in vue files and normal CSS can share the same config. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
 
 - type: `Array` or `Function` or `Object`
 
@@ -208,21 +214,6 @@ module.exports = {
   Example configuration:
 
   ``` js
-  // webpack 1
-  vue: {
-    buble: {
-      // enable object spread operator
-      // NOTE: you need to provide Object.assign polyfill yourself!
-      objectAssign: 'Object.assign',
-
-      // turn off the `with` removal
-      transforms: {
-        stripWith: false
-      }
-    }
-  }
-
-  // webpack 2
   module: {
     rules: [
       {
diff --git a/docs/en/start/setup.md b/docs/en/start/setup.md
index 98d9ee206..797c23775 100644
--- a/docs/en/start/setup.md
+++ b/docs/en/start/setup.md
@@ -1,13 +1,12 @@
 # Setting Up a Project
 
-### Using `vue-cli`
+### Using `@vue/cli`
 
-It's recommended to scaffold a project using `vue-loader` with `vue-cli`:
+It's recommended to scaffold a project using `vue-loader` with `@vue/cli`:
 
 ``` bash
-npm install -g vue-cli
-vue init webpack-simple hello-vue
+npm install -g @vue/cli
+vue create hello-vue
 cd hello-vue
-npm install
-npm run dev # ready to go!
+npm run serve # ready to go!
 ```
diff --git a/docs/en/workflow/linting.md b/docs/en/workflow/linting.md
index 599a57620..d1d85d02f 100644
--- a/docs/en/workflow/linting.md
+++ b/docs/en/workflow/linting.md
@@ -2,14 +2,16 @@
 
 You may have been wondering how do you lint your code inside `*.vue` files, since they are not JavaScript. We will assume you are using [ESLint](https://eslint.org/) (if you are not, you should!).
 
-You will also need the [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) which supports extracting and linting the JavaScript inside `*.vue` files.
+You will also need the official [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) which supports linting both the template and script parts of Vue files.
 
-Make sure to include the plugin in your ESLint config:
+Make sure to use the plugin's included config in your ESLint config:
 
 ``` json
-"plugins": [
-  "html"
-]
+{
+  "extends": [
+    "plugin:vue/essential"
+  ]
+}
 ```
 
 Then from the command line:
@@ -24,50 +26,7 @@ Another option is using [eslint-loader](https://github.com/MoOx/eslint-loader) s
 npm install eslint eslint-loader --save-dev
 ```
 
-``` js
-// webpack.config.js
-module.exports = {
-  // ... other options
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue!eslint'
-      }
-    ]
-  }
-}
-```
-
-Note that webpack loader chains are applied **right-first**. Make sure to apply `eslint` before `vue` so we are linting the pre-compile source code.
-
-One thing we need to consider is using third party `*.vue` components shipped in NPM packages. In such case, we want to use `vue-loader` to process the third party component, but do not want to lint it. We can separate the linting into webpack's [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order):
-
-``` js
-// webpack.config.js
-module.exports = {
-  // ... other options
-  module: {
-    // only lint local *.vue files
-    preLoaders: [
-      {
-        test: /\.vue$/,
-        loader: 'eslint',
-        exclude: /node_modules/
-      }
-    ],
-    // but use vue-loader for all *.vue files
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  }
-}
-```
-
-For webpack 2.x:
+Make sure it's applied as a pre-loader:
 
 ``` js
 // webpack.config.js
@@ -75,17 +34,11 @@ module.exports = {
   // ... other options
   module: {
     rules: [
-      // only lint local *.vue files
       {
         enforce: 'pre',
-        test: /\.vue$/,
+        test: /\.(js|vue)$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
-      },
-      // but use vue-loader for all *.vue files
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader'
       }
     ]
   }
diff --git a/docs/en/workflow/production.md b/docs/en/workflow/production.md
index b06bd49d9..8d5983cbd 100644
--- a/docs/en/workflow/production.md
+++ b/docs/en/workflow/production.md
@@ -19,18 +19,12 @@ module.exports = {
       }
     }),
     // minify with dead-code elimination
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    // webpack 1 only - optimize module ids by occurrence count
-    new webpack.optimize.OccurrenceOrderPlugin()
+    new webpack.optimize.UglifyJsPlugin()
   ]
 }
 ```
 
-Obviously we don't want to use this config during development, so there are several ways to approach this:
+We don't want to use this config during development, so there are several ways to approach this:
 
 1. Dynamically build up the configuration object based on an environment variable;
 
diff --git a/docs/en/workflow/testing.md b/docs/en/workflow/testing.md
index ffa945f93..59a0b9109 100644
--- a/docs/en/workflow/testing.md
+++ b/docs/en/workflow/testing.md
@@ -1,101 +1,5 @@
 # Testing
 
-> The [webpack vue-cli template](https://github.com/vuejs-templates/webpack) offers pre-configured unit testing and e2e testing setups for you.
+- [@vue/cli](https://github.com/vuejs/vue-cli) offers pre-configured unit testing and e2e testing setups for you.
 
-When testing `*.vue` files, we cannot use a plain CommonJS-based test runner because it won't know how to handle `*.vue` files. Instead, we still use webpack + vue-loader to bundle our test files. The recommended setup is using [Karma](https://karma-runner.github.io/0.13/index.html) and [karma-webpack](https://github.com/webpack/karma-webpack).
-
-Karma is a test runner that launches browsers and runs your tests for you. You can choose what browsers you want to test in and what test framework (e.g. Mocha or Jasmine) you want to use. Here is an example Karma configuration that runs the tests inside [PhantomJS](http://phantomjs.org/) with the [Jasmine](https://jasmine.github.io/edge/introduction.html) test framework:
-
-``` bash
-npm install\
-  karma karma-webpack\
-  karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs-prebuilt\
-  --save-dev
-```
-
-``` js
-// we can just use the exact same webpack config by requiring it
-// however, remember to delete the original entry since we don't
-// need it during tests
-var webpackConfig = require('./webpack.config.js')
-delete webpackConfig.entry
-
-// karma.conf.js
-module.exports = function (config) {
-  config.set({
-    browsers: ['PhantomJS'],
-    frameworks: ['jasmine'],
-    // this is the entry file for all our tests.
-    files: ['test/index.js'],
-    // we will pass the entry file to webpack for bundling.
-    preprocessors: {
-      'test/index.js': ['webpack']
-    },
-    // use the webpack config
-    webpack: webpackConfig,
-    // avoid walls of useless text
-    webpackMiddleware: {
-      noInfo: true
-    },
-    singleRun: true
-  })
-}
-```
-
-And for the entry `test/index.js` file:
-
-``` js
-// test/index.js
-// require all test files using special webpack feature
-// https://webpack.github.io/docs/context.html#require-context
-var testsContext = require.context('.', true, /\.spec$/)
-testsContext.keys().forEach(testsContext)
-```
-
-This entry file simply requires all other files that ends in `.spec.js` in the same folder. Now we can actually write some tests:
-
-``` js
-// test/component-a.spec.js
-var Vue = require('vue')
-var ComponentA = require('../../src/components/a.vue')
-
-describe('a.vue', function () {
-
-  // asserting JavaScript options
-  it('should have correct message', function () {
-    expect(ComponentA.data().msg).toBe('Hello from Component A!')
-  })
-
-  // asserting rendered result by actually rendering the component
-  it('should render correct message', function () {
-    var vm = new Vue({
-      template: '<div><test></test></div>',
-      components: {
-        'test': ComponentA
-      }
-    }).$mount()
-    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
-  })
-})
-```
-
-To run the tests, add the following NPM script:
-
-``` js
-// package.json
-...
-"scripts": {
-  ...
-  "test": "karma start karma.conf.js"
-}
-...
-```
-
-Finally, run:
-
-``` bash
-npm test
-```
-
-Again, [webpack vue-cli template](https://github.com/vuejs-templates/webpack) contains a fully working example with tests.
+- If you are interested in manually setting up unit tests for `*.vue` files, consult [the docs for `@vue/test-utils`](https://vue-test-utils.vuejs.org/en/).

From 886d727e53d2db8051088b535a440ad6030dfb7f Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Wed, 31 Jan 2018 13:09:08 +0800
Subject: [PATCH 816/877] chore: update screenshot (#1144)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9704c3d96..d8dfed1c4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 > Vue.js component loader for [Webpack](https://webpack.js.org/).
 
 <p align="center">
-  <img width="809px" src="https://raw.githubusercontent.com/vuejs/vue-syntax-highlight/master/samples/screenshot.png">
+  <img width="809px" src="https://raw.githubusercontent.com/vuejs/vue-syntax-highlight/new/samples/screenshot.png">
 </p>
 
 The best way to get started is with [vue-cli](https://github.com/vuejs/vue-cli):

From 863a1c1718130decdd0d83eb49f8d6afbaf9d400 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 00:25:01 -0500
Subject: [PATCH 817/877] revert source map line offset

---
 lib/parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index d07496d29..5eec24ae4 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -45,7 +45,7 @@ function generateSourceMap (filename, source, generated, sourceRoot) {
       map.addMapping({
         source: filename,
         original: {
-          line: index,
+          line: index + 1,
           column: 0
         },
         generated: {

From 46f72d3b82ac9352e99060690c83d3f77c6f44f0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 00:25:08 -0500
Subject: [PATCH 818/877] 14.0.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 432d94c91..6bb9d3551 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.0.0",
+  "version": "14.0.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 41436e4614d37022fd22dbbe3660ac2286566c1d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 00:26:39 -0500
Subject: [PATCH 819/877] update readme to use new vue-cli

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d8dfed1c4..aa224b344 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,10 @@
 The best way to get started is with [vue-cli](https://github.com/vuejs/vue-cli):
 
 ``` js
-npm install -g vue-cli
-vue init webpack-simple hello
+npm install -g @vue/cli
+vue create hello
 cd hello
-npm install
-npm run dev
+npm run serve
 ```
 
 This will setup a basic Webpack + `vue-loader` project for you, with `*.vue` files and hot-reloading working out of the box!

From 289b4d9e7c4d2761597c9f038332897abb5c3f76 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 02:25:04 -0500
Subject: [PATCH 820/877] refactor: webpack 4 compat + improve test setup

---
 lib/loader.js                             |  37 ++--
 lib/style-compiler/index.js               |  32 +---
 lib/style-compiler/load-postcss-config.js |   4 +-
 lib/template-compiler/index.js            |  15 +-
 lib/template-compiler/preprocessor.js     |   4 +-
 package.json                              |   6 +-
 test/fixtures/entry.js                    |   7 +
 test/test.js                              | 210 +++++++++-------------
 yarn.lock                                 |  18 +-
 9 files changed, 125 insertions(+), 208 deletions(-)
 create mode 100644 test/fixtures/entry.js

diff --git a/lib/loader.js b/lib/loader.js
index 63fb38fb9..7f40251b7 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -53,15 +53,7 @@ module.exports = function (content) {
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
 
   const loaderContext = this
-  const query = loaderUtils.getOptions(this) || {}
-  const options = Object.assign(
-    {
-      esModule: true
-    },
-    this.options.vue,
-    this.vue,
-    query
-  )
+  const options = Object.assign({ esModule: true }, loaderUtils.getOptions(this))
 
   // shadow mode is an internal option
   // enabled via vue-cli's --target web-component
@@ -69,12 +61,12 @@ module.exports = function (content) {
 
   // disable esModule in inject mode
   // because import/export must be top-level
-  if (query.inject) {
+  if (options.inject) {
     options.esModule = false
   }
 
-  // #824 avoid multiple webpack runs complaining about unknown option
-  Object.defineProperty(this.options, '__vueOptions__', {
+  // share options between the main loader of style/template loaders
+  Object.defineProperty(this._compilation, '__vueOptions__', {
     value: options,
     enumerable: false,
     configurable: true
@@ -85,8 +77,8 @@ module.exports = function (content) {
   const fileName = path.basename(filePath)
 
   const context =
-    (this._compiler && this._compiler.context) ||
-    this.options.context ||
+    this.rootContext ||
+    (this.options && this.options.context) ||
     process.cwd()
   const sourceRoot = path.dirname(path.relative(context, filePath))
   const shortFilePath = path.relative(context, filePath).replace(/^(\.\.[\\\/])+/, '')
@@ -135,14 +127,7 @@ module.exports = function (content) {
       id: moduleId,
       hasScoped,
       hasComment,
-      transformToRequire: options.transformToRequire,
-      preserveWhitespace: options.preserveWhitespace,
-      buble: bubleTemplateOptions,
-      // only pass compilerModules if it's a path string
-      compilerModules:
-        typeof options.compilerModules === 'string'
-          ? options.compilerModules
-          : undefined
+      buble: bubleTemplateOptions
     })
 
   const defaultLoaders = {
@@ -300,7 +285,7 @@ module.exports = function (content) {
         '\n'
     }
     // inject loader interop
-    if (query.inject) {
+    if (options.inject) {
       output += '__vue_script__ = __vue_script__(injections)\n'
     }
   } else {
@@ -423,7 +408,7 @@ module.exports = function (content) {
     output += '\n'
   }
 
-  if (!query.inject) {
+  if (!options.inject) {
     // hot reload
     if (needsHotReload) {
       output +=
@@ -615,7 +600,7 @@ module.exports = function (content) {
           vue: true,
           id: moduleId,
           scoped: !!scoped,
-          hasInlineConfig: !!query.postcss
+          sourceMap: cssSourceMap
         }) +
         '!'
       // normalize scss/sass/postcss if no specific loaders have been provided
@@ -636,7 +621,7 @@ module.exports = function (content) {
         : loaders[lang]
 
     const injectString =
-      type === 'script' && query.inject ? 'inject-loader!' : ''
+      type === 'script' && options.inject ? 'inject-loader!' : ''
 
     if (loader != null) {
       if (Array.isArray(loader)) {
diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index 42dae638f..8cc3e5a42 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -8,24 +8,10 @@ const scopeId = require('./plugins/scope-id')
 module.exports = function (css, map) {
   this.cacheable()
   const cb = this.async()
+  const loaderOptions = loaderUtils.getOptions(this) || {}
+  const inlineConfig = (this._compilation.__vueOptions__ || {}).postcss
 
-  const query = loaderUtils.getOptions(this) || {}
-  let vueOptions = this.options.__vueOptions__
-
-  if (!vueOptions) {
-    if (query.hasInlineConfig) {
-      this.emitError(
-        `\n  [vue-loader] It seems you are using HappyPack with inline postcss ` +
-          `options for vue-loader. This is not supported because loaders running ` +
-          `in different threads cannot share non-serializable options. ` +
-          `It is recommended to use a postcss config file instead.\n` +
-          `\n  See http://vue-loader.vuejs.org/en/features/postcss.html#using-a-config-file for more details.\n`
-      )
-    }
-    vueOptions = Object.assign({}, this.options.vue, this.vue)
-  }
-
-  loadPostcssConfig(this, vueOptions.postcss)
+  loadPostcssConfig(this, inlineConfig)
     .then(config => {
       const plugins = config.plugins.concat(trim)
       const options = Object.assign(
@@ -38,18 +24,12 @@ module.exports = function (css, map) {
       )
 
       // add plugin for vue-loader scoped css rewrite
-      if (query.scoped) {
-        plugins.push(scopeId({ id: query.id }))
+      if (loaderOptions.scoped) {
+        plugins.push(scopeId({ id: loaderOptions.id }))
       }
 
       // source map
-      if (
-        this.sourceMap &&
-        !this.minimize &&
-        vueOptions.cssSourceMap !== false &&
-        process.env.NODE_ENV !== 'production' &&
-        !options.map
-      ) {
+      if (loaderOptions.sourceMap && !options.map) {
         options.map = {
           inline: false,
           annotation: false,
diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index 13f394ea8..eae1a37cf 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -26,9 +26,7 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
       if (err.message.indexOf('No PostCSS Config found') >= 0) {
         return
       }
-      const friendlyErr = new Error(`Error loading PostCSS config: ${err.message}`)
-      Error.captureStackTrace(friendlyErr, err)
-      loaderContext.emitError(friendlyErr)
+      loaderContext.emitWarning(`Error loading PostCSS config: ${err.message}`)
     })
   }
 
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 95d8ff00b..6deb41097 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -11,22 +11,15 @@ module.exports = function (html) {
   this.cacheable()
   const isServer = this.target === 'node'
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  const vueOptions = this.options.__vueOptions__ || {}
+  const vueOptions = this._compilation.__vueOptions__ || {}
   const options = loaderUtils.getOptions(this) || {}
   const needsHotReload = !isServer && !isProduction && vueOptions.hotReload !== false
   const defaultModules = [transformRequire(options.transformToRequire), transformSrcset()]
-  let userModules = vueOptions.compilerModules || options.compilerModules
-
-  // for HappyPack cross-process use cases
-  if (typeof userModules === 'string') {
-    userModules = require(userModules)
-  }
 
   const compilerOptions = {
-    preserveWhitespace: options.preserveWhitespace,
-    modules: defaultModules.concat(userModules || []),
-    directives:
-      vueOptions.compilerDirectives || options.compilerDirectives || {},
+    preserveWhitespace: vueOptions.preserveWhitespace,
+    modules: defaultModules.concat(vueOptions.compilerModules || []),
+    directives: vueOptions.compilerDirectives || {},
     scopeId: options.hasScoped ? options.id : null,
     comments: options.hasComment
   }
diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index abdd7d093..0ca6a4eaf 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -20,8 +20,8 @@ module.exports = function (content) {
   }
 
   // allow passing options to the template preprocessor via `template` option
-  if (this.options.__vueOptions__) {
-    Object.assign(opt, this.options.__vueOptions__.template)
+  if (this._compilation.__vueOptions__) {
+    Object.assign(opt, this._compilation.__vueOptions__.template)
   }
 
   // for relative includes
diff --git a/package.json b/package.json
index 6bb9d3551..a30a94487 100644
--- a/package.json
+++ b/package.json
@@ -70,13 +70,11 @@
     "css-loader": "^0.28.4",
     "eslint": "^3.19.0",
     "eslint-plugin-vue-libs": "^1.2.0",
-    "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.5",
     "gitbook-plugin-edit-link": "^2.0.2",
     "gitbook-plugin-github": "^3.0.0",
     "gitbook-plugin-theme-vuejs": "^1.1.0",
-    "yorkie": "^1.0.3",
     "inject-loader": "^3.0.1",
     "js-yaml": "^3.9.1",
     "jsdom": "^9.2.1",
@@ -98,6 +96,8 @@
     "vue": "^2.5.0",
     "vue-server-renderer": "^2.5.0",
     "vue-template-compiler": "^2.5.0",
-    "webpack": "^3.7.1"
+    "webpack": "^3.0.0",
+    "webpack-merge": "^4.1.1",
+    "yorkie": "^1.0.3"
   }
 }
diff --git a/test/fixtures/entry.js b/test/fixtures/entry.js
new file mode 100644
index 000000000..a011a5b1f
--- /dev/null
+++ b/test/fixtures/entry.js
@@ -0,0 +1,7 @@
+const Component = require('~target')
+
+if (typeof window !== 'undefined') {
+  window.vueModule = Component
+}
+
+module.exports = Component
diff --git a/test/test.js b/test/test.js
index e87d7bc82..e7f8ddcf2 100644
--- a/test/test.js
+++ b/test/test.js
@@ -4,6 +4,7 @@ const fs = require('fs')
 const path = require('path')
 const jsdom = require('jsdom')
 const webpack = require('webpack')
+const merge = require('webpack-merge')
 const MemoryFS = require('memory-fs')
 const expect = require('chai').expect
 const hash = require('hash-sum')
@@ -14,10 +15,11 @@ const normalizeNewline = require('normalize-newline')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const SourceMapConsumer = require('source-map').SourceMapConsumer
 
-const rawLoaderPath = path.resolve(__dirname, '../index.js')
-const loaderPath = 'expose-loader?vueModule!' + rawLoaderPath
 const mfs = new MemoryFS()
+const loaderPath = path.resolve(__dirname, '../index.js')
 const globalConfig = {
+  // mode: 'development',
+  devtool: false,
   output: {
     path: '/',
     filename: 'test.build.js'
@@ -40,15 +42,31 @@ function genId (file) {
 }
 
 function bundle (options, cb, wontThrowError) {
-  const vueOptions = options.vue
-  delete options.vue
-  const config = Object.assign({}, globalConfig, options)
-
-  // assign vue Options
-  if (vueOptions) {
-    config.plugins = (config.plugins || []).concat(new webpack.LoaderOptionsPlugin({
-      vue: vueOptions
-    }))
+  let config = merge({}, globalConfig, options)
+
+  if (config.vue) {
+    const vueOptions = options.vue
+    delete config.vue
+    const vueIndex = config.module.rules.findIndex(r => r.test.test('.vue'))
+    const vueRule = config.module.rules[vueIndex]
+    config.module.rules[vueIndex] = Object.assign({}, vueRule, { options: vueOptions })
+  }
+
+  if (/\.vue$/.test(config.entry)) {
+    const vueFile = config.entry
+    config = merge(config, {
+      entry: require.resolve('./fixtures/entry'),
+      resolve: {
+        alias: {
+          '~target': path.resolve(__dirname, './fixtures', vueFile)
+        }
+      }
+    })
+  }
+
+  if (options.modify) {
+    delete config.modify
+    options.modify(config)
   }
 
   const webpackCompiler = webpack(config)
@@ -99,14 +117,14 @@ function mockRender (options, data = {}) {
 
 function interopDefault (module) {
   return module
-    ? module.__esModule ? module.default : module
+    ? module.default ? module.default : module
     : module
 }
 
 describe('vue-loader', () => {
   it('basic', done => {
     test({
-      entry: './test/fixtures/basic.vue'
+      entry: 'basic.vue'
     }, (window, module, rawModule) => {
       const vnode = mockRender(module, {
         msg: 'hi'
@@ -127,7 +145,7 @@ describe('vue-loader', () => {
 
   it('expose filename', done => {
     test({
-      entry: './test/fixtures/basic.vue'
+      entry: 'basic.vue'
     }, (window, module, rawModule) => {
       expect(module.__file).to.equal(path.normalize('test/fixtures/basic.vue'))
       done()
@@ -136,7 +154,7 @@ describe('vue-loader', () => {
 
   it('pre-processors', done => {
     test({
-      entry: './test/fixtures/pre.vue'
+      entry: 'pre.vue'
     }, (window, module) => {
       const vnode = mockRender(module)
       // div
@@ -156,7 +174,7 @@ describe('vue-loader', () => {
 
   it('pre-processors with extract css', done => {
     test({
-      entry: './test/fixtures/pre.vue',
+      entry: 'pre.vue',
       vue: {
         extractCSS: true
       },
@@ -182,7 +200,7 @@ describe('vue-loader', () => {
 
   it('scoped style', done => {
     test({
-      entry: './test/fixtures/scoped-css.vue'
+      entry: 'scoped-css.vue'
     }, (window, module) => {
       const id = 'data-v-' + genId('scoped-css.vue')
       expect(module._scopeId).to.equal(id)
@@ -227,7 +245,7 @@ describe('vue-loader', () => {
 
   it('style import', done => {
     test({
-      entry: './test/fixtures/style-import.vue'
+      entry: 'style-import.vue'
     }, (window) => {
       const styles = window.document.querySelectorAll('style')
       expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
@@ -240,7 +258,7 @@ describe('vue-loader', () => {
 
   it('template import', done => {
     test({
-      entry: './test/fixtures/template-import.vue'
+      entry: 'template-import.vue'
     }, (window, module) => {
       const vnode = mockRender(module)
       // '<div><h1>hello</h1></div>'
@@ -252,7 +270,7 @@ describe('vue-loader', () => {
 
   it('script import', done => {
     test({
-      entry: './test/fixtures/script-import.vue'
+      entry: 'script-import.vue'
     }, (window, module) => {
       expect(module.data().msg).to.contain('Hello from Component A!')
       done()
@@ -261,10 +279,10 @@ describe('vue-loader', () => {
 
   it('source map', done => {
     bundle({
-      entry: './test/fixtures/basic.vue',
+      entry: 'basic.vue',
       devtool: '#source-map'
     }, (code, warnings) => {
-      const map = mfs.readFileSync('/test.build.js.map').toString()
+      const map = mfs.readFileSync('/test.build.js.map', 'utf-8')
       const smc = new SourceMapConsumer(JSON.parse(map))
       let line
       let col
@@ -288,7 +306,7 @@ describe('vue-loader', () => {
 
   it('media-query', done => {
     test({
-      entry: './test/fixtures/media-query.vue'
+      entry: 'media-query.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
@@ -300,7 +318,7 @@ describe('vue-loader', () => {
 
   it('supports-query', done => {
     test({
-      entry: './test/fixtures/supports-query.vue'
+      entry: 'supports-query.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
@@ -312,7 +330,7 @@ describe('vue-loader', () => {
 
   it('extract CSS', done => {
     bundle({
-      entry: './test/fixtures/extract-css.vue',
+      entry: 'extract-css.vue',
       vue: {
         loaders: {
           css: ExtractTextPlugin.extract('css-loader'),
@@ -333,7 +351,7 @@ describe('vue-loader', () => {
 
   it('extract CSS using option', done => {
     bundle({
-      entry: './test/fixtures/extract-css.vue',
+      entry: 'extract-css.vue',
       vue: {
         extractCSS: true
       },
@@ -352,7 +370,7 @@ describe('vue-loader', () => {
   it('extract CSS using option (passing plugin instance)', done => {
     const plugin = new ExtractTextPlugin('test.output.css')
     bundle({
-      entry: './test/fixtures/extract-css.vue',
+      entry: 'extract-css.vue',
       vue: {
         extractCSS: plugin
       },
@@ -389,15 +407,14 @@ describe('vue-loader', () => {
 
   it('translates relative URLs and respects resolve alias', done => {
     test({
-      entry: './test/fixtures/resolve.vue',
+      entry: 'resolve.vue',
       resolve: {
         alias: {
-          fixtures: path.resolve(__dirname, 'fixtures')
+          fixtures: path.resolve(__dirname, './fixtures')
         }
       },
       module: {
         rules: [
-          { test: /\.vue$/, loader: loaderPath },
           { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
         ]
       }
@@ -421,10 +438,9 @@ describe('vue-loader', () => {
 
   it('transformToRequire option', done => {
     test({
-      entry: './test/fixtures/transform.vue',
+      entry: 'transform.vue',
       module: {
         rules: [
-          { test: /\.vue$/, loader: loaderPath },
           {
             test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
             loader: 'url-loader'
@@ -462,7 +478,7 @@ describe('vue-loader', () => {
 
   it('postcss options', done => {
     test({
-      entry: './test/fixtures/postcss.vue',
+      entry: 'postcss.vue',
       vue: {
         postcss: {
           options: {
@@ -481,7 +497,7 @@ describe('vue-loader', () => {
   it('load postcss config file', done => {
     fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
     test({
-      entry: './test/fixtures/postcss.vue'
+      entry: 'postcss.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
@@ -494,7 +510,7 @@ describe('vue-loader', () => {
   it('load postcss config file by path', done => {
     fs.writeFileSync('test/.postcssrc', JSON.stringify({ parser: 'sugarss' }))
     test({
-      entry: './test/fixtures/postcss.vue',
+      entry: 'postcss.vue',
       vue: {
         postcss: {
           config: {
@@ -514,14 +530,14 @@ describe('vue-loader', () => {
   it('load postcss config file with js syntax error', done => {
     fs.writeFileSync('.postcssrc.js', 'module.exports = { hello }')
     test({
-      entry: './test/fixtures/basic.vue'
+      entry: 'basic.vue'
     }, (window, module, vueModule, instance, jsdomErr, webpackInfo) => {
       const { stats: { compilation: { warnings, errors }}, err } = webpackInfo
       expect(jsdomErr).to.be.null
       expect(err).to.be.null
-      expect(warnings).to.be.empty
-      expect(errors.length).to.equal(1)
-      expect(errors[0].message).match(/^Error loading PostCSS config\:/)
+      expect(errors).to.be.empty
+      expect(warnings.length).to.equal(1)
+      expect(warnings[0]).to.match(/Error loading PostCSS config\:/)
       fs.unlinkSync('.postcssrc.js')
       done()
     }, true)
@@ -529,7 +545,7 @@ describe('vue-loader', () => {
 
   it('postcss lang', done => {
     test({
-      entry: './test/fixtures/postcss-lang.vue'
+      entry: 'postcss-lang.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
       style = normalizeNewline(style)
@@ -540,7 +556,7 @@ describe('vue-loader', () => {
 
   it('transpile ES2015 features in template', done => {
     test({
-      entry: './test/fixtures/es2015.vue'
+      entry: 'es2015.vue'
     }, (window, module) => {
       const vnode = mockRender(module, {
         a: 'hello',
@@ -556,7 +572,7 @@ describe('vue-loader', () => {
 
   it('allows to export extended constructor', done => {
     test({
-      entry: './test/fixtures/extend.vue'
+      entry: 'extend.vue'
     }, (window, Module) => {
       // extend.vue should export Vue constructor
       const vnode = mockRender(Module.options, {
@@ -569,30 +585,10 @@ describe('vue-loader', () => {
     })
   })
 
-  it('support es compatible modules', done => {
-    test({
-      entry: './test/fixtures/basic.vue',
-      vue: {
-        esModule: true
-      }
-    }, (window, module, rawModule) => {
-      expect(rawModule.__esModule).to.equal(true)
-      const vnode = mockRender(rawModule.default, {
-        msg: 'hi'
-      })
-      expect(vnode.tag).to.equal('h2')
-      expect(vnode.data.staticClass).to.equal('red')
-      expect(vnode.children[0].text).to.equal('hi')
-
-      expect(rawModule.default.data().msg).to.contain('Hello from Component A!')
-      done()
-    })
-  })
-
   it('css-modules', done => {
     function testWithIdent (localIdentName, regexToMatch, cb) {
       test({
-        entry: './test/fixtures/css-modules.vue',
+        entry: 'css-modules.vue',
         vue: {
           cssModules: localIdentName && {
             localIdentName: localIdentName
@@ -630,14 +626,14 @@ describe('vue-loader', () => {
     testWithIdent(undefined, /^\w{23}/, () => {
       // specified localIdentName
       const ident = '[path][name]---[local]---[hash:base64:5]'
-      const regex = /^test-fixtures-css-modules---red---\w{5}/
+      const regex = /css-modules---red---\w{5}/
       testWithIdent(ident, regex, done)
     })
   })
 
   it('css-modules in SSR', done => {
     bundle({
-      entry: './test/fixtures/css-modules.vue',
+      entry: 'css-modules.vue',
       target: 'node',
       output: Object.assign({}, globalConfig.output, {
         libraryTarget: 'commonjs2'
@@ -663,7 +659,7 @@ describe('vue-loader', () => {
 
   it('should allow adding custom html loaders', done => {
     test({
-      entry: './test/fixtures/markdown.vue',
+      entry: 'markdown.vue',
       vue: {
         loaders: {
           html: 'marked'
@@ -684,11 +680,9 @@ describe('vue-loader', () => {
   it('support chaining with other loaders', done => {
     const mockLoaderPath = require.resolve('./mock-loaders/js')
     test({
-      entry: './test/fixtures/basic.vue',
-      module: {
-        rules: [
-          { test: /\.vue$/, loader: loaderPath + '!' + mockLoaderPath }
-        ]
+      entry: 'basic.vue',
+      modify: config => {
+        config.module.rules[0].loader = loaderPath + '!' + mockLoaderPath
       }
     }, (window, module) => {
       expect(module.data().msg).to.equal('Changed!')
@@ -705,10 +699,7 @@ describe('vue-loader', () => {
         filename: 'test.build.js',
         libraryTarget: 'commonjs2'
       },
-      externals: ['vue'],
-      module: {
-        rules: [{ test: /\.vue$/, loader: rawLoaderPath }]
-      }
+      externals: ['vue']
     }, code => {
       const renderer = SSR.createBundleRenderer(code, {
         basedir: __dirname,
@@ -740,7 +731,7 @@ describe('vue-loader', () => {
 
   it('extract custom blocks to a separate file', done => {
     bundle({
-      entry: './test/fixtures/custom-language.vue',
+      entry: 'custom-language.vue',
       vue: {
         loaders: {
           'documentation': ExtractTextPlugin.extract('raw-loader')
@@ -759,7 +750,7 @@ describe('vue-loader', () => {
 
   it('add custom blocks to the webpack output', done => {
     bundle({
-      entry: './test/fixtures/custom-language.vue',
+      entry: 'custom-language.vue',
       vue: {
         loaders: {
           'unit-test': 'babel-loader'
@@ -773,7 +764,7 @@ describe('vue-loader', () => {
 
   it('custom blocks work with src imports', done => {
     bundle({
-      entry: './test/fixtures/custom-import.vue',
+      entry: 'custom-import.vue',
       vue: {
         loaders: {
           'unit-test': 'babel-loader'
@@ -788,7 +779,7 @@ describe('vue-loader', () => {
   it('passes Component to custom block loaders', done => {
     const mockLoaderPath = require.resolve('./mock-loaders/docs')
     test({
-      entry: './test/fixtures/custom-language.vue',
+      entry: 'custom-language.vue',
       vue: {
         loaders: {
           'documentation': mockLoaderPath
@@ -802,7 +793,7 @@ describe('vue-loader', () => {
 
   it('custom blocks can be ignored', done => {
     bundle({
-      entry: './test/fixtures/custom-language.vue'
+      entry: 'custom-language.vue'
     }, (code, warnings) => {
       expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
       done()
@@ -811,7 +802,7 @@ describe('vue-loader', () => {
 
   it('custom blocks with ES module default export', done => {
     test({
-      entry: './test/fixtures/custom-blocks.vue',
+      entry: 'custom-blocks.vue',
       vue: {
         loaders: {
           esm: require.resolve('./mock-loaders/identity')
@@ -826,7 +817,7 @@ describe('vue-loader', () => {
 
   it('passes attributes as options to the loader', done => {
     bundle({
-      entry: './test/fixtures/custom-options.vue',
+      entry: 'custom-options.vue',
       vue: {
         loaders: {
           'unit-test': 'babel-loader!skeleton-loader'
@@ -855,7 +846,7 @@ describe('vue-loader', () => {
 
   it('pre/post loaders', done => {
     test({
-      entry: './test/fixtures/basic.vue',
+      entry: 'basic.vue',
       vue: {
         preLoaders: {
           js: require.resolve('./mock-loaders/js'),
@@ -884,7 +875,7 @@ describe('vue-loader', () => {
 
   it('pre/post loaders for custom blocks', done => {
     test({
-      entry: './test/fixtures/custom-blocks.vue',
+      entry: 'custom-blocks.vue',
       vue: {
         preLoaders: {
           i18n: require.resolve('./mock-loaders/yaml')
@@ -910,7 +901,7 @@ describe('vue-loader', () => {
 
   it('custom compiler modules', done => {
     test({
-      entry: './test/fixtures/custom-module.vue',
+      entry: 'custom-module.vue',
       vue: {
         compilerModules: [
           {
@@ -940,24 +931,9 @@ describe('vue-loader', () => {
     })
   })
 
-  it('custom compiler modules (string)', done => {
-    test({
-      entry: './test/fixtures/basic.vue',
-      vue: {
-        compilerModules: require.resolve('./fixtures/custom-module')
-      }
-    }, (window, module) => {
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-      expect(vnode.data.staticClass).to.equal('red blue')
-      done()
-    })
-  })
-
   it('custom compiler directives', done => {
     test({
-      entry: './test/fixtures/custom-directive.vue',
+      entry: 'custom-directive.vue',
       vue: {
         compilerDirectives: {
           i18n (el, dir) {
@@ -980,7 +956,7 @@ describe('vue-loader', () => {
 
   it('functional component with styles', done => {
     test({
-      entry: './test/fixtures/functional-style.vue'
+      entry: 'functional-style.vue'
     }, (window, module, rawModule) => {
       expect(module.functional).to.equal(true)
       const vnode = mockRender(module)
@@ -998,7 +974,7 @@ describe('vue-loader', () => {
 
   it('template with comments', done => {
     test({
-      entry: './test/fixtures/template-comment.vue'
+      entry: 'template-comment.vue'
     }, (window, module, rawModule) => {
       expect(module.comments).to.equal(true)
       const vnode = mockRender(module, {
@@ -1016,7 +992,7 @@ describe('vue-loader', () => {
 
   it('functional template', done => {
     test({
-      entry: './test/fixtures/functional-root.vue',
+      entry: 'functional-root.vue',
       vue: {
         preserveWhitespace: false
       }
@@ -1055,33 +1031,9 @@ describe('vue-loader', () => {
     })
   })
 
-  it('hot reload enabled', done => {
-    bundle({
-      entry: './test/fixtures/basic.vue',
-      vue: {
-        hotReload: true
-      }
-    }, (code) => {
-      expect(code).to.contains('require("vue-hot-reload-api")')
-      done()
-    })
-  })
-
-  it('hot reload disabled', done => {
-    bundle({
-      entry: './test/fixtures/basic.vue',
-      vue: {
-        hotReload: false
-      }
-    }, (code) => {
-      expect(code).not.to.contains('require("vue-hot-reload-api")')
-      done()
-    })
-  })
-
   it('named exports', done => {
     test({
-      entry: './test/fixtures/named-exports.vue'
+      entry: 'named-exports.vue'
     }, (window, _, rawModule) => {
       expect(rawModule.default.name).to.equal('named-exports')
       expect(rawModule.foo()).to.equal(1)
diff --git a/yarn.lock b/yarn.lock
index cc6ffbd5c..1401fb9de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1785,10 +1785,6 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expose-loader@^0.7.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.4.tgz#9bcdd3878b5da9107930b55a03f65afe90b3314a"
-
 extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -4648,9 +4644,9 @@ vue-server-renderer@^2.5.0:
     serialize-javascript "^1.3.0"
     source-map "0.5.6"
 
-vue-style-loader@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-3.1.1.tgz#74fdef91a81d38bc0125746a1b5505e62d69e32c"
+vue-style-loader@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.0.1.tgz#252300d32eb97e83c1a1cb5b2029e2d8c3adcf9f"
   dependencies:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
@@ -4686,6 +4682,12 @@ webidl-conversions@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
+webpack-merge@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.1.tgz#f1197a0a973e69c6fbeeb6d658219aa8c0c13555"
+  dependencies:
+    lodash "^4.17.4"
+
 webpack-sources@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
@@ -4693,7 +4695,7 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^3.7.1:
+webpack@^3.0.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.10.0.tgz#5291b875078cf2abf42bdd23afe3f8f96c17d725"
   dependencies:

From fdb06e01317b603817bf9c9630740bac2bf7761c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 02:25:47 -0500
Subject: [PATCH 821/877] 14.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a30a94487..cc6b68ab5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.0.1",
+  "version": "14.0.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 23cb014008802810ca1aa1d10c1a5cbb4e574009 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 16:53:37 -0500
Subject: [PATCH 822/877] fix: only push shadow injector when there are styles
 in component

---
 lib/loader.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/loader.js b/lib/loader.js
index 7f40251b7..866160ae6 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -367,7 +367,10 @@ module.exports = function (content) {
     }
     output +=
       `var shadowInjectId = Component.options.__shadowInjectId = '${shadowInjectId}'\n` +
-      `;(window[shadowInjectId] || (window[shadowInjectId] = [])).push(injectStyle)\n`
+      `var injectors = window[shadowInjectId] || (window[shadowInjectId] = [])\n`
+    if (parts.styles.length) {
+      output += `injectors.push(injectStyle)`
+    }
   }
 
   // development-only code

From f408d01d3e472c98bf4a3b156c2dc38ee28f837b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 31 Jan 2018 16:53:44 -0500
Subject: [PATCH 823/877] 14.0.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cc6b68ab5..ee7247744 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.0.2",
+  "version": "14.0.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From d328131e4846fbb3bf3790015790a731a4bdda82 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Thu, 1 Feb 2018 03:54:05 +0300
Subject: [PATCH 824/877] [RU] Translation update (#1145)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример

* options.md новая секция

* hot-reload.md новая секция

* testing-with-mocks.md новые правки

* postcss.md правки

* options.md новые правки

* options.md правки

* asset-url.md добавлены разъяснения

* Update SUMMARY.md

* asset-url.md опечатка

* advanced.md удалена настройка для вебпака 1

* options.md удалено о первом вебпаке

* custom-block.md удалено о первом вебпаке

* extract-css.md удалено о первом вебпаке

* css-modules.md удалено о первом вебпаке

* postcss.md удалено о первом вебпаке

* setup.md обновление для @vue/cli

* linting.md обновление для eslint-plugin-vue

* production.md удалено о первом вебпаке

* testing.md  обновлено о @vue/test-utils
---
 docs/ru/SUMMARY.md                      |   2 +-
 docs/ru/configurations/advanced.md      |  25 ------
 docs/ru/configurations/asset-url.md     |   2 +-
 docs/ru/configurations/custom-blocks.md |   1 -
 docs/ru/configurations/extract-css.md   |  35 --------
 docs/ru/features/css-modules.md         |  11 ---
 docs/ru/features/postcss.md             |  15 +---
 docs/ru/options.md                      |  59 ++++++--------
 docs/ru/start/setup.md                  |  11 ++-
 docs/ru/workflow/linting.md             |  75 ++----------------
 docs/ru/workflow/production.md          |  10 +--
 docs/ru/workflow/testing.md             | 101 +-----------------------
 12 files changed, 45 insertions(+), 302 deletions(-)

diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index 29a1e3b57..406c1aee8 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -33,4 +33,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/ru/configurations/advanced.md b/docs/ru/configurations/advanced.md
index c61d81db5..daf4ba9f7 100644
--- a/docs/ru/configurations/advanced.md
+++ b/docs/ru/configurations/advanced.md
@@ -12,8 +12,6 @@
 
 > Опции `preLoaders` и `postLoaders` доступны только в версиях 10.3.0+
 
-### webpack 2.x
-
 ``` js
 module.exports = {
   // другие настройки...
@@ -59,27 +57,4 @@ module.exports = {
 }
 ```
 
-### webpack 1.x
-
-``` js
-// webpack.config.js
-module.exports = {
-  // другие настройки...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  },
-  // настройки vue-loader
-  vue: {
-    loaders: {
-      // такая же конфигурация правил как и выше
-    }
-  }
-}
-```
-
 Примером использования продвинутой конфигурации может быть например [извлечение CSS из компонентов в отдельный файл](./extract-css.md).
diff --git a/docs/ru/configurations/asset-url.md b/docs/ru/configurations/asset-url.md
index 5fde44942..7c5b0d0a2 100644
--- a/docs/ru/configurations/asset-url.md
+++ b/docs/ru/configurations/asset-url.md
@@ -1,6 +1,6 @@
 # Обработка вложенных URL
 
-По умолчанию `vue-loader` автоматически обрабатывает стили и файлы шаблонов с помощью [css-loader](https://github.com/webpack/css-loader) и компилятора шаблонов Vue. В процессе компиляции, все использованные URL, такие как `<img src="...">`, `background: url(...)` и CSS `@import` будут **обрабатаны как зависимости модуля**.
+По умолчанию `vue-loader` автоматически обрабатывает стили и файлы шаблонов с помощью [css-loader](https://github.com/webpack/css-loader) и компилятора шаблонов Vue. В процессе компиляции, все использованные URL, такие как `<img src="...">`, `background: url(...)` и CSS `@import` будут **обработаны как зависимости модуля**.
 
 Например, `url(./image.png)` будет преобразовано в `require('./image.png')`, а затем
 
diff --git a/docs/ru/configurations/custom-blocks.md b/docs/ru/configurations/custom-blocks.md
index 0da7a6cbc..81afaeba1 100644
--- a/docs/ru/configurations/custom-blocks.md
+++ b/docs/ru/configurations/custom-blocks.md
@@ -41,7 +41,6 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/ru/configurations/extract-css.md b/docs/ru/configurations/extract-css.md
index b185d3b84..2eb503159 100644
--- a/docs/ru/configurations/extract-css.md
+++ b/docs/ru/configurations/extract-css.md
@@ -39,8 +39,6 @@ module.exports = {
 
 Пример конфигурации для извлечения CSS из всех компонентов Vue в отдельный CSS-файл:
 
-### webpack 2.x
-
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
@@ -68,36 +66,3 @@ module.exports = {
   ]
 }
 ```
-
-### webpack 1.x
-
-``` bash
-npm install extract-text-webpack-plugin --save-dev
-```
-
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-
-module.exports = {
-  // другие настройки...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // вы также можете добавить <style lang="less"> или другие языки
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
-  plugins: [
-    new ExtractTextPlugin("style.css")
-  ]
-}
-```
diff --git a/docs/ru/features/css-modules.md b/docs/ru/features/css-modules.md
index ed86ca0ae..fda1c1b37 100644
--- a/docs/ru/features/css-modules.md
+++ b/docs/ru/features/css-modules.md
@@ -89,17 +89,6 @@ CSS-модули обрабатываются с помощью [css-loader](htt
 Вы можете использовать в `vue-loader` опцию `cssModules` чтобы добавить дополнительные параметры для `css-loader`:
 
 ``` js
-// webpack 1
-vue: {
-  cssModules: {
-    // другой шаблон для локального имени идентификатора
-    localIdentName: '[path][name]---[local]---[hash:base64:5]',
-    // использование camelCase
-    camelCase: true
-  }
-}
-
-// webpack 2
 module: {
   rules: [
     {
diff --git a/docs/ru/features/postcss.md b/docs/ru/features/postcss.md
index c29d5bda9..e971fc61f 100644
--- a/docs/ru/features/postcss.md
+++ b/docs/ru/features/postcss.md
@@ -27,20 +27,7 @@
 
 В качестве альтернативы, вы можете указать конфигурацию PostCSS специально для `*.vue` файлов с помощью опции `postcss` для `vue-loader`.
 
-Пример использования с webpack 1.x:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // другие настройки...
-  vue: {
-    // использование плагинов PostCSS
-    postcss: [require('postcss-cssnext')()]
-  }
-}
-```
-
-Для webpack 2.x:
+Пример:
 
 ``` js
 // webpack.config.js
diff --git a/docs/ru/options.md b/docs/ru/options.md
index a50b9e6f6..673062aa4 100644
--- a/docs/ru/options.md
+++ b/docs/ru/options.md
@@ -1,10 +1,9 @@
 # Перечень настроек
 
-## Отличия в использовании с webpack 1 & 2
-
-Для webpack 2: настройки можно передавать непосредственно в правилах загрузчиков.
+## Где указывать настройки
 
 ``` js
+// webpack.config.js
 module.exports = {
   // ...
   module: {
@@ -21,20 +20,9 @@ module.exports = {
 }
 ```
 
-Для webpack 1.x: добавить блок `vue` в корень конфигурации webpack:
-
-``` js
-module.exports = {
-  // ...
-  vue: {
-    // настройки vue-loader
-  }
-}
-```
-
 ### loaders
 
-- Тип: `{ [lang: string]: string }`
+- Тип: `{ [lang: string]: string | Object | Array }`
 
   Объект определяющий какие загрузчики webpack переопределят стандартные загрузчики, используемые для обработки секций `*.vue` файлов. Ключ соответствует атрибуту `lang` у секции файла, если таковой был указан. Значения `lang` по умолчанию:
 
@@ -45,7 +33,6 @@ module.exports = {
   Например, чтобы использовать `babel-loader` и `eslint-loader` для обработки всех секций `<script>`:
 
   ``` js
-  // Конфигурация webpack 2.x
   module: {
     rules: [
       {
@@ -61,17 +48,36 @@ module.exports = {
   }
   ```
 
+  Вы также можете использовать синтаксис объектов или массивов (обратите внимание, что параметры должны быть сериализуемы):
+
+  ``` js
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: [
+              { loader: 'cache-loader' },
+              { loader: 'babel-loader', options: { presets: ['env'] } }
+            ]
+          }
+        }
+      }
+    ]
+  }
+  ```
+
 ### preLoaders
 
 - Тип: `{ [lang: string]: string }`
-- поддерживается только в версиях 10.3.0+
 
   Конфигурация подобна как и в `loaders`, но `preLoaders` будут применены к соответствующим секциям перед стандартными загрузчиками. Вы можете использовать это для предварительной обработки секций - например для локализации на этапе сборки.
 
 ### postLoaders
 
 - Тип: `{ [lang: string]: string }`
-- поддерживается только в версиях 10.3.0+
 
   Конфигурация подобна как и в `loaders`, но `postLoaders` применяются после загрузчиков по умолчанию. Вы можете использовать это для пост-обработки языков. Обратите внимание, что тем не менее всё несколько сложнее:
 
@@ -81,7 +87,7 @@ module.exports = {
 
 ### postcss
 
-> Примечание: в версиях 11.0.0+ рекомендуется использовать файл конфигурации PostCSS вместо описания секции. [Использование аналогично как в `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+> Примечание: рекомендуется использовать файл конфигурации PostCSS, чтобы ваши стили в файлах vue и обычном CSS могли использовать одну и ту же конфигурацию. [Использование аналогично как в `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
 
 - Тип: `Array` или `Function` или `Object`
 
@@ -208,21 +214,6 @@ module.exports = {
   Пример конфигурации:
 
   ``` js
-  // webpack 1
-  vue: {
-    buble: {
-      // enable object spread operator
-      // ПРИМЕЧАНИЕ: вам нужно самостоятельно подключить полифилл для Object.assign!
-      objectAssign: 'Object.assign',
-
-      // отключение удаления `with`
-      transforms: {
-        stripWith: false
-      }
-    }
-  }
-
-  // webpack 2
   module: {
     rules: [
       {
diff --git a/docs/ru/start/setup.md b/docs/ru/start/setup.md
index 241c07bd0..3455d8626 100644
--- a/docs/ru/start/setup.md
+++ b/docs/ru/start/setup.md
@@ -1,13 +1,12 @@
 # Создание проекта
 
-### Использование `vue-cli`
+### Использование `@vue/cli`
 
-Рекомендуем создавать проекты, использующие `vue-loader`, с помощью `vue-cli`:
+Рекомендуем создавать проекты, использующие `vue-loader`, с помощью `@vue/cli`:
 
 ``` bash
-npm install -g vue-cli
-vue init webpack-simple hello-vue
+npm install -g @vue/cli
+vue create hello-vue
 cd hello-vue
-npm install
-npm run dev # можно начинать!
+npm run serve # можно начинать!
 ```
diff --git a/docs/ru/workflow/linting.md b/docs/ru/workflow/linting.md
index ed6757b14..a7b164d8d 100644
--- a/docs/ru/workflow/linting.md
+++ b/docs/ru/workflow/linting.md
@@ -2,72 +2,19 @@
 
 Вы, возможно, гадаете, как же прогонять код в `*.vue` файлах через статические анализаторы, поскольку это не JavaScript. Мы предполагаем, что вы используете [ESLint](https://eslint.org/) (если нет, настоятельно рекомендуем!).
 
-Вам также понадобится [eslint-html-plugin](https://github.com/BenoitZugmeyer/eslint-plugin-html) с поддержкой извлечения и анализа JavaScript в `*.vue` файлах.
+Вам также понадобится официальный [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue), который поддерживает анализа шаблона и скриптов в `*.vue` файлах.
 
-Убедитесь в том, что вы добавили плагин в конфигурацию ESLint:
+Убедитесь, что используете поставляемую с плагином конфигурацию в вашей конфигурации ESLint:
 
 ``` json
-"plugins": [
-  "html"
-]
-```
-
-Затем в командной строке:
-
-``` bash
-eslint --ext js,vue MyComponent.vue
-```
-
-Другой вариант – использовать [eslint-loader](https://github.com/MoOx/eslint-loader), который будет автоматически анализировать `*.vue` файлы после сохранения во время разработки:
-
-``` bash
-npm install eslint eslint-loader --save-dev
-```
-
-``` js
-// webpack.config.js
-module.exports = {
-  // ... прочие опции
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue!eslint'
-      }
-    ]
-  }
+{
+  "extends": [
+    "plugin:vue/essential"
+  ]
 }
 ```
 
-Обратите внимание, что загрузчики webpack применяются **справа-налево**. Убедитесь, что `eslint` прописан перед `vue`, чтобы код сначала проходил через анализатор, а затем компилировался.
-
-Стоит упомянуть об использовании сторонних `*.vue` компонентов, поставляемых в NPM пакетах. В таком случае нам нужно воспользоваться `vue-loader`? чтобы подключить сторонние компоненты, но не анализировать их. Мы можем вынести анализ в [предзагрузчики](https://webpack.github.io/docs/loaders.html#loader-order) webpack:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // ... прочие опции
-  module: {
-    // анализировать только локальные *.vue файлы
-    preLoaders: [
-      {
-        test: /\.vue$/,
-        loader: 'eslint',
-        exclude: /node_modules/
-      }
-    ],
-    // но использовать vue-loader для всех *.vue файлов
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  }
-}
-```
-
-Для webpack 2.x:
+Убедитесь, что он применяется как предварительный загрузчик:
 
 ``` js
 // webpack.config.js
@@ -75,17 +22,11 @@ module.exports = {
   // ... прочие опции
   module: {
     rules: [
-      // анализировать только локальные *.vue файлы
       {
         enforce: 'pre',
-        test: /\.vue$/,
+        test: /\.(js|vue)$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
-      },
-      // но использовать vue-loader для всех *.vue файлов
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader'
       }
     ]
   }
diff --git a/docs/ru/workflow/production.md b/docs/ru/workflow/production.md
index a8f392d14..0f872dc2f 100644
--- a/docs/ru/workflow/production.md
+++ b/docs/ru/workflow/production.md
@@ -19,18 +19,12 @@ module.exports = {
       }
     }),
     // минифицируем, устраняя весь ненужный код
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    // только для webpack 1 – оптимизируем идентификаторы модулей по числу использований
-    new webpack.optimize.OccurrenceOrderPlugin()
+    new webpack.optimize.UglifyJsPlugin()
   ]
 }
 ```
 
-Очевидно, нам ни к чему использовать эту конфигурацию во время разработки, для этого есть несколько вариантов:
+Нам ни к чему использовать эту конфигурацию во время разработки, для этого есть несколько вариантов:
 
 1. Динамически собирать объект конфигурации на основе переменных окружения;
 
diff --git a/docs/ru/workflow/testing.md b/docs/ru/workflow/testing.md
index 17594b64f..fcce0bdb1 100644
--- a/docs/ru/workflow/testing.md
+++ b/docs/ru/workflow/testing.md
@@ -1,102 +1,5 @@
 # Тестирование
-# Testing
 
-> [Шаблон webpack vue-cli](https://github.com/vuejs-templates/webpack) предлагает вам готовые решения для модульного и e2e-тестирования.
+- [@vue/cli](https://github.com/vuejs/vue-cli) предлагает вам готовые решения для модульного и e2e-тестирования.
 
-Тестируя `*.vue` файлы, мы не можем использовать обычные тестовые движки для CommonJS, поскольку они не знают, как обрабатывать `*.vue` файлы. Вместо этого мы снова воспользуемся webpack + vue-loader для сборки наших тестов. Мы рекомендуем использовать сочетание [Karma](https://karma-runner.github.io/0.13/index.html) и [karma-webpack](https://github.com/webpack/karma-webpack).
-
-Karma – это тестовый движок, который запускает браузеры и прогоняет тесты за вас. Вы можете выбрать, в каких браузерах выполнять тесты и какой тестовый фреймворк использовать (например, Mocha или Jasmin). Вот пример конфигурации Karma для тестирования в [PhantomJS](http://phantomjs.org/) с помощью фреймворка [Jasmine](https://jasmine.github.io/edge/introduction.html):
-
-``` bash
-npm install\
-  karma karma-webpack\
-  karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs-prebuilt\
-  --save-dev
-```
-
-``` js
-// мы можем воспользоваться тем же файлом конфигурации,
-// однако, не забудьте удалить оригинальную точку входа,
-// поскольку во время тестирования нам она не нужна
-var webpackConfig = require('./webpack.config.js')
-delete webpackConfig.entry
-
-// karma.conf.js
-module.exports = function (config) {
-  config.set({
-    browsers: ['PhantomJS'],
-    frameworks: ['jasmine'],
-    // это файл точки входа для всех наших тестов.
-    files: ['test/index.js'],
-    // передаем файл точки входа в webpack для сборки.
-    preprocessors: {
-      'test/index.js': ['webpack']
-    },
-    // используем конфигурацию webpack
-    webpack: webpackConfig,
-    // избегаем стены бесполезного текста
-    webpackMiddleware: {
-      noInfo: true
-    },
-    singleRun: true
-  })
-}
-```
-
-И для файла точки входа `test/index.js`:
-
-``` js
-// test/index.js
-// подтягиваем все файлы тестов, используя специальную возможность webpack
-// https://webpack.github.io/docs/context.html#require-context
-var testsContext = require.context('.', true, /\.spec$/)
-testsContext.keys().forEach(testsContext)
-```
-
-Эта точка входа просто подтягивает все другие файлы, названия которых заканчиваются на `.spec.js` в ту же папку. Теперь мы наконец-то можем написать немного тестов:
-
-``` js
-// test/component-a.spec.js
-var Vue = require('vue')
-var ComponentA = require('../../src/components/a.vue')
-
-describe('a.vue', function () {
-
-  // проверяем свойства JavaScript-объекта
-  it('should have correct message', function () {
-    expect(ComponentA.data().msg).toBe('Привет от компонента A!')
-  })
-
-  // проверяем результаты рендеринга, вызывая рендер компонента
-  it('should render correct message', function () {
-    var vm = new Vue({
-      template: '<div><test></test></div>',
-      components: {
-        'test': ComponentA
-      }
-    }).$mount()
-    expect(vm.$el.querySelector('h2.red').textContent).toBe('Привет от компонента A!')
-  })
-})
-```
-
-Чтобы запустить тесты, добавьте следующий NPM скрипт:
-
-``` js
-// package.json
-...
-"scripts": {
-  ...
-  "test": "karma start karma.conf.js"
-}
-...
-```
-
-Наконец, запускаем:
-
-``` bash
-npm test
-```
-
-Опять же, [шаблон webpack vue-cli](https://github.com/vuejs-templates/webpack) содержит готовый рабочий пример с тестами.
+- Если вы заинтересованы в ручной настройке модульного тестирования для `*.vue` файлов, ознакомьтесь с [документацией для `@vue/test-utils`](https://vue-test-utils.vuejs.org/ru/).
\ No newline at end of file

From 2bbdf259a886e5a750b4e50c5cf2aae4bf025fdc Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 11:30:25 -0500
Subject: [PATCH 825/877] feat: adjust shadow injection strategy

---
 lib/loader.js                       | 73 +++++++++++------------------
 lib/runtime/component-normalizer.js | 11 ++++-
 2 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 866160ae6..79a2aa115 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -155,12 +155,12 @@ module.exports = function (content) {
   // add requires for styles
   let cssModules
   if (parts.styles.length) {
-    const needsLazyInjection = isServer || isShadowMode
+    const needsExplicitInjection = isServer || isShadowMode
     let styleInjectionCode = 'function injectStyle (context) {\n'
     if (needsHotReload) {
       styleInjectionCode += `  if (disposed) return\n`
     }
-    if (needsLazyInjection) {
+    if (needsExplicitInjection) {
       styleInjectionCode += `var i\n`
     }
     parts.styles.forEach((style, i) => {
@@ -174,7 +174,7 @@ module.exports = function (content) {
       // vue-style-loader exposes inject functions in SSR or shadow mode so they
       // are always called
       const invokeStyle =
-        needsLazyInjection && hasVueStyleLoader
+        needsExplicitInjection && hasVueStyleLoader
           ? code => `;(i=${code},i.__inject__&&i.__inject__(context),i)\n`
           : code => `  ${code}\n`
 
@@ -241,27 +241,6 @@ module.exports = function (content) {
     output += styleInjectionCode
   }
 
-  // we require the component normalizer function, and call it like so:
-  // normalizeComponent(
-  //   scriptExports,
-  //   compiledTemplate,
-  //   functionalTemplate,
-  //   injectStyles,
-  //   scopeId,
-  //   moduleIdentifier (server only)
-  // )
-  const componentNormalizerRequest = loaderUtils.stringifyRequest(
-    loaderContext,
-    '!' + componentNormalizerPath
-  )
-  if (!options.esModule) {
-    output +=
-      `var normalizeComponent = require(${componentNormalizerRequest}).default\n`
-  } else {
-    output +=
-      `import normalizeComponent from ${componentNormalizerRequest}\n`
-  }
-
   // <script>
   output += '/* script */\n'
   const script = parts.script
@@ -322,12 +301,11 @@ module.exports = function (content) {
 
   // style
   // the injection function is passed to the normalizer and injected into
-  // component lifecycle hooks. In shadow mode, we expose the inject function
-  // directly on the component's options so we don't pass it here.
+  // component lifecycle hooks.
   output += '/* styles */\n'
   output +=
     'var __vue_styles__ = ' +
-    (parts.styles.length && !isShadowMode ? 'injectStyle' : 'null') +
+    (parts.styles.length ? 'injectStyle' : 'null') +
     '\n'
 
   // scopeId
@@ -344,7 +322,27 @@ module.exports = function (content) {
     (isServer ? JSON.stringify(hash(this.request)) : 'null') +
     '\n'
 
-  // close normalizeComponent call
+  // we require the component normalizer function, and call it like so:
+  // normalizeComponent(
+  //   scriptExports,
+  //   compiledTemplate,
+  //   functionalTemplate,
+  //   injectStyles,
+  //   scopeId,
+  //   moduleIdentifier, (server only)
+  //   isShadowMode (vue-cli only)
+  // )
+  const componentNormalizerRequest = loaderUtils.stringifyRequest(
+    loaderContext,
+    '!' + componentNormalizerPath
+  )
+  if (!options.esModule) {
+    output +=
+      `var normalizeComponent = require(${componentNormalizerRequest}).default\n`
+  } else {
+    output +=
+      `import normalizeComponent from ${componentNormalizerRequest}\n`
+  }
   output +=
     'var Component = normalizeComponent(\n' +
     '  __vue_script__,\n' +
@@ -353,26 +351,9 @@ module.exports = function (content) {
     '  __vue_styles__,\n' +
     '  __vue_scopeId__,\n' +
     '  __vue_module_identifier__\n' +
+    (isShadowMode ? `,true` : ``) +
     ')\n'
 
-  // expose style injection on options
-  // this will be used by vue-cli's web component entry
-  if (isShadowMode) {
-    // the shadow inject id will be the module id of the entry Vue component,
-    // which is the frist Vue component encountered in this compilation
-    let shadowInjectId = process.env.VUE_SHADOW_INJECT_ID
-    if (!shadowInjectId) {
-      shadowInjectId = process.env.VUE_SHADOW_INJECT_ID =
-        `__vue_shadow_injector__${moduleId.replace(`data-v-`, '')}`
-    }
-    output +=
-      `var shadowInjectId = Component.options.__shadowInjectId = '${shadowInjectId}'\n` +
-      `var injectors = window[shadowInjectId] || (window[shadowInjectId] = [])\n`
-    if (parts.styles.length) {
-      output += `injectors.push(injectStyle)`
-    }
-  }
-
   // development-only code
   if (!isProduction) {
     // add filename in dev
diff --git a/lib/runtime/component-normalizer.js b/lib/runtime/component-normalizer.js
index 75a5402bb..ac09627f4 100644
--- a/lib/runtime/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -10,7 +10,8 @@ export default function normalizeComponent (
   functionalTemplate,
   injectStyles,
   scopeId,
-  moduleIdentifier /* server only */
+  moduleIdentifier, /* server only */
+  shadowMode /* vue-cli only */
 ) {
   var esModule
   var scriptExports = rawScriptExports = rawScriptExports || {}
@@ -69,7 +70,13 @@ export default function normalizeComponent (
     // never gets called
     options._ssrRegister = hook
   } else if (injectStyles) {
-    hook = injectStyles
+    if (shadowMode) {
+      hook = function () {
+        injectStyles(this.$root.$options.shadowRoot)
+      }
+    } else {
+      hook = injectStyles
+    }
   }
 
   if (hook) {

From 611fda8c76b5f2c612536eb90ac5694384717659 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 13:15:00 -0500
Subject: [PATCH 826/877] refactor: move helpers into separate file + deprecate
 inject mode

---
 docs/en/SUMMARY.md                     |   3 +-
 docs/en/workflow/testing-with-mocks.md |  70 ---
 lib/helpers.js                         | 404 ++++++++++++++++++
 lib/loader.js                          | 563 +++++--------------------
 lib/runtime/component-normalizer.js    |  11 +-
 package.json                           |   1 -
 test.html                              |   1 +
 test/fixtures/inject.js                |   1 -
 test/fixtures/inject.vue               |  15 -
 test/test.js                           |  19 -
 yarn.lock                              |   8 +-
 11 files changed, 505 insertions(+), 591 deletions(-)
 delete mode 100644 docs/en/workflow/testing-with-mocks.md
 create mode 100644 lib/helpers.js
 create mode 100644 test.html
 delete mode 100644 test/fixtures/inject.js
 delete mode 100644 test/fixtures/inject.vue

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index a5ccfd555..0827be78b 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -18,7 +18,6 @@
   - [Production Build](workflow/production.md)
   - [Linting](workflow/linting.md)
   - [Testing](workflow/testing.md)
-  - [Testing with Mocks](workflow/testing-with-mocks.md)
 - [Options Reference](options.md)
   - [loaders](options.md#loaders)
   - [preLoaders](options.md#preloaders)
@@ -33,4 +32,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/en/workflow/testing-with-mocks.md b/docs/en/workflow/testing-with-mocks.md
deleted file mode 100644
index b2f728ca5..000000000
--- a/docs/en/workflow/testing-with-mocks.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Testing with Mocks
-
-In a real world application, our components most likely have external dependencies. When writing unit tests for components, it would be ideal if we can mock these external dependencies so that our tests only rely the behavior of the component being tested.
-
-`vue-loader` provides a feature that allows you to inject arbitrary dependencies to a `*.vue` component, using [inject-loader](https://github.com/plasticine/inject-loader). The general idea is that instead of directly importing the component module, we use `inject-loader` to create a "module factory" function for that module. When this function gets called with an object of mocks, it returns an instance of the module with the mocks injected.
-
-> Note: You must disable `esModule` option in inject mode, or you will get an error.
-
-Suppose we have a component like this:
-
-``` html
-<!-- example.vue -->
-<template>
-  <div class="msg">{{ msg }}</div>
-</template>
-
-<script>
-// this dependency needs to be mocked
-const SomeService = require('../service')
-
-module.exports = {
-  data () {
-    return {
-      msg: SomeService.msg
-    }
-  }
-}
-</script>
-```
-
-Here's how to import it with mocks:
-
-``` bash
-npm install inject-loader --save-dev
-```
-
-``` js
-// example.spec.js
-const ExampleInjector = require('!!vue-loader?inject!./example.vue')
-```
-
-Notice that crazy require string - we are using some inline [webpack loader requests](https://webpack.github.io/docs/loaders.html) here. A quick explanation:
-
-- `!!` at the start means "disable all loaders from the global config";
-- `vue-loader?inject!` means "use `vue-loader`, and pass in the `?inject` query". This tells `vue-loader` to compile the component in dependency-injection mode.
-
-The returned `ExampleInjector` is a factory function that can be called to create instances of the `example.vue` module:
-
-``` js
-const ExampleWithMocks = ExampleInjector({
-  // mock it
-  '../service': {
-    msg: 'Hello from a mocked service!'
-  }
-})
-```
-
-Finally, we can test the component like usual:
-
-``` js
-it('should render', () => {
-  const vm = new Vue({
-    template: '<div><test></test></div>',
-    components: {
-      'test': ExampleWithMocks
-    }
-  }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).to.equal('Hello from a mocked service!')
-})
-```
diff --git a/lib/helpers.js b/lib/helpers.js
new file mode 100644
index 000000000..bcc9a4f5f
--- /dev/null
+++ b/lib/helpers.js
@@ -0,0 +1,404 @@
+const querystring = require('querystring')
+const loaderUtils = require('loader-utils')
+const normalize = require('./utils/normalize')
+const tryRequire = require('./utils/try-require')
+const styleCompilerPath = normalize.lib('style-compiler/index')
+
+// internal lib loaders
+const selectorPath = normalize.lib('selector')
+const templateCompilerPath = normalize.lib('template-compiler/index')
+const templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
+
+// dep loaders
+const styleLoaderPath = normalize.dep('vue-style-loader')
+
+// check whether default js loader exists
+const hasBabel = !!tryRequire('babel-loader')
+const hasBuble = !!tryRequire('buble-loader')
+
+const rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
+
+const defaultLang = {
+  template: 'html',
+  styles: 'css',
+  script: 'js'
+}
+
+const postcssExtensions = [
+  'postcss', 'pcss', 'sugarss', 'sss'
+]
+
+// When extracting parts from the source vue file, we want to apply the
+// loaders chained before vue-loader, but exclude some loaders that simply
+// produces side effects such as linting.
+function getRawRequest (
+  { resource, loaderIndex, loaders },
+  excludedPreLoaders = /eslint-loader/
+) {
+  return loaderUtils.getRemainingRequest({
+    resource: resource,
+    loaderIndex: loaderIndex,
+    loaders: loaders.filter(loader => !excludedPreLoaders.test(loader.path))
+  })
+}
+
+// sass => sass-loader
+// sass-loader => sass-loader
+// sass?indentedSyntax!css => sass-loader?indentedSyntax!css-loader
+function ensureLoader (lang) {
+  return lang
+    .split('!')
+    .map(loader =>
+      loader.replace(
+        /^([\w-]+)(\?.*)?/,
+        (_, name, query) =>
+          (/-loader$/.test(name) ? name : name + '-loader') + (query || '')
+      )
+    )
+    .join('!')
+}
+
+function ensureBang (loader) {
+  if (loader.charAt(loader.length - 1) !== '!') {
+    return loader + '!'
+  } else {
+    return loader
+  }
+}
+
+function resolveLoaders (
+  options,
+  moduleId,
+  isProduction,
+  hasScoped,
+  hasComment,
+  hasFunctionalTemplate,
+  needCssSourceMap
+) {
+  let cssLoaderOptions = ''
+  if (needCssSourceMap) {
+    cssLoaderOptions += '?sourceMap'
+  }
+  if (isProduction) {
+    cssLoaderOptions += (cssLoaderOptions ? '&' : '?') + 'minimize'
+  }
+
+  const bubleTemplateOptions = Object.assign({}, options.buble)
+  bubleTemplateOptions.transforms = Object.assign({}, bubleTemplateOptions.transforms)
+  bubleTemplateOptions.transforms.stripWithFunctional = hasFunctionalTemplate
+
+  const bubleOptions = hasBuble && options.buble
+    ? '?' + JSON.stringify(options.buble)
+    : ''
+
+  const templateCompilerOptions =
+    '?' +
+    JSON.stringify({
+      id: moduleId,
+      hasScoped,
+      hasComment,
+      buble: bubleTemplateOptions
+    })
+
+  const defaultLoaders = {
+    html: templateCompilerPath + templateCompilerOptions,
+    css: options.extractCSS
+      ? getCSSExtractLoader(null, options, cssLoaderOptions)
+      : styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
+    js: hasBuble
+      ? 'buble-loader' + bubleOptions
+      : hasBabel ? 'babel-loader' : ''
+  }
+
+  function getCSSExtractLoader (lang) {
+    let extractor
+    const op = options.extractCSS
+    // extractCSS option is an instance of ExtractTextPlugin
+    if (typeof op.extract === 'function') {
+      extractor = op
+    } else {
+      extractor = tryRequire('extract-text-webpack-plugin')
+      if (!extractor) {
+        throw new Error(
+          '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
+            'as a peer dependency.'
+        )
+      }
+    }
+    const langLoader = lang ? ensureBang(ensureLoader(lang)) : ''
+    return extractor.extract({
+      use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
+      fallback: 'vue-style-loader'
+    })
+  }
+
+  return {
+    defaultLoaders,
+    getCSSExtractLoader,
+    loaders: Object.assign({}, defaultLoaders, options.loaders),
+    preLoaders: options.preLoaders || {},
+    postLoaders: options.postLoaders || {}
+  }
+}
+
+module.exports = function createHelpers (
+  loaderContext,
+  options,
+  moduleId,
+  parts,
+  isProduction,
+  hasScoped,
+  hasComment,
+  hasFunctionalTemplate,
+  needCssSourceMap
+) {
+  const rawRequest = getRawRequest(loaderContext, options.excludedPreLoaders)
+
+  const {
+    defaultLoaders,
+    getCSSExtractLoader,
+    loaders,
+    preLoaders,
+    postLoaders
+  } = resolveLoaders(
+    options,
+    moduleId,
+    isProduction,
+    hasScoped,
+    hasComment,
+    hasFunctionalTemplate,
+    needCssSourceMap
+  )
+
+  function getRequire (type, part, index, scoped) {
+    return 'require(' + getRequestString(type, part, index, scoped) + ')'
+  }
+
+  function getImport (type, part, index, scoped) {
+    return (
+      'import __vue_' + type + '__ from ' +
+      getRequestString(type, part, index, scoped)
+    )
+  }
+
+  function getNamedExports (type, part, index, scoped) {
+    return (
+      'export * from ' +
+      getRequestString(type, part, index, scoped)
+    )
+  }
+
+  function getRequestString (type, part, index, scoped) {
+    return loaderUtils.stringifyRequest(
+      loaderContext,
+      // disable all configuration loaders
+      '!!' +
+        // get loader string for pre-processors
+        getLoaderString(type, part, index, scoped) +
+        // select the corresponding part from the vue file
+        getSelectorString(type, index || 0) +
+        // the url to the actual vue file, including remaining requests
+        rawRequest
+    )
+  }
+
+  function getRequireForSrc (type, impt, scoped) {
+    return 'require(' + getSrcRequestString(type, impt, scoped) + ')'
+  }
+
+  function getImportForSrc (type, impt, scoped) {
+    return (
+      'import __vue_' + type + '__ from ' +
+      getSrcRequestString(type, impt, scoped)
+    )
+  }
+
+  function getNamedExportsForSrc (type, impt, scoped) {
+    return (
+      'export * from ' +
+      getSrcRequestString(type, impt, scoped)
+    )
+  }
+
+  function getSrcRequestString (type, impt, scoped) {
+    return loaderUtils.stringifyRequest(
+      loaderContext,
+      '!!' + getLoaderString(type, impt, -1, scoped) + impt.src
+    )
+  }
+
+  function addCssModulesToLoader (loader, part, index) {
+    if (!part.module) return loader
+    const option = options.cssModules || {}
+    const DEFAULT_OPTIONS = {
+      modules: true
+    }
+    const OPTIONS = {
+      localIdentName: '[hash:base64]',
+      importLoaders: 1
+    }
+    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, (m, $1, $2) => {
+      // $1: !css-loader
+      // $2: ?a=b
+      const query = loaderUtils.parseQuery($2 || '?')
+      Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
+      if (index !== -1) {
+        // Note:
+        //   Class name is generated according to its filename.
+        //   Different <style> tags in the same .vue file may generate same names.
+        //   Append `_[index]` to class name to avoid this.
+        query.localIdentName += '_' + index
+      }
+      return $1 + '?' + JSON.stringify(query)
+    })
+  }
+
+  function buildCustomBlockLoaderString (attrs) {
+    const noSrcAttrs = Object.assign({}, attrs)
+    delete noSrcAttrs.src
+    const qs = querystring.stringify(noSrcAttrs)
+    return qs ? '?' + qs : qs
+  }
+
+  // stringify an Array of loader objects
+  function stringifyLoaders (loaders) {
+    return loaders
+      .map(
+        obj =>
+          obj && typeof obj === 'object' && typeof obj.loader === 'string'
+            ? obj.loader +
+              (obj.options ? '?' + JSON.stringify(obj.options) : '')
+            : obj
+      )
+      .join('!')
+  }
+
+  function getLoaderString (type, part, index, scoped) {
+    let loader = getRawLoaderString(type, part, index, scoped)
+    const lang = getLangString(type, part)
+    if (preLoaders[lang]) {
+      loader = loader + ensureBang(preLoaders[lang])
+    }
+    if (postLoaders[lang]) {
+      loader = ensureBang(postLoaders[lang]) + loader
+    }
+    return loader
+  }
+
+  function getLangString (type, { lang }) {
+    if (type === 'script' || type === 'template' || type === 'styles') {
+      return lang || defaultLang[type]
+    } else {
+      return type
+    }
+  }
+
+  function getRawLoaderString (type, part, index, scoped) {
+    let lang = part.lang || defaultLang[type]
+
+    let styleCompiler = ''
+    if (type === 'styles') {
+      // style compiler that needs to be applied for all styles
+      styleCompiler =
+        styleCompilerPath +
+        '?' +
+        JSON.stringify({
+          // a marker for vue-style-loader to know that this is an import from a vue file
+          vue: true,
+          id: moduleId,
+          scoped: !!scoped,
+          sourceMap: needCssSourceMap
+        }) +
+        '!'
+      // normalize scss/sass/postcss if no specific loaders have been provided
+      if (!loaders[lang]) {
+        if (postcssExtensions.indexOf(lang) !== -1) {
+          lang = 'css'
+        } else if (lang === 'sass') {
+          lang = 'sass?indentedSyntax'
+        } else if (lang === 'scss') {
+          lang = 'sass'
+        }
+      }
+    }
+
+    let loader =
+      options.extractCSS && type === 'styles'
+        ? loaders[lang] || getCSSExtractLoader(lang)
+        : loaders[lang]
+
+    if (loader != null) {
+      if (Array.isArray(loader)) {
+        loader = stringifyLoaders(loader)
+      } else if (typeof loader === 'object') {
+        loader = stringifyLoaders([loader])
+      }
+      if (type === 'styles') {
+        // add css modules
+        loader = addCssModulesToLoader(loader, part, index)
+        // inject rewriter before css loader for extractTextPlugin use cases
+        if (rewriterInjectRE.test(loader)) {
+          loader = loader.replace(
+            rewriterInjectRE,
+            (m, $1) => ensureBang($1) + styleCompiler
+          )
+        } else {
+          loader = ensureBang(loader) + styleCompiler
+        }
+      }
+      // if user defines custom loaders for html, add template compiler to it
+      if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
+        loader = defaultLoaders.html + '!' + loader
+      }
+      return ensureBang(loader)
+    } else {
+      // unknown lang, infer the loader to be used
+      switch (type) {
+        case 'template':
+          return (
+            defaultLoaders.html +
+            '!' +
+            templatePreprocessorPath +
+            '?engine=' +
+            lang +
+            '!'
+          )
+        case 'styles':
+          loader = addCssModulesToLoader(defaultLoaders.css, part, index)
+          return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
+        case 'script':
+          return ensureBang(ensureLoader(lang))
+        default:
+          loader = loaders[type]
+          if (Array.isArray(loader)) {
+            loader = stringifyLoaders(loader)
+          }
+          return ensureBang(loader + buildCustomBlockLoaderString(part.attrs))
+      }
+    }
+  }
+
+  function getSelectorString (type, index) {
+    return (
+      selectorPath +
+      '?type=' +
+      (type === 'script' || type === 'template' || type === 'styles'
+        ? type
+        : 'customBlocks') +
+      '&index=' + index +
+      '!'
+    )
+  }
+
+  return {
+    loaders,
+    getRequire,
+    getImport,
+    getNamedExports,
+    getRequireForSrc,
+    getImportForSrc,
+    getNamedExportsForSrc,
+    getRequestString,
+    getSrcRequestString
+  }
+}
diff --git a/lib/loader.js b/lib/loader.js
index 79a2aa115..671db32a8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -1,70 +1,26 @@
 const path = require('path')
 const hash = require('hash-sum')
 const parse = require('./parser')
-const querystring = require('querystring')
+const createHelpers = require('./helpers')
 const loaderUtils = require('loader-utils')
 const normalize = require('./utils/normalize')
-const tryRequire = require('./utils/try-require')
-
-// internal lib loaders
-const selectorPath = normalize.lib('selector')
-const styleCompilerPath = normalize.lib('style-compiler/index')
-const templateCompilerPath = normalize.lib('template-compiler/index')
-const templatePreprocessorPath = normalize.lib('template-compiler/preprocessor')
-const componentNormalizerPath = normalize.lib('runtime/component-normalizer')
-
-// dep loaders
-const styleLoaderPath = normalize.dep('vue-style-loader')
 const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
-
-// check whether default js loader exists
-const hasBabel = !!tryRequire('babel-loader')
-const hasBuble = !!tryRequire('buble-loader')
-
-const rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
-
-const defaultLang = {
-  template: 'html',
-  styles: 'css',
-  script: 'js'
-}
-
-const postcssExtensions = [
-  'postcss', 'pcss', 'sugarss', 'sss'
-]
-
-// When extracting parts from the source vue file, we want to apply the
-// loaders chained before vue-loader, but exclude some loaders that simply
-// produces side effects such as linting.
-function getRawRequest (
-  { resource, loaderIndex, loaders },
-  excludedPreLoaders = /eslint-loader/
-) {
-  return loaderUtils.getRemainingRequest({
-    resource: resource,
-    loaderIndex: loaderIndex,
-    loaders: loaders.filter(loader => !excludedPreLoaders.test(loader.path))
-  })
-}
+const componentNormalizerPath = normalize.lib('runtime/component-normalizer')
 
 module.exports = function (content) {
   this.cacheable()
-  const isServer = this.target === 'node'
-  const isProduction = this.minimize || process.env.NODE_ENV === 'production'
+
+  let output = ''
 
   const loaderContext = this
-  const options = Object.assign({ esModule: true }, loaderUtils.getOptions(this))
+  const isServer = this.target === 'node'
+  const isProduction = this.minimize || process.env.NODE_ENV === 'production'
+  const options = loaderUtils.getOptions(this) || {}
 
   // shadow mode is an internal option
   // enabled via vue-cli's --target web-component
   const isShadowMode = !!options.shadowMode
 
-  // disable esModule in inject mode
-  // because import/export must be top-level
-  if (options.inject) {
-    options.esModule = false
-  }
-
   // share options between the main loader of style/template loaders
   Object.defineProperty(this._compilation, '__vueOptions__', {
     value: options,
@@ -72,82 +28,65 @@ module.exports = function (content) {
     configurable: true
   })
 
-  const rawRequest = getRawRequest(this, options.excludedPreLoaders)
   const filePath = this.resourcePath
   const fileName = path.basename(filePath)
 
-  const context =
+  const context = (
     this.rootContext ||
     (this.options && this.options.context) ||
     process.cwd()
+  )
   const sourceRoot = path.dirname(path.relative(context, filePath))
   const shortFilePath = path.relative(context, filePath).replace(/^(\.\.[\\\/])+/, '')
   const moduleId = 'data-v-' + hash(isProduction ? (shortFilePath + '\n' + content) : shortFilePath)
 
-  let cssLoaderOptions = ''
-  const cssSourceMap =
+  const needCssSourceMap = (
     !isProduction &&
     this.sourceMap &&
     options.cssSourceMap !== false
-  if (cssSourceMap) {
-    cssLoaderOptions += '?sourceMap'
-  }
-  if (isProduction) {
-    cssLoaderOptions += (cssLoaderOptions ? '&' : '?') + 'minimize'
-  }
-
-  const bubleOptions =
-    hasBuble && options.buble ? '?' + JSON.stringify(options.buble) : ''
-
-  let output = ''
+  )
 
   const parts = parse(
     content,
     fileName,
     this.sourceMap,
     sourceRoot,
-    cssSourceMap
+    needCssSourceMap
   )
 
   const hasScoped = parts.styles.some(({ scoped }) => scoped)
-  const templateAttrs =
-    parts.template && parts.template.attrs && parts.template.attrs
+  const templateAttrs = parts.template && parts.template.attrs && parts.template.attrs
   const hasComment = templateAttrs && templateAttrs.comments
-  const functionalTemplate = templateAttrs && templateAttrs.functional
-  const bubleTemplateOptions = Object.assign({}, options.buble)
-  bubleTemplateOptions.transforms = Object.assign(
-    {},
-    bubleTemplateOptions.transforms
+  const hasFunctionalTemplate = templateAttrs && templateAttrs.functional
+
+  const {
+    loaders,
+    getRequire,
+    getImport,
+    getNamedExports,
+    getRequireForSrc,
+    getImportForSrc,
+    getNamedExportsForSrc,
+    getRequestString,
+    getSrcRequestString
+  } = createHelpers(
+    loaderContext,
+    options,
+    moduleId,
+    parts,
+    isProduction,
+    hasScoped,
+    hasComment,
+    hasFunctionalTemplate,
+    needCssSourceMap
   )
-  bubleTemplateOptions.transforms.stripWithFunctional = functionalTemplate
-
-  const templateCompilerOptions =
-    '?' +
-    JSON.stringify({
-      id: moduleId,
-      hasScoped,
-      hasComment,
-      buble: bubleTemplateOptions
-    })
 
-  const defaultLoaders = {
-    html: templateCompilerPath + templateCompilerOptions,
-    css: options.extractCSS
-      ? getCSSExtractLoader()
-      : styleLoaderPath + '!' + 'css-loader' + cssLoaderOptions,
-    js: hasBuble
-      ? 'buble-loader' + bubleOptions
-      : hasBabel ? 'babel-loader' : ''
-  }
-
-  // check if there are custom loaders specified via
-  // webpack config, otherwise use defaults
-  const loaders = Object.assign({}, defaultLoaders, options.loaders)
-  const preLoaders = options.preLoaders || {}
-  const postLoaders = options.postLoaders || {}
-
-  const needsHotReload =
-    !isServer && !isProduction && (parts.script || parts.template) && options.hotReload !== false
+  const needsHotReload = (
+    !isServer &&
+    !isProduction &&
+    (parts.script || parts.template) &&
+    options.hotReload !== false
+  )
   if (needsHotReload) {
     output += 'var disposed = false\n'
   }
@@ -166,7 +105,7 @@ module.exports = function (content) {
     parts.styles.forEach((style, i) => {
       // require style
       let requireString = style.src
-        ? getRequireForImport('styles', style, style.scoped)
+        ? getRequireForSrc('styles', style, style.scoped)
         : getRequire('styles', style, i, style.scoped)
 
       const hasStyleLoader = requireString.indexOf('style-loader') > -1
@@ -215,8 +154,8 @@ module.exports = function (content) {
               `Object.defineProperty(this, "${moduleName}", { get: function () { return cssModules["${moduleName}"] }})\n`
 
             const requirePath = style.src
-              ? getRequireForImportString('styles', style, style.scoped)
-              : getRequireString('styles', style, i, style.scoped)
+              ? getSrcRequestString('styles', style, style.scoped)
+              : getRequestString('styles', style, i, style.scoped)
 
             output +=
               `module.hot && module.hot.accept([${requirePath}], function () {\n` +
@@ -245,28 +184,15 @@ module.exports = function (content) {
   output += '/* script */\n'
   const script = parts.script
   if (script) {
-    if (options.esModule) {
-      output += script.src
-        ? (
-            getNamedExportForImport('script', script) + '\n' +
-            getImportForImport('script', script)
-          )
-        : (
-            getNamedExport('script', script) + '\n' +
-            getImport('script', script)
-          ) + '\n'
-    } else {
-      output +=
-        'var __vue_script__ = ' +
-        (script.src
-          ? getRequireForImport('script', script)
-          : getRequire('script', script)) +
-        '\n'
-    }
-    // inject loader interop
-    if (options.inject) {
-      output += '__vue_script__ = __vue_script__(injections)\n'
-    }
+    output += script.src
+      ? (
+          getNamedExportsForSrc('script', script) + '\n' +
+          getImportForSrc('script', script)
+        )
+      : (
+          getNamedExports('script', script) + '\n' +
+          getImport('script', script)
+        ) + '\n'
   } else {
     output += 'var __vue_script__ = null\n'
   }
@@ -275,19 +201,10 @@ module.exports = function (content) {
   output += '/* template */\n'
   const template = parts.template
   if (template) {
-    if (options.esModule) {
-      output +=
-        (template.src
-          ? getImportForImport('template', template)
-          : getImport('template', template)) + '\n'
-    } else {
-      output +=
-        'var __vue_template__ = ' +
-        (template.src
-          ? getRequireForImport('template', template)
-          : getRequire('template', template)) +
-        '\n'
-    }
+    output +=
+      (template.src
+        ? getImportForSrc('template', template)
+        : getImport('template', template)) + '\n'
   } else {
     output += 'var __vue_template__ = null\n'
   }
@@ -296,7 +213,7 @@ module.exports = function (content) {
   output += '/* template functional */\n'
   output +=
     'var __vue_template_functional__ = ' +
-    (functionalTemplate ? 'true' : 'false') +
+    (hasFunctionalTemplate ? 'true' : 'false') +
     '\n'
 
   // style
@@ -326,7 +243,7 @@ module.exports = function (content) {
   // normalizeComponent(
   //   scriptExports,
   //   compiledTemplate,
-  //   functionalTemplate,
+  //   hasFunctionalTemplate,
   //   injectStyles,
   //   scopeId,
   //   moduleIdentifier, (server only)
@@ -336,16 +253,10 @@ module.exports = function (content) {
     loaderContext,
     '!' + componentNormalizerPath
   )
-  if (!options.esModule) {
-    output +=
-      `var normalizeComponent = require(${componentNormalizerRequest}).default\n`
-  } else {
-    output +=
-      `import normalizeComponent from ${componentNormalizerRequest}\n`
-  }
   output +=
+    `import normalizeComponent from ${componentNormalizerRequest}\n` +
     'var Component = normalizeComponent(\n' +
-    '  __vue_script__,\n' +
+    `  __vue_script__,\n` +
     '  __vue_template__,\n' +
     '  __vue_template_functional__,\n' +
     '  __vue_styles__,\n' +
@@ -370,7 +281,7 @@ module.exports = function (content) {
         // require customBlock
         customBlock.src = customBlock.attrs.src
         const requireString = customBlock.src
-          ? getRequireForImport(customBlock.type, customBlock)
+          ? getRequireForSrc(customBlock.type, customBlock)
           : getRequire(customBlock.type, customBlock, i)
 
         if (!addedPrefix) {
@@ -388,331 +299,45 @@ module.exports = function (content) {
           '}\n'
       }
     })
-
     output += '\n'
   }
 
-  if (!options.inject) {
-    // hot reload
-    if (needsHotReload) {
-      output +=
-        '\n/* hot reload */\n' +
-        'if (module.hot) {(function () {\n' +
-        '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
-        '  hotAPI.install(require("vue"), false)\n' +
-        '  if (!hotAPI.compatible) return\n' +
-        '  module.hot.accept()\n' +
-        '  if (!module.hot.data) {\n' +
-        // initial insert
-        '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
-        '  } else {\n'
-      // update
-      if (cssModules) {
-        output +=
-          '    if (module.hot.data.cssModules && Object.keys(module.hot.data.cssModules) !== Object.keys(cssModules)) {\n' +
-          '      delete Component.options._Ctor\n' +
-          '    }\n'
-      }
-      output +=
-        `    hotAPI.${
-          functionalTemplate ? 'rerender' : 'reload'
-        }("${moduleId}", Component.options)\n  }\n`
-      // dispose
+  // hot reload
+  if (needsHotReload) {
+    output +=
+      '\n/* hot reload */\n' +
+      'if (module.hot) {(function () {\n' +
+      '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
+      '  hotAPI.install(require("vue"), false)\n' +
+      '  if (!hotAPI.compatible) return\n' +
+      '  module.hot.accept()\n' +
+      '  if (!module.hot.data) {\n' +
+      // initial insert
+      '    hotAPI.createRecord("' + moduleId + '", Component.options)\n' +
+      '  } else {\n'
+    // update
+    if (cssModules) {
       output +=
-        '  module.hot.dispose(function (data) {\n' +
-        (cssModules ? '    data.cssModules = cssModules\n' : '') +
-        '    disposed = true\n' +
-        '  })\n'
-      output += '})()}\n'
-    }
-
-    // final export
-    if (options.esModule) {
-      output += '\nexport default Component.exports\n'
-    } else {
-      output += '\nmodule.exports = Component.exports\n'
+        '    if (module.hot.data.cssModules && Object.keys(module.hot.data.cssModules) !== Object.keys(cssModules)) {\n' +
+        '      delete Component.options._Ctor\n' +
+        '    }\n'
     }
-  } else {
-    // inject-loader support
-    output =
-      '\n/* dependency injection */\n' +
-      'module.exports = function (injections) {\n' +
-      output +
-      '\n' +
-      '\nreturn Component.exports\n}'
+    output +=
+      `    hotAPI.${
+        hasFunctionalTemplate ? 'rerender' : 'reload'
+      }("${moduleId}", Component.options)\n  }\n`
+    // dispose
+    output +=
+      '  module.hot.dispose(function (data) {\n' +
+      (cssModules ? '    data.cssModules = cssModules\n' : '') +
+      '    disposed = true\n' +
+      '  })\n'
+    output += '})()}\n'
   }
 
+  // final export
+  output += '\nexport default Component.exports\n'
+
   // done
   return output
-
-  // --- helpers ---
-
-  function getRequire (type, part, index, scoped) {
-    return 'require(' + getRequireString(type, part, index, scoped) + ')'
-  }
-
-  function getImport (type, part, index, scoped) {
-    return (
-      'import __vue_' + type + '__ from ' +
-      getRequireString(type, part, index, scoped)
-    )
-  }
-
-  function getNamedExport (type, part, index, scoped) {
-    return (
-      'export * from ' +
-      getRequireString(type, part, index, scoped)
-    )
-  }
-
-  function getRequireString (type, part, index, scoped) {
-    return loaderUtils.stringifyRequest(
-      loaderContext,
-      // disable all configuration loaders
-      '!!' +
-        // get loader string for pre-processors
-        getLoaderString(type, part, index, scoped) +
-        // select the corresponding part from the vue file
-        getSelectorString(type, index || 0) +
-        // the url to the actual vue file, including remaining requests
-        rawRequest
-    )
-  }
-
-  function getRequireForImport (type, impt, scoped) {
-    return 'require(' + getRequireForImportString(type, impt, scoped) + ')'
-  }
-
-  function getImportForImport (type, impt, scoped) {
-    return (
-      'import __vue_' + type + '__ from ' +
-      getRequireForImportString(type, impt, scoped)
-    )
-  }
-
-  function getNamedExportForImport (type, impt, scoped) {
-    return (
-      'export * from ' +
-      getRequireForImportString(type, impt, scoped)
-    )
-  }
-
-  function getRequireForImportString (type, impt, scoped) {
-    return loaderUtils.stringifyRequest(
-      loaderContext,
-      '!!' + getLoaderString(type, impt, -1, scoped) + impt.src
-    )
-  }
-
-  function addCssModulesToLoader (loader, part, index) {
-    if (!part.module) return loader
-    const option = options.cssModules || {}
-    const DEFAULT_OPTIONS = {
-      modules: true
-    }
-    const OPTIONS = {
-      localIdentName: '[hash:base64]',
-      importLoaders: 1
-    }
-    return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, (m, $1, $2) => {
-      // $1: !css-loader
-      // $2: ?a=b
-      const query = loaderUtils.parseQuery($2 || '?')
-      Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
-      if (index !== -1) {
-        // Note:
-        //   Class name is generated according to its filename.
-        //   Different <style> tags in the same .vue file may generate same names.
-        //   Append `_[index]` to class name to avoid this.
-        query.localIdentName += '_' + index
-      }
-      return $1 + '?' + JSON.stringify(query)
-    })
-  }
-
-  function buildCustomBlockLoaderString (attrs) {
-    const noSrcAttrs = Object.assign({}, attrs)
-    delete noSrcAttrs.src
-    const qs = querystring.stringify(noSrcAttrs)
-    return qs ? '?' + qs : qs
-  }
-
-  // stringify an Array of loader objects
-  function stringifyLoaders (loaders) {
-    return loaders
-      .map(
-        obj =>
-          obj && typeof obj === 'object' && typeof obj.loader === 'string'
-            ? obj.loader +
-              (obj.options ? '?' + JSON.stringify(obj.options) : '')
-            : obj
-      )
-      .join('!')
-  }
-
-  function getLoaderString (type, part, index, scoped) {
-    let loader = getRawLoaderString(type, part, index, scoped)
-    const lang = getLangString(type, part)
-    if (preLoaders[lang]) {
-      loader = loader + ensureBang(preLoaders[lang])
-    }
-    if (postLoaders[lang]) {
-      loader = ensureBang(postLoaders[lang]) + loader
-    }
-    return loader
-  }
-
-  function getLangString (type, { lang }) {
-    if (type === 'script' || type === 'template' || type === 'styles') {
-      return lang || defaultLang[type]
-    } else {
-      return type
-    }
-  }
-
-  function getRawLoaderString (type, part, index, scoped) {
-    let lang = part.lang || defaultLang[type]
-
-    let styleCompiler = ''
-    if (type === 'styles') {
-      // style compiler that needs to be applied for all styles
-      styleCompiler =
-        styleCompilerPath +
-        '?' +
-        JSON.stringify({
-          // a marker for vue-style-loader to know that this is an import from a vue file
-          vue: true,
-          id: moduleId,
-          scoped: !!scoped,
-          sourceMap: cssSourceMap
-        }) +
-        '!'
-      // normalize scss/sass/postcss if no specific loaders have been provided
-      if (!loaders[lang]) {
-        if (postcssExtensions.indexOf(lang) !== -1) {
-          lang = 'css'
-        } else if (lang === 'sass') {
-          lang = 'sass?indentedSyntax'
-        } else if (lang === 'scss') {
-          lang = 'sass'
-        }
-      }
-    }
-
-    let loader =
-      options.extractCSS && type === 'styles'
-        ? loaders[lang] || getCSSExtractLoader(lang)
-        : loaders[lang]
-
-    const injectString =
-      type === 'script' && options.inject ? 'inject-loader!' : ''
-
-    if (loader != null) {
-      if (Array.isArray(loader)) {
-        loader = stringifyLoaders(loader)
-      } else if (typeof loader === 'object') {
-        loader = stringifyLoaders([loader])
-      }
-      if (type === 'styles') {
-        // add css modules
-        loader = addCssModulesToLoader(loader, part, index)
-        // inject rewriter before css loader for extractTextPlugin use cases
-        if (rewriterInjectRE.test(loader)) {
-          loader = loader.replace(
-            rewriterInjectRE,
-            (m, $1) => ensureBang($1) + styleCompiler
-          )
-        } else {
-          loader = ensureBang(loader) + styleCompiler
-        }
-      }
-      // if user defines custom loaders for html, add template compiler to it
-      if (type === 'template' && loader.indexOf(defaultLoaders.html) < 0) {
-        loader = defaultLoaders.html + '!' + loader
-      }
-      return injectString + ensureBang(loader)
-    } else {
-      // unknown lang, infer the loader to be used
-      switch (type) {
-        case 'template':
-          return (
-            defaultLoaders.html +
-            '!' +
-            templatePreprocessorPath +
-            '?engine=' +
-            lang +
-            '!'
-          )
-        case 'styles':
-          loader = addCssModulesToLoader(defaultLoaders.css, part, index)
-          return loader + '!' + styleCompiler + ensureBang(ensureLoader(lang))
-        case 'script':
-          return injectString + ensureBang(ensureLoader(lang))
-        default:
-          loader = loaders[type]
-          if (Array.isArray(loader)) {
-            loader = stringifyLoaders(loader)
-          }
-          return ensureBang(loader + buildCustomBlockLoaderString(part.attrs))
-      }
-    }
-  }
-
-  // sass => sass-loader
-  // sass-loader => sass-loader
-  // sass?indentedSyntax!css => sass-loader?indentedSyntax!css-loader
-  function ensureLoader (lang) {
-    return lang
-      .split('!')
-      .map(loader =>
-        loader.replace(
-          /^([\w-]+)(\?.*)?/,
-          (_, name, query) =>
-            (/-loader$/.test(name) ? name : name + '-loader') + (query || '')
-        )
-      )
-      .join('!')
-  }
-
-  function getSelectorString (type, index) {
-    return (
-      selectorPath +
-      '?type=' +
-      (type === 'script' || type === 'template' || type === 'styles'
-        ? type
-        : 'customBlocks') +
-      '&index=' + index +
-      '!'
-    )
-  }
-
-  function ensureBang (loader) {
-    if (loader.charAt(loader.length - 1) !== '!') {
-      return loader + '!'
-    } else {
-      return loader
-    }
-  }
-
-  function getCSSExtractLoader (lang) {
-    let extractor
-    const op = options.extractCSS
-    // extractCSS option is an instance of ExtractTextPlugin
-    if (typeof op.extract === 'function') {
-      extractor = op
-    } else {
-      extractor = tryRequire('extract-text-webpack-plugin')
-      if (!extractor) {
-        throw new Error(
-          '[vue-loader] extractCSS: true requires extract-text-webpack-plugin ' +
-            'as a peer dependency.'
-        )
-      }
-    }
-    const langLoader = lang ? ensureBang(ensureLoader(lang)) : ''
-    return extractor.extract({
-      use: 'css-loader' + cssLoaderOptions + '!' + langLoader,
-      fallback: 'vue-style-loader'
-    })
-  }
 }
diff --git a/lib/runtime/component-normalizer.js b/lib/runtime/component-normalizer.js
index ac09627f4..12330cab7 100644
--- a/lib/runtime/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -5,7 +5,7 @@
 // be included in the final webpack user bundle.
 
 export default function normalizeComponent (
-  rawScriptExports,
+  scriptExports,
   compiledTemplate,
   functionalTemplate,
   injectStyles,
@@ -13,14 +13,12 @@ export default function normalizeComponent (
   moduleIdentifier, /* server only */
   shadowMode /* vue-cli only */
 ) {
-  var esModule
-  var scriptExports = rawScriptExports = rawScriptExports || {}
+  scriptExports = scriptExports || {}
 
   // ES6 modules interop
-  var type = typeof rawScriptExports.default
+  var type = typeof scriptExports.default
   if (type === 'object' || type === 'function') {
-    esModule = rawScriptExports
-    scriptExports = rawScriptExports.default
+    scriptExports = scriptExports.default
   }
 
   // Vue.extend constructor export interop
@@ -103,7 +101,6 @@ export default function normalizeComponent (
   }
 
   return {
-    esModule: esModule,
     exports: scriptExports,
     options: options
   }
diff --git a/package.json b/package.json
index ee7247744..81cd38305 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,6 @@
     "gitbook-plugin-edit-link": "^2.0.2",
     "gitbook-plugin-github": "^3.0.0",
     "gitbook-plugin-theme-vuejs": "^1.1.0",
-    "inject-loader": "^3.0.1",
     "js-yaml": "^3.9.1",
     "jsdom": "^9.2.1",
     "lint-staged": "^4.0.2",
diff --git a/test.html b/test.html
new file mode 100644
index 000000000..c145e1851
--- /dev/null
+++ b/test.html
@@ -0,0 +1 @@
+<script src="./output.js"></script>
diff --git a/test/fixtures/inject.js b/test/fixtures/inject.js
deleted file mode 100644
index 302925789..000000000
--- a/test/fixtures/inject.js
+++ /dev/null
@@ -1 +0,0 @@
-window.injector = require('!!../../lib/loader?inject!./inject.vue')
diff --git a/test/fixtures/inject.vue b/test/fixtures/inject.vue
deleted file mode 100644
index eae6e98b2..000000000
--- a/test/fixtures/inject.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <div class="msg">{{ msg }}</div>
-</template>
-
-<script>
-const SomeService = require('./service')
-
-module.exports = {
-  data () {
-    return {
-      msg: SomeService.msg
-    }
-  }
-}
-</script>
diff --git a/test/test.js b/test/test.js
index e7f8ddcf2..fe9ca5216 100644
--- a/test/test.js
+++ b/test/test.js
@@ -386,25 +386,6 @@ describe('vue-loader', () => {
     })
   })
 
-  it('dependency injection', done => {
-    test({
-      entry: './test/fixtures/inject.js'
-    }, (window) => {
-      // console.log(window.injector.toString())
-      const module = interopDefault(window.injector({
-        './service': {
-          msg: 'Hello from mocked service!'
-        }
-      }))
-      const vnode = mockRender(module, module.data())
-      // <div class="msg">{{ msg }}</div>
-      expect(vnode.tag).to.equal('div')
-      expect(vnode.data.staticClass).to.equal('msg')
-      expect(vnode.children[0].text).to.equal('Hello from mocked service!')
-      done()
-    })
-  })
-
   it('translates relative URLs and respects resolve alias', done => {
     test({
       entry: 'resolve.vue',
diff --git a/yarn.lock b/yarn.lock
index 1401fb9de..515ec62a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -241,7 +241,7 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.25.0, babel-core@^6.26.0, babel-core@~6:
+babel-core@^6.25.0, babel-core@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
@@ -2294,12 +2294,6 @@ ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
-inject-loader@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-3.0.1.tgz#844a4596150cf6b864c2f79806d40a2caee4c2c7"
-  dependencies:
-    babel-core "~6"
-
 inquirer@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"

From da9433eda158df29d696f3728c74ce8b910db340 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 13:21:22 -0500
Subject: [PATCH 827/877] chore: tweak comments

---
 lib/loader.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 671db32a8..a19079d05 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -91,7 +91,14 @@ module.exports = function (content) {
     output += 'var disposed = false\n'
   }
 
-  // add requires for styles
+  // resolve <style> blocks into a `injectStyle` function
+  // - normal mode: injectStyle contains requires to modules that directly
+  //                inject styles on import
+  // - server mode: injectStyle contains required modules with injectors
+  //                (exposed as __inject__ by vue-style-loader) so that they
+  //                can be called with ssrContext
+  // - shadow mode: injectStyle contains required modules with injectors and
+  //                injects to root component's shadowRoot.
   let cssModules
   if (parts.styles.length) {
     const needsExplicitInjection = isServer || isShadowMode
@@ -209,7 +216,7 @@ module.exports = function (content) {
     output += 'var __vue_template__ = null\n'
   }
 
-  // template functional
+  // <template functional>
   output += '/* template functional */\n'
   output +=
     'var __vue_template_functional__ = ' +

From 741bcd20f252d48c3ceff82f08ca31788d91cb30 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 14:40:34 -0500
Subject: [PATCH 828/877] refactor: tweak normalizer

---
 lib/runtime/component-normalizer.js | 31 +++++++++++------------------
 test.html                           |  1 -
 test/fixtures/service.js            |  3 ---
 test/fixtures/ssr-style.js          |  6 +++---
 4 files changed, 15 insertions(+), 26 deletions(-)
 delete mode 100644 test.html
 delete mode 100644 test/fixtures/service.js

diff --git a/lib/runtime/component-normalizer.js b/lib/runtime/component-normalizer.js
index 12330cab7..92d8c67ee 100644
--- a/lib/runtime/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -68,35 +68,28 @@ export default function normalizeComponent (
     // never gets called
     options._ssrRegister = hook
   } else if (injectStyles) {
-    if (shadowMode) {
-      hook = function () {
-        injectStyles(this.$root.$options.shadowRoot)
-      }
-    } else {
-      hook = injectStyles
-    }
+    hook = shadowMode
+      ? function () { injectStyles(this.$root.$options.shadowRoot) }
+      : injectStyles
   }
 
   if (hook) {
-    var functional = options.functional
-    var existing = functional
-      ? options.render
-      : options.beforeCreate
-
-    if (!functional) {
-      // inject component registration as beforeCreate hook
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    } else {
+    if (options.functional) {
       // for template-only hot-reload because in that case the render fn doesn't
       // go through the normalizer
       options._injectStyles = hook
       // register for functioal component in vue file
+      var render = options.render
       options.render = function renderWithStyleInjection (h, context) {
         hook.call(context)
-        return existing(h, context)
+        return render(h, context)
       }
+    } else {
+      // inject component registration as beforeCreate hook
+      var existing = options.beforeCreate
+      options.beforeCreate = existing
+        ? [].concat(existing, hook)
+        : [hook]
     }
   }
 
diff --git a/test.html b/test.html
deleted file mode 100644
index c145e1851..000000000
--- a/test.html
+++ /dev/null
@@ -1 +0,0 @@
-<script src="./output.js"></script>
diff --git a/test/fixtures/service.js b/test/fixtures/service.js
deleted file mode 100644
index 8247bc0cc..000000000
--- a/test/fixtures/service.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  msg: 'hi'
-}
diff --git a/test/fixtures/ssr-style.js b/test/fixtures/ssr-style.js
index eda0771bf..10055bfa2 100644
--- a/test/fixtures/ssr-style.js
+++ b/test/fixtures/ssr-style.js
@@ -1,6 +1,6 @@
-var Vue = require('vue')
-var App = require('./ssr-style.vue').default
+import Vue from 'vue'
+import App from './ssr-style.vue'
 
-module.exports = () => new Vue({
+export default () => new Vue({
   render: h => h(App)
 })

From 03bdf817106c558243b8e434dad6bd4ec9abd2f7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 14:56:43 -0500
Subject: [PATCH 829/877] fix: use esm in template export

---
 lib/template-compiler/index.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 6deb41097..2399fdf40 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -45,9 +45,7 @@ module.exports = function (html) {
         compiled.errors.map(e => `  - ${e}`).join('\n') +
         '\n'
     )
-    code = vueOptions.esModule
-      ? `var esExports = {render:function(){},staticRenderFns: []}\nexport default esExports`
-      : 'module.exports={render:function(){},staticRenderFns:[]}'
+    code = `export default { render:function () {}, staticRenderFns: [] }`
   } else {
     const bubleOptions = options.buble
     const stripWith = bubleOptions.transforms.stripWith !== false
@@ -77,20 +75,16 @@ module.exports = function (html) {
     if (!isProduction && stripWith) {
       code += `render._withStripped = true\n`
     }
-    const exports = `{ render: render, staticRenderFns: staticRenderFns }`
-    code += vueOptions.esModule
-      ? `var esExports = ${exports}\nexport default esExports`
-      : `module.exports = ${exports}`
+    code += `export default { render: render, staticRenderFns: staticRenderFns }`
   }
   // hot-reload
   if (needsHotReload) {
-    const exportsName = vueOptions.esModule ? 'esExports' : 'module.exports'
     code +=
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
       '    require("' + hotReloadAPIPath + '")' +
-      '      .rerender("' + options.id + '", ' + exportsName + ')\n' +
+      '      .rerender("' + options.id + '", { render: render, staticRenderFns: staticRenderFns })\n' +
       '  }\n' +
       '}'
   }

From cfd981d63fd853fe21cf83859d9dbd20ce614169 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 15:07:06 -0500
Subject: [PATCH 830/877] refactor: optimize template exports

---
 lib/loader.js                       | 17 +++++++++++------
 lib/runtime/component-normalizer.js | 13 +++++++------
 lib/template-compiler/index.js      |  6 ++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index a19079d05..1cd2446e4 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -208,12 +208,16 @@ module.exports = function (content) {
   output += '/* template */\n'
   const template = parts.template
   if (template) {
-    output +=
-      (template.src
-        ? getImportForSrc('template', template)
-        : getImport('template', template)) + '\n'
+    output += `import {` +
+      `render as __vue_render__, ` +
+      `staticRenderFns as __vue_static_render_fns__` +
+    `} from ${
+      template.src
+        ? getSrcRequestString('template', template)
+        : getRequestString('template', template)
+    }\n`
   } else {
-    output += 'var __vue_template__ = null\n'
+    output += 'var __vue_render__, __vue_static_render_fns__\n'
   }
 
   // <template functional>
@@ -264,7 +268,8 @@ module.exports = function (content) {
     `import normalizeComponent from ${componentNormalizerRequest}\n` +
     'var Component = normalizeComponent(\n' +
     `  __vue_script__,\n` +
-    '  __vue_template__,\n' +
+    `  __vue_render__,\n` +
+    `  __vue_static_render_fns__,\n` +
     '  __vue_template_functional__,\n' +
     '  __vue_styles__,\n' +
     '  __vue_scopeId__,\n' +
diff --git a/lib/runtime/component-normalizer.js b/lib/runtime/component-normalizer.js
index 92d8c67ee..5c8683b73 100644
--- a/lib/runtime/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -6,7 +6,8 @@
 
 export default function normalizeComponent (
   scriptExports,
-  compiledTemplate,
+  render,
+  staticRenderFns,
   functionalTemplate,
   injectStyles,
   scopeId,
@@ -27,9 +28,9 @@ export default function normalizeComponent (
     : scriptExports
 
   // render functions
-  if (compiledTemplate) {
-    options.render = compiledTemplate.render
-    options.staticRenderFns = compiledTemplate.staticRenderFns
+  if (render) {
+    options.render = render
+    options.staticRenderFns = staticRenderFns
     options._compiled = true
   }
 
@@ -79,10 +80,10 @@ export default function normalizeComponent (
       // go through the normalizer
       options._injectStyles = hook
       // register for functioal component in vue file
-      var render = options.render
+      var originalRender = options.render
       options.render = function renderWithStyleInjection (h, context) {
         hook.call(context)
-        return render(h, context)
+        return originalRender(h, context)
       }
     } else {
       // inject component registration as beforeCreate hook
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 2399fdf40..ede7b38a8 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -45,7 +45,9 @@ module.exports = function (html) {
         compiled.errors.map(e => `  - ${e}`).join('\n') +
         '\n'
     )
-    code = `export default { render:function () {}, staticRenderFns: [] }`
+    code =
+      `export var render = function () {}\n` +
+      `export var staticRenderFns = []`
   } else {
     const bubleOptions = options.buble
     const stripWith = bubleOptions.transforms.stripWith !== false
@@ -75,7 +77,7 @@ module.exports = function (html) {
     if (!isProduction && stripWith) {
       code += `render._withStripped = true\n`
     }
-    code += `export default { render: render, staticRenderFns: staticRenderFns }`
+    code += `export { render, staticRenderFns }`
   }
   // hot-reload
   if (needsHotReload) {

From 93f2afaa074640bba67379f099cce38f29333327 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 1 Feb 2018 15:08:38 -0500
Subject: [PATCH 831/877] 14.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 81cd38305..f9562a77c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.0.3",
+  "version": "14.1.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From fb1ad4a33fcde1b6ea49dfdef4a42f836d843504 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 2 Feb 2018 00:40:45 -0500
Subject: [PATCH 832/877] fix: call injectStyle with this context in shadow
 mode

---
 lib/runtime/component-normalizer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/runtime/component-normalizer.js b/lib/runtime/component-normalizer.js
index 5c8683b73..052e81424 100644
--- a/lib/runtime/component-normalizer.js
+++ b/lib/runtime/component-normalizer.js
@@ -70,7 +70,7 @@ export default function normalizeComponent (
     options._ssrRegister = hook
   } else if (injectStyles) {
     hook = shadowMode
-      ? function () { injectStyles(this.$root.$options.shadowRoot) }
+      ? function () { injectStyles.call(this, this.$root.$options.shadowRoot) }
       : injectStyles
   }
 

From 52658f0891ed0bf173189eb6b5e3a26d102db81d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 2 Feb 2018 00:53:34 -0500
Subject: [PATCH 833/877] 14.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f9562a77c..73c1ae8a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.1.0",
+  "version": "14.1.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 46558ce154587202217b1c597a2959df9bb139e0 Mon Sep 17 00:00:00 2001
From: Alexander Sokolov <modex13@gmail.com>
Date: Fri, 2 Feb 2018 19:44:38 +0300
Subject: [PATCH 834/877] [RU] Translation update (#1148)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Russian translation update

* options.md допереведено предложение

* SUMMARY.md добавлен перечень настроек

* options.md добавлена новая опция

* testing-with-mocks.md добавлены -loader

* testing.md исправлен пример

* scoped-css.md добавлен раздел про вложенные селекторы

* pre-processors.md добавлена новая секция

* options.md нумерация версий

* advanced.md нумерация версий

* options.md уточнение

* options.md уточнение

* Fix merge

* SUMMARY.md добавлены новые пункты

* scoped-css.md новые правки

* options.md новые свойства

* hot-reload.md обновления

* scoped-css.md правка

* HTTP -> HTTPS

* testing-with-mocks.md правка примера

* SUMMARY.md добавлены новые пункты

* functional-template.md добавлен новый файл

* options.md новые разделы

* functional-template.md переведён

* functional.md правки

* postcss.md исправлен пример

* options.md новая секция

* hot-reload.md новая секция

* testing-with-mocks.md новые правки

* postcss.md правки

* options.md новые правки

* options.md правки

* asset-url.md добавлены разъяснения

* Update SUMMARY.md

* asset-url.md опечатка

* advanced.md удалена настройка для вебпака 1

* options.md удалено о первом вебпаке

* custom-block.md удалено о первом вебпаке

* extract-css.md удалено о первом вебпаке

* css-modules.md удалено о первом вебпаке

* postcss.md удалено о первом вебпаке

* setup.md обновление для @vue/cli

* linting.md обновление для eslint-plugin-vue

* production.md удалено о первом вебпаке

* testing.md  обновлено о @vue/test-utils

* testing-with-mocks.md удален
---
 docs/ru/SUMMARY.md                     |  1 -
 docs/ru/workflow/testing-with-mocks.md | 72 --------------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 docs/ru/workflow/testing-with-mocks.md

diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md
index 406c1aee8..f64e0ad80 100644
--- a/docs/ru/SUMMARY.md
+++ b/docs/ru/SUMMARY.md
@@ -18,7 +18,6 @@
   - [Production Build](workflow/production.md)
   - [Линтинг](workflow/linting.md)
   - [Тестирование](workflow/testing.md)
-  - [Тестирование с моками](workflow/testing-with-mocks.md)
 - [Перечень настроек](options.md)
   - [loaders](options.md#loaders)
   - [preLoaders](options.md#preloaders)
diff --git a/docs/ru/workflow/testing-with-mocks.md b/docs/ru/workflow/testing-with-mocks.md
deleted file mode 100644
index 2f5fc299b..000000000
--- a/docs/ru/workflow/testing-with-mocks.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Тестирование с моками
-
-В настоящих приложениях наши компоненты скорее всего будут иметь внешние зависимости. Было бы прекрасно, если бы мы могли полностью контролировать эти зависимости в наших тестах, чтобы они опирались только на поведение тестируемого компонента.
-
-Для этого в модульных тестах используется понятие "мок" ("mock") – это объект, за вызовами методов которого мы можем следить и даже управлять их результатами. Чтобы не тестировать и компонент, и его зависимость в связке, нам достаточно внедрить вместо зависимости созданный мок-объект.
-
-`vue-loader` предоставляет возможность внедрять произвольные зависимости в `*.vue` компоненты, используя [inject-loader](https://github.com/plasticine/inject-loader). Основная идея состоит в том, что вместо прямой подгрузки модуля компонента мы используем `inject-loader`, чтобы создать "фабричную функцию" для этого модуля. Когда мы вызовем эту функцию с мок-объектом, она вернет нам экземпляр модуля с внедренными мок-объектами.
-
-> Примечание: Вы должны отключить опцию `esModule` в режиме инжектирования, иначе вы получите ошибку.
-
-Допустим, у нас есть следующий компонент:
-
-``` html
-<!-- example.vue -->
-<template>
-  <div class="msg">{{ msg }}</div>
-</template>
-
-<script>
-// эту зависимость нужно подменить мок-объектом
-const SomeService = require('../service')
-
-module.exports = {
-  data () {
-    return {
-      msg: SomeService.msg
-    }
-  }
-}
-</script>
-```
-
-Вот как получить его с мок-объектами:
-
-``` bash
-npm install inject-loader --save-dev
-```
-
-``` js
-// example.spec.js
-const ExampleInjector = require('!!vue-loader?inject!./example.vue')
-```
-
-Обратите внимание на эту безумную строку импорта – мы используем [запросы к webpack загрузчику](https://webpack.github.io/docs/loaders.html). Краткое пояснение:
-
-- `!!` в начале строки означает "отключи все загрузчики из глобальной конфигурации"
-- `vue-loader?inject!` значит "используй загрузчик `vue-loader` и передай запрос `?inject`". Это заставляет `vue-loader` скомпилировать компонент в режиме внедрения зависимостей.
-
-Полученный `ExampleInjector` – это фабричная функция, которую можно вызвать, чтобы создать экземпляр модуля `example.vue`:
-
-``` js
-const ExampleWithMocks = ExampleInjector({
-  // mock it
-  '../service': {
-    msg: 'Привет от мок-сервиса!'
-  }
-})
-```
-
-Наконец, мы можем тестировать компонент как обычно:
-
-``` js
-it('should render', () => {
-  const vm = new Vue({
-    template: '<div><test></test></div>',
-    components: {
-      'test': ExampleWithMocks
-    }
-  }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).to.equal('Привет от мок-сервиса!')
-})
-```

From 5c2ba0b158ec2107eba423fb111aeff38b8016e5 Mon Sep 17 00:00:00 2001
From: Jason <417298586@qq.com>
Date: Mon, 26 Feb 2018 02:18:34 +0800
Subject: [PATCH 835/877] Update spec.md (#1173)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

预编译翻译的不准确，应该是编译成HTML的模板语言。
---
 docs/zh-cn/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 3e122304c..cf1b8549a 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -30,7 +30,7 @@ export default {
 
 `vue-loader` 会解析文件，提取每个语言块，如有必要会通过其它 loader 处理，最后将他们组装成一个 CommonJS 模块，`module.exports` 出一个 Vue.js 组件对象。
 
-`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写样式：
+`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，编译为 HTML 的模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写样式：
 
 ``` html
 <style lang="sass">

From 19bfcc289fd73fc0fa4bea10cba87f6272f85f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Mon, 26 Feb 2018 22:53:33 +0800
Subject: [PATCH 836/877] [docs][zh-cn] synced recent updates (#1150)

* [docs][zh-cn] synced recent updates from #436ac94 to #46558ce

* Update linting.md
---
 docs/zh-cn/SUMMARY.md                      |  3 +-
 docs/zh-cn/configurations/advanced.md      | 25 ------
 docs/zh-cn/configurations/custom-blocks.md |  1 -
 docs/zh-cn/configurations/extract-css.md   | 36 --------
 docs/zh-cn/features/css-modules.md         | 11 ---
 docs/zh-cn/features/postcss.md             | 15 +---
 docs/zh-cn/options.md                      | 59 ++++++-------
 docs/zh-cn/start/setup.md                  | 11 ++-
 docs/zh-cn/workflow/linting.md             | 66 +++------------
 docs/zh-cn/workflow/production.md          | 11 +--
 docs/zh-cn/workflow/testing-with-mocks.md  | 70 ---------------
 docs/zh-cn/workflow/testing.md             | 99 +---------------------
 12 files changed, 45 insertions(+), 362 deletions(-)
 delete mode 100644 docs/zh-cn/workflow/testing-with-mocks.md

diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index d8e58fde5..e1e35f348 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -18,7 +18,6 @@
   - [生产环境构建](workflow/production.md)
   - [代码检验](workflow/linting.md)
   - [测试](workflow/testing.md)
-  - [使用 Mock 测试](workflow/testing-with-mocks.md)
 - [选项参考](options.md)
   - [loaders](options.md#loaders)
   - [preLoaders](options.md#preloaders)
@@ -33,4 +32,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/zh-cn/configurations/advanced.md b/docs/zh-cn/configurations/advanced.md
index 04e5c1ab0..592836e6c 100644
--- a/docs/zh-cn/configurations/advanced.md
+++ b/docs/zh-cn/configurations/advanced.md
@@ -12,8 +12,6 @@
 
 > 注意 `preLoaders` 和 `postLoaders` 只在 10.3.0+ 版本支持
 
-### webpack 2.x
-
 ``` js
 module.exports = {
   // other options...
@@ -54,27 +52,4 @@ module.exports = {
 }
 ```
 
-### webpack 1.x
-
-``` js
-// webpack.config.js
-module.exports = {
-  // other options...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  },
-  // `vue-loader` configurations
-  vue: {
-    loaders: {
-      // same configuration rules as above
-    }
-  }
-}
-```
-
 进阶配置更实际的用法是[提取组件中的 CSS 到单个文件](./extract-css.md)。
diff --git a/docs/zh-cn/configurations/custom-blocks.md b/docs/zh-cn/configurations/custom-blocks.md
index 2273f3367..5b1cbecbe 100644
--- a/docs/zh-cn/configurations/custom-blocks.md
+++ b/docs/zh-cn/configurations/custom-blocks.md
@@ -42,7 +42,6 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/zh-cn/configurations/extract-css.md b/docs/zh-cn/configurations/extract-css.md
index b0d0aa38d..b0f176771 100644
--- a/docs/zh-cn/configurations/extract-css.md
+++ b/docs/zh-cn/configurations/extract-css.md
@@ -39,9 +39,6 @@ module.exports = {
 
 将所有 Vue 组件中的所有已处理的 CSS 提取为单个 CSS 文件配置示例：
 
-### webpack 2.x
-
-
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
@@ -69,36 +66,3 @@ module.exports = {
   ]
 }
 ```
-
-### webpack 1.x
-
-``` bash
-npm install extract-text-webpack-plugin --save-dev
-```
-
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-
-module.exports = {
-  // other options...
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-    ]
-  },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // 你还可以引入 <style lang="less"> 或其它语言
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
-  plugins: [
-    new ExtractTextPlugin("style.css")
-  ]
-}
-```
diff --git a/docs/zh-cn/features/css-modules.md b/docs/zh-cn/features/css-modules.md
index 6f81fbf6b..d925004ae 100644
--- a/docs/zh-cn/features/css-modules.md
+++ b/docs/zh-cn/features/css-modules.md
@@ -89,17 +89,6 @@ CSS Modules 处理是通过 [css-loader](https://github.com/webpack/css-loader)
 你可以使用 `vue-loader` 的 `cssModules` 选项去为 `css-loader` 添加 query 配置：
 
 ``` js
-// webpack 1
-vue: {
-  cssModules: {
-    // overwrite local ident name
-    localIdentName: '[path][name]---[local]---[hash:base64:5]',
-    // enable camelCase
-    camelCase: true
-  }
-}
-
-// webpack 2
 module: {
   rules: [
     {
diff --git a/docs/zh-cn/features/postcss.md b/docs/zh-cn/features/postcss.md
index 4f1a8c3e3..5051eea3d 100644
--- a/docs/zh-cn/features/postcss.md
+++ b/docs/zh-cn/features/postcss.md
@@ -27,20 +27,7 @@
 
 或者，你可以使用 `vue-loader` 的 `postcss` 选项来为 `.vue` 文件指定配置。
 
-webpack 1.x 例子：
-
-``` js
-// webpack.config.js
-module.exports = {
-  // 其它配置……
-  vue: {
-    // 使用自定义 PostCSS 插件
-    postcss: [require('postcss-cssnext')()]
-  }
-}
-```
-
-webpack 2.x 例子：
+示例：
 
 ``` js
 // webpack.config.js
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 63195a077..501550727 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -1,8 +1,6 @@
 # 选项参考
 
-## webpack 1 和 2 之间的使用差异
-
-webpack 2：配置直接放到 loader rule 中。
+## 选项放在哪里
 
 ``` js
 module.exports = {
@@ -21,20 +19,9 @@ module.exports = {
 }
 ```
 
-webpack 1.x：在 webpack 配置中添加根节点 `vue` 块。
-
-``` js
-module.exports = {
-  // ...
-  vue: {
-    // `vue-loader` options
-  }
-}
-```
-
 ### loaders
 
-- 类型：`{ [lang: string]: string }`
+- 类型：`{ [lang: string]: string | Object | Array }`
 
   指定 webpack loader 对象覆盖用于 `*.vue` 文件内的语言块的默认 loader。如果指定，该键对应于语言块的 `lang` 属性。每种类型的默认 `lang` 是：
 
@@ -45,7 +32,6 @@ module.exports = {
   例如，使用 `babel-loader` 和 `eslint-loader` 处理所有的 `<script>` 块：
 
   ``` js
-  // webpack 2.x config
   module: {
     rules: [
       {
@@ -61,17 +47,36 @@ module.exports = {
   }
   ```
 
+  你也可以使用对象或数组的语法 (注意这些选项必须是可序列化的)：
+
+  ``` js
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: [
+              { loader: 'cache-loader' },
+              { loader: 'babel-loader', options: { presets: ['env'] } }
+            ]
+          }
+        }
+      }
+    ]
+  }
+  ```
+
 ### preLoaders
 
 - 类型：`{ [lang: string]: string }`
-- 仅在 10.3.0+ 版本中支持
 
   配置格式和 `loaders` 相同，但是 `preLoaders` 会在默认 loaders 之前处理。你可以用来预处理语言块 - 一个常见用例是用来处理构建时的 i18n。
 
 ### postLoaders
 
 - 类型：`{ [lang: string]: string }`
-- 仅在 10.3.0+ 版本中支持
 
   配置格式和 `loaders` 相同，但是 `postLoaders` 会在默认 loaders 之后处理。你可以用来后处理语言块。注意这会有些复杂：
 
@@ -81,11 +86,10 @@ module.exports = {
 
 ### postcss
 
-> 注意：在 11.0.0+ 版本中，推荐使用 PostCSS 配置文件代替。[用法和 `postcss-loader` 相同](https://github.com/postcss/postcss-loader#usage)。
+> 注意：这里推荐使用 PostCSS 配置文件代替，这样你的 `.vue` 文件中的样式和普通的 CSS 样式可以共享相同的配置。[用法和 `postcss-loader` 相同](https://github.com/postcss/postcss-loader#usage)。
 
 - 类型：`Array` or `Function` or `Object`
 
-
   指定要应用于 `.vue` 文件中 CSS 的自定义 PostCSS 插件。如果使用函数，函数将使用相同的 loader 上下文调用，并返回一个插件数组。
 
   ``` js
@@ -207,21 +211,6 @@ module.exports = {
   配置例子：
 
   ``` js
-  // webpack 1
-  vue: {
-    buble: {
-      // 启用对象扩展运算符
-      // 注意：你需要自己提供 Object.assign polyfill！
-      objectAssign: 'Object.assign',
-
-      // turn off the `with` removal
-      transforms: {
-        stripWith: false
-      }
-    }
-  }
-
-  // webpack 2
   module: {
     rules: [
       {
diff --git a/docs/zh-cn/start/setup.md b/docs/zh-cn/start/setup.md
index 97474524f..bf8582798 100644
--- a/docs/zh-cn/start/setup.md
+++ b/docs/zh-cn/start/setup.md
@@ -1,13 +1,12 @@
 # 创建项目
 
-### 使用 `vue-cli`
+### 使用 `@vue/cli`
 
-推荐用脚手架工具 `vue-cli` 来创建一个使用 `vue-loader` 的项目：
+推荐用脚手架工具 `@vue/cli` 来创建一个使用 `vue-loader` 的项目：
 
 ``` bash
-npm install -g vue-cli
-vue init webpack-simple hello-vue
+npm install -g @vue/cli
+vue create hello-vue
 cd hello-vue
-npm install
-npm run dev # ready to go!
+npm run serve # ready to go!
 ```
diff --git a/docs/zh-cn/workflow/linting.md b/docs/zh-cn/workflow/linting.md
index 062a0861c..bd608e30f 100644
--- a/docs/zh-cn/workflow/linting.md
+++ b/docs/zh-cn/workflow/linting.md
@@ -2,13 +2,16 @@
 
 你可能有疑问，在 `.vue` 文件中你怎么检验你的代码，因为它不是 JavaScript。我们假设你使用 [ESLint](https://eslint.org/) (如果你没有使用话，你应该去使用！)。
 
-你还需要 [eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html) 来支持提取并检验你的 `.vue` 文件中的 JavaScript。
+你还需要官方的 [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue)，它支持同时检查你 `.vue` 文件中的模板和脚本。
+
+请确保在你的 ESLint 配置中使用了该插件自身的配置：
 
-确保把下面的配置加入到你的 ESLint 配置中：
 ``` json
-"plugins": [
-  "html"
-]
+{
+  "extends": [
+    "plugin:vue/essential"
+  ]
+}
 ```
 
 在命令行这样使用：
@@ -23,50 +26,7 @@ eslint --ext js,vue MyComponent.vue
 npm install eslint eslint-loader --save-dev
 ```
 
-``` js
-// webpack.config.js
-module.exports = {
-  // ... other options
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue!eslint'
-      }
-    ]
-  }
-}
-```
-
-注意 webpack loader 处理顺序是 **从右到左**。确保在 `vue` 之前应用 `eslint`，这样才能检验编译前的代码。
-
-我们需要考虑使用的 NPM 包中的第三方 `.vue` 组件，实际使用中我们希望使用 `vue-loader` 去处理第三方组件，但是不想检验它们。我们需要把 lint 配置到 webpack 的 [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) 中：
-
-``` js
-// webpack.config.js
-module.exports = {
-  // ... other options
-  module: {
-    // only lint local *.vue files
-    preLoaders: [
-      {
-        test: /\.vue$/,
-        loader: 'eslint',
-        exclude: /node_modules/
-      }
-    ],
-    // but use vue-loader for all *.vue files
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  }
-}
-```
-
-For webpack 2.x：
+请确保它应用在了 pre-loader 上：
 
 ``` js
 // webpack.config.js
@@ -74,17 +34,11 @@ module.exports = {
   // ... other options
   module: {
     rules: [
-      // only lint local *.vue files
       {
         enforce: 'pre',
-        test: /\.vue$/,
+        test: /\.(js|vue)$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
-      },
-      // but use vue-loader for all *.vue files
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader'
       }
     ]
   }
diff --git a/docs/zh-cn/workflow/production.md b/docs/zh-cn/workflow/production.md
index 9c26b85cd..3cc3c9834 100644
--- a/docs/zh-cn/workflow/production.md
+++ b/docs/zh-cn/workflow/production.md
@@ -18,19 +18,12 @@ module.exports = {
         NODE_ENV: '"production"'
       }
     }),
-    // minify with dead-code elimination
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    // optimize module ids by occurrence count
-    new webpack.optimize.OccurrenceOrderPlugin()
+    new webpack.optimize.UglifyJsPlugin()
   ]
 }
 ```
 
-显然，我们不想在开发过程中使用这些配置，所以有几种方法可以解决这个问题：
+我们不想在开发过程中使用这些配置，所以有几种方法可以解决这个问题：
 
 1. 使用环境变量动态构建；
 
diff --git a/docs/zh-cn/workflow/testing-with-mocks.md b/docs/zh-cn/workflow/testing-with-mocks.md
deleted file mode 100644
index 4224f5064..000000000
--- a/docs/zh-cn/workflow/testing-with-mocks.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# 使用 Mock 测试
-
-在真实世界的应用中，我们的组件很有可能具有外部依赖。在为组件编写单元测试时，理想的状态是我们可以模拟这些外部依赖关系，这样我们的测试只依赖被测组件的行为。
-
-`vue-loader` 提供了一个可以使用 [inject-loader](https://github.com/plasticine/inject-loader) 将任意依赖项注入到 `*.vue` 组件的特性。大体思路是：我们使用 `inject-loader` 为该模块创建一个 “模块工厂” 功能，而不是直接导入组件模块。当使用 mock 对象调用此函数时，它会返回模块的实例，并注入到 mock 中。
-
-> 注意：你必须在注入模式下禁用 `esModule` 选项，否则会报错。
-
-假设我们有一个这样的组件：
-
-``` html
-<!-- example.vue -->
-<template>
-  <div class="msg">{{ msg }}</div>
-</template>
-
-<script>
-// this dependency needs to be mocked
-const SomeService = require('../service')
-
-module.exports = {
-  data () {
-    return {
-      msg: SomeService.msg
-    }
-  }
-}
-</script>
-```
-
-以下是使用 mock 导入的方法：
-
-``` bash
-npm install inject-loader --save-dev
-```
-
-``` js
-// example.spec.js
-const ExampleInjector = require('!!vue?inject!./example.vue')
-```
-
-请注意那些超长的依赖字符串——也就是我们使用的一些内联 [webpack loader 依赖](https://webpack.github.io/docs/loaders.html)。简要解释一下：
-
-- 以 `!!` 打头意味着 “禁用全局配置中的所有 loader”；
-- `vue?inject!`意思是 “使用 `vue` loader，并传入 `?inject` 查询”。这告诉 `vue-loader` 在依赖注入模式下编译组件。
-
-返回的 `ExampleInjector` 是一个工厂函数，可以调用它来创建 `example.vue` 模块的实例：
-
-``` js
-const ExampleWithMocks = ExampleInjector({
-  // mock it
-  '../service': {
-    msg: 'Hello from a mocked service!'
-  }
-})
-```
-
-最后，我们可以像往常一样测试组件：
-
-``` js
-it('should render', () => {
-  const vm = new Vue({
-    template: '<div><test></test></div>',
-    components: {
-      'test': ExampleWithMocks
-    }
-  }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).to.equal('Hello from a mocked service!')
-})
-```
diff --git a/docs/zh-cn/workflow/testing.md b/docs/zh-cn/workflow/testing.md
index bb6c72ff5..8ccd41711 100644
--- a/docs/zh-cn/workflow/testing.md
+++ b/docs/zh-cn/workflow/testing.md
@@ -1,100 +1,5 @@
 # 测试
 
-> [webpack vue-cli 模板](https://github.com/vuejs-templates/webpack)为你提供预配置的单元测试和 e2e 测试设置。
+- [@vue/cli](https://github.com/vuejs/vue-cli) 为你提供预配置的单元测试和 e2e 测试设置。
 
-当测试 `*.vue` 文件时，我们不能使用基于 CommonJS 的简单测试运行器，因为它不知道如何处理 `*.vue` 文件。而是应该使用 webpack + vue-loader 打包我们的测试文件。推荐的设置是使用 [Karma](https://karma-runner.github.io/0.13/index.html) 和 [karma-webpack](https://github.com/webpack/karma-webpack)。
-
-Karma 是一个启动浏览器并为你运行测试的测试运行器。你可以选择要测试的浏览器以及你要使用的测试框架 (例如 Mocha 或 Jasmine)。以下是一个在 [PhantomJS](http://phantomjs.org/) 中使用 [Jasmine](https://jasmine.github.io/edge/introduction.html) 测试框架运行测试的 Karma 配置示例：
-
-``` bash
-npm install\
-  karma karma-webpack\
-  karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs-prebuilt\
-  --save-dev
-```
-
-``` js
-// 我们只需要使用完全相同的 webpack 配置即可
-// 但是，请记得删除原来的 entry，因为我们在测试期间不需要它
-var webpackConfig = require('./webpack.config.js')
-delete webpackConfig.entry
-
-// karma.conf.js
-module.exports = function (config) {
-  config.set({
-    browsers: ['PhantomJS'],
-    frameworks: ['jasmine'],
-    // 这是所有测试的入口文件。
-    files: ['test/index.js'],
-    // 把入口文件传给 webpack 以进行打包。
-    preprocessors: {
-      'test/index.js': ['webpack']
-    },
-    // 使用 webpack 配置
-    webpack: webpackConfig,
-    // 避免被无用文本刷屏
-    webpackMiddleware: {
-      noInfo: true
-    },
-    singleRun: true
-  })
-}
-```
-
-`test/index.js` 文件如下：
-
-``` js
-// test/index.js
-// 通过该特殊 webpack 特性引入所有测试文件
-// https://webpack.github.io/docs/context.html#require-context
-var testsContext = require.context('.', true, /\.spec$/)
-testsContext.keys().forEach(testsContext)
-```
-
-此入口文件只需要在同一文件夹中的 `.spec.js` 结尾引入其他所有文件。现在我们可以写一些测试：
-
-``` js
-// test/component-a.spec.js
-var Vue = require('vue')
-var ComponentA = require('../../src/components/a.vue')
-
-describe('a.vue', function () {
-
-  // JavaScript 选项断言
-  it('should have correct message', function () {
-    expect(ComponentA.data().msg).toBe('Hello from Component A!')
-  })
-
-  // 组件实际渲染的渲染结果断言
-  it('should render correct message', function () {
-    var vm = new Vue({
-      template: '<div><test></test></div>',
-      components: {
-        'test': ComponentA
-      }
-    }).$mount()
-    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
-  })
-})
-```
-
-添加以下 NPM 脚本以运行测试：
-
-``` js
-// package.json
-...
-"scripts": {
-  ...
-  "test": "karma start karma.conf.js"
-}
-...
-```
-
-最后运行：
-
-``` bash
-npm test
-```
-
-此外，[webpack vue-cli 模板](https://github.com/vuejs-templates/webpack)包含一个完整的测试用例。
+- 如果你对为 `*.vue` 文件手动设置单元测试感兴趣，请移步 [`@vue/test-utils` 对文档](https://vue-test-utils.vuejs.org/zh-cn/)。

From ce73905094ed4d968d2a4b892e095c235a37c35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sun, 4 Mar 2018 11:06:41 +0800
Subject: [PATCH 837/877] [docs] updated vue-loader into Title Case in all
 titles (#1176)

* [docs][en] updated Vue Loader as Title Case for all titles

* [docs][zh-cn] updated Vue Loader as Title Case for all titles

* [docs] updated vue-loader into Title Case for all titles
---
 README.md            | 2 +-
 docs/en/README.md    | 2 +-
 docs/ja/README.md    | 2 +-
 docs/kr/README.md    | 2 +-
 docs/pt_BR/README.md | 2 +-
 docs/ru/README.md    | 2 +-
 docs/zh-cn/README.md | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index aa224b344..f1e3a0339 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# vue-loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![Windows Build status](https://ci.appveyor.com/api/projects/status/8cdonrkbg6m4k1tm/branch/master?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-loader/branch/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg?maxAge=2592000)](https://www.npmjs.com/package/vue-loader)
+# Vue Loader [![Build Status](https://circleci.com/gh/vuejs/vue-loader/tree/master.svg?style=shield)](https://circleci.com/gh/vuejs/vue-loader/tree/master) [![Windows Build status](https://ci.appveyor.com/api/projects/status/8cdonrkbg6m4k1tm/branch/master?svg=true)](https://ci.appveyor.com/project/yyx990803/vue-loader/branch/master) [![npm package](https://img.shields.io/npm/v/vue-loader.svg?maxAge=2592000)](https://www.npmjs.com/package/vue-loader)
 
 > Vue.js component loader for [Webpack](https://webpack.js.org/).
 
diff --git a/docs/en/README.md b/docs/en/README.md
index a91d0a71a..079c244a5 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -1,6 +1,6 @@
 # Introduction
 
-### What is `vue-loader`?
+### What is Vue Loader?
 
 `vue-loader` is a loader for webpack that can transform Vue components written in the following format into a plain JavaScript module:
 
diff --git a/docs/ja/README.md b/docs/ja/README.md
index ff21057c3..082e44c76 100644
--- a/docs/ja/README.md
+++ b/docs/ja/README.md
@@ -1,6 +1,6 @@
 # はじめに
 
-### `vue-loader` とは ?
+### Vue Loader とは ?
 
 `vue-loader` とは以下の形式で記述された Vue コンポーネントをプレーンな JavaScript モジュールに変換する webpack の loader です。
 
diff --git a/docs/kr/README.md b/docs/kr/README.md
index eb5c36430..a9221f4d7 100644
--- a/docs/kr/README.md
+++ b/docs/kr/README.md
@@ -1,6 +1,6 @@
 # 소개
 
-### `vue-loader`는 무엇인가요?
+### Vue Loader는 무엇인가요?
 
 `vue-loader`는 다음과 같이 작성된 Vue 컴포넌트를 일반적인 자바스크립트 모듈로 변환할 수 있는 webpack에서 사용하는 로더입니다.
 
diff --git a/docs/pt_BR/README.md b/docs/pt_BR/README.md
index 13c66d356..3e4bc58a1 100644
--- a/docs/pt_BR/README.md
+++ b/docs/pt_BR/README.md
@@ -1,6 +1,6 @@
 # Introdução
 
-### O que é `vue-loader`?
+### O que é Vue Loader?
 
 `vue-loader` é um carregador para webpack capaz de transformar componentes Vue, como o exemplo abaixo, em um módulo JavaScript sem formatação:
 
diff --git a/docs/ru/README.md b/docs/ru/README.md
index 11b4d9419..269b6a1a7 100644
--- a/docs/ru/README.md
+++ b/docs/ru/README.md
@@ -1,6 +1,6 @@
 # Введение
 
-### Что такое `vue-loader`?
+### Что такое Vue Loader?
 
 `vue-loader` – это загрузчик для webpack, который преобразует Vue компоненты, написанные в следующем формате в обычные JavaScript модули:
 
diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index dbae15b1e..8681d0bc6 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -1,6 +1,6 @@
 # 介绍
 
-### `vue-loader` 是什么？
+### Vue Loader 是什么？
 
 `vue-loader` 是一个 webpack 的 loader，可以将用下面这个格式编写的 Vue 组件转换为 JavaScript 模块：
 

From 36276c006dcc5d544b0fca583725e514c4218e93 Mon Sep 17 00:00:00 2001
From: toastal <toastal@protonmail.com>
Date: Sun, 4 Mar 2018 10:10:43 +0700
Subject: [PATCH 838/877] SASS -> Sass (http://sassnotsass.com/) (#1169)

---
 docs/en/README.md                           | 4 ++--
 docs/en/configurations/pre-processors.md    | 4 ++--
 docs/en/features/scoped-css.md              | 2 +-
 docs/en/start/spec.md                       | 4 ++--
 docs/ja/README.md                           | 4 ++--
 docs/ja/configurations/pre-processors.md    | 6 +++---
 docs/ja/start/spec.md                       | 4 ++--
 docs/kr/README.md                           | 4 ++--
 docs/kr/configurations/pre-processors.md    | 2 +-
 docs/kr/start/spec.md                       | 4 ++--
 docs/pt_BR/README.md                        | 4 ++--
 docs/pt_BR/configurations/pre-processors.md | 4 ++--
 docs/pt_BR/start/spec.md                    | 4 ++--
 docs/ru/README.md                           | 4 ++--
 docs/ru/configurations/pre-processors.md    | 8 ++++----
 docs/ru/features/scoped-css.md              | 2 +-
 docs/ru/start/spec.md                       | 4 ++--
 docs/zh-cn/README.md                        | 4 ++--
 docs/zh-cn/configurations/pre-processors.md | 4 ++--
 docs/zh-cn/features/scoped-css.md           | 2 +-
 docs/zh-cn/start/spec.md                    | 4 ++--
 21 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/docs/en/README.md b/docs/en/README.md
index 079c244a5..843841e5d 100644
--- a/docs/en/README.md
+++ b/docs/en/README.md
@@ -9,7 +9,7 @@
 There are many cool features provided by `vue-loader`:
 
 - ES2015 enabled by default;
-- Allows using other webpack loaders for each part of a Vue component, for example SASS for `<style>` and Jade for `<template>`;
+- Allows using other webpack loaders for each part of a Vue component, for example Sass for `<style>` and Jade for `<template>`;
 - Allows custom sections in a .vue file that can have custom loader chains applied to them
 - Treat static assets referenced in `<style>` and `<template>` as module dependencies and handle them with webpack loaders;
 - Can simulate scoped CSS for each component;
@@ -32,7 +32,7 @@ But webpack can do more than that. With "loaders", we can teach webpack to trans
 - Transpile ES2015, CoffeeScript or TypeScript modules into plain ES5 CommonJS modules;
 - Optionally you can pipe the source code through a linter before doing the compilation;
 - Transpile Jade templates into plain HTML and inline it as a JavaScript string;
-- Transpile SASS files into plain CSS, then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
+- Transpile Sass files into plain CSS, then convert it into a JavaScript snippet that insert the resulting CSS as a `<style>` tag;
 - Process an image file referenced in HTML or CSS, moved it to the desired destination based on the path configurations, and naming it using its md5 hash.
 
 webpack is so powerful that when you understand how it works, it can dramatically improve your front-end workflow. Its primary drawback is its verbose and complex configuration; but with this guide you should be able to find solutions for most common issues when using webpack with Vue.js and `vue-loader`.
diff --git a/docs/en/configurations/pre-processors.md b/docs/en/configurations/pre-processors.md
index 632274ace..1b63cba6c 100644
--- a/docs/en/configurations/pre-processors.md
+++ b/docs/en/configurations/pre-processors.md
@@ -4,7 +4,7 @@ In webpack, all pre-processors need to be applied with a corresponding loader. `
 
 ### CSS
 
-For example, let's compile our `<style>` tag with SASS:
+For example, let's compile our `<style>` tag with Sass:
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -20,7 +20,7 @@ Under the hood, the text content inside the `<style>` tag will be first compiled
 
 #### sass-loader caveat
 
-Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *SASS* syntax, you have to configure vue-loader's options for sass-loader accordingly.
+Contrary to what its name indicates, [*sass*-loader](https://github.com/jtangelder/sass-loader) parses *SCSS* syntax by default. If you actually want to use the indented *Sass* syntax, you have to configure vue-loader's options for sass-loader accordingly.
 
 ```javascript
 {
diff --git a/docs/en/features/scoped-css.md b/docs/en/features/scoped-css.md
index 35e91ad82..93a616bf9 100644
--- a/docs/en/features/scoped-css.md
+++ b/docs/en/features/scoped-css.md
@@ -64,7 +64,7 @@ The above will be compiled into:
 .a[data-v-f3f3eg9] .b { /* ... */ }
 ```
 
-Some pre-processors, such as SASS, may not be able to parse `>>>` properly. In those cases you can use the `/deep/` combinator instead - it's an alias for `>>>` and works exactly the same.
+Some pre-processors, such as Sass, may not be able to parse `>>>` properly. In those cases you can use the `/deep/` combinator instead - it's an alias for `>>>` and works exactly the same.
 
 ### Dynamically Generated Content
 
diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 3917f0857..4e3dc582b 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -30,11 +30,11 @@ export default {
 
 `vue-loader` will parse the file, extract each language block, pipe them through other loaders if necessary, and finally assemble them back into a CommonJS module whose `module.exports` is a Vue.js component options object.
 
-`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. For example, you can use SASS for the style of your component like this:
+`vue-loader` supports using non-default languages, such as CSS pre-processors and compile-to-HTML template languages, by specifying the `lang` attribute for a language block. For example, you can use Sass for the style of your component like this:
 
 ``` html
 <style lang="sass">
-  /* write SASS! */
+  /* write Sass! */
 </style>
 ```
 
diff --git a/docs/ja/README.md b/docs/ja/README.md
index 082e44c76..67e5eeb2d 100644
--- a/docs/ja/README.md
+++ b/docs/ja/README.md
@@ -9,7 +9,7 @@
 `vue-loader` によって多くのクールな機能が提供されます:
 
 - デフォルトで ES2015 が有効
-- `<style>` には SASS、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の webpack の loader が使用可能、カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能
+- `<style>` には Sass、 `<template>` には Jade など、Vue コンポーネントの各パーツに他の webpack の loader が使用可能、カスタム loader チェーンを適用できる .vue ファイルのカスタムセクションを追加可能
 - `<style>` と `<template>` で参照される静的なアセットをモジュールの依存として扱い、webpack の loader で処理可能
 - 各コンポーネントで scoped CSS をシミュレートすることが可能
 - 開発時のコンポーネントのホットリロードをサポート
@@ -31,7 +31,7 @@
 - ES2015、CoffeeScript、TypeScript のモジュールをプレーンな ES5 の CommonJS モジュールにトランスパイル
 - オプションでコンパイルを行う前にソースコードを linter に通すことが可能
 - Jade テンプレートをプレーンな HTML にトランスパイルし、JavaScript の文字列として展開
-- SASS ファイルをプレーンな CSS にトランスパイルし、`<style>` タグとして挿入する JavaScript スニペットに変換
+- Sass ファイルをプレーンな CSS にトランスパイルし、`<style>` タグとして挿入する JavaScript スニペットに変換
 - HTML または CSS で参照されるイメージファイルを処理し、パスの設定に基づいた目的の場所に移動し、md5 ハッシュを使用して名前付け
 
 webpack は非常に強力です。どのように動作するか理解すれば、フロントエンド開発のワークフローを劇的に向上させることが出来ます。欠点としては冗長で複雑な構成です。しかし、このガイドでは Vue.js と `vue-loader` での webpack を使用する際に一般的な問題の解決策を見つけることができるはずです。
diff --git a/docs/ja/configurations/pre-processors.md b/docs/ja/configurations/pre-processors.md
index 01950585f..637e75583 100644
--- a/docs/ja/configurations/pre-processors.md
+++ b/docs/ja/configurations/pre-processors.md
@@ -4,7 +4,7 @@ webpack において、全てのプリプロセッサは対応する loader を
 
 ### CSS
 
-例えば、SASS で `<style>` タグをコンパイルしましょう:
+例えば、Sass で `<style>` タグをコンパイルしましょう:
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -12,7 +12,7 @@ npm install sass-loader node-sass --save-dev
 
 ``` html
 <style lang="sass">
-  /* ここにSASSを書きます */
+  /* ここにSassを書きます */
 </style>
 ```
 
@@ -20,7 +20,7 @@ npm install sass-loader node-sass --save-dev
 
 #### sass-loader 使用時の注意
 
-その名前が示すものとは対照的に、[* sass * -loader](https://github.com/jtangelder/sass-loader) はデフォルトで *SCSS* の構文を解析します。インデントされた *SASS* 構文を実際に使用する場合は、それに応じて sass-loader へ vue-loader のオプションを設定する必要があります。
+その名前が示すものとは対照的に、[* sass * -loader](https://github.com/jtangelder/sass-loader) はデフォルトで *SCSS* の構文を解析します。インデントされた *Sass* 構文を実際に使用する場合は、それに応じて sass-loader へ vue-loader のオプションを設定する必要があります。
 
 ```javascript
 {
diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
index 94a0e431b..52d65c081 100644
--- a/docs/ja/start/spec.md
+++ b/docs/ja/start/spec.md
@@ -30,11 +30,11 @@ export default {
 
 `vue-loader` はファイルを解析し、それぞれの言語ブロックを必要に応じて他の loader を通し、最終的に `module.exports` が Vue.js のコンポーネントオプションオブジェクトの CommonJS モジュールに変換します。
 
-`vue-loader` は CSS プリプロセッサや HTML にコンパイルするテンプレート言語といった、デフォルトでない言語を言語ブロックの `lang` 属性を使用することでサポートします。例えばコンポーネントのスタイルに SASS を使用することが出来ます。
+`vue-loader` は CSS プリプロセッサや HTML にコンパイルするテンプレート言語といった、デフォルトでない言語を言語ブロックの `lang` 属性を使用することでサポートします。例えばコンポーネントのスタイルに Sass を使用することが出来ます。
 
 ``` html
 <style lang="sass">
-  /* SASS で書きます! */
+  /* Sass で書きます! */
 </style>
 ```
 詳細は [プリプロセッサの仕様](../configurations/pre-processors.md) で確認することが出来ます。
diff --git a/docs/kr/README.md b/docs/kr/README.md
index a9221f4d7..70e141083 100644
--- a/docs/kr/README.md
+++ b/docs/kr/README.md
@@ -9,7 +9,7 @@
 다음은 `vue-loader`가 제공하는 여러가지 유용한 기능입니다.
 
 - 기본적으로 ES2015를 지원합니다.
-- 각 Vue 컴포넌트 마다 서로 다른 webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 SASS, `<template>`에 Jade로 각각 설정 가능합니다.
+- 각 Vue 컴포넌트 마다 서로 다른 webpack 로더를 사용할 수 있습니다. 예를들면 `<style>`에 Sass, `<template>`에 Jade로 각각 설정 가능합니다.
 - `<style>`과 `<template>`에서 참조된 정적 Asset 파일을 모듈로 취급하고 webpack 로더로 처리합니다.
 - 각 컴포넌트마다 지정된 CSS를 시뮬레이트 할 수 있습니다.
 - 개발 중에 컴포넌트 핫 리로딩을 지원합니다.
@@ -31,7 +31,7 @@
 - ES2015 또는 CoffeeScript, TypeScript 모듈을 ES5 CommonJS 모듈로 변환할 수 있습니다.
 - 선택 사항으로 컴파일 전에 linter를 이용하여 소스 코드를 연결 할 수 있습니다.
 - Jade 템플릿을 일반 HTML로 변경하고 JavaScript 문자열로 반환합니다.
-- SASS 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 JavaScript 스니펫으로 변환합니다.
+- Sass 파일을 일반 CSS로 변환한 다음 CSS를 `<style>` 태그로 삽입하는 JavaScript 스니펫으로 변환합니다.
 - HTML 또는 CSS에서 참조된 이미지 파일을 처리하고 경로 구성에 따라 이동한 후 md5 해시를 사용하여 이름을 지정합니다.
 
 webpack은 매우 강력하며 작동 원리를 이해한다면 프론트엔드 작업환경을 획기적으로 향상시킬 수 있습니다. 구성하기에 장황하고 복잡한 것이 단점입니다. 하지만 이 가이드를 사용하면 Vue.js 및 `vue-loader`에서 webpack을 사용할 때 가장 일반적인 문제에 대한 솔루션을 찾을 수 있습니다.
diff --git a/docs/kr/configurations/pre-processors.md b/docs/kr/configurations/pre-processors.md
index 15b29684e..e6c62a20c 100644
--- a/docs/kr/configurations/pre-processors.md
+++ b/docs/kr/configurations/pre-processors.md
@@ -4,7 +4,7 @@ webpack에서는 모든 전처리기가 해당 로더와 함께 적용되어야
 
 ### CSS
 
-예를 들어, SASS로 `<style>`을 컴파일해봅시다.
+예를 들어, Sass로 `<style>`을 컴파일해봅시다.
 
 ``` bash
 npm install sass-loader node-sass --save-dev
diff --git a/docs/kr/start/spec.md b/docs/kr/start/spec.md
index 3096919f8..14a498c7d 100644
--- a/docs/kr/start/spec.md
+++ b/docs/kr/start/spec.md
@@ -30,11 +30,11 @@ export default {
 
 `vue-loader`는 파일을 파싱하고 각 language block을 추출하며 필요한 경우 다른 로더를 통해 파이프 처리한 후 마지막으로 Module.exports가 Vue.js 컴포넌트 엘리먼트 옵션 객체인 CommonJS 모듈로 다시 조합합니다.
 
-`vue-loader`는 language block에 `lang` 속성을 지정하여 CSS 전처리기나 HTML에서 템플릿을 컴파일 하는 것과 같은 기본 언어가 아닌 것을 사용할 수 있게 합니다. 예를 들어 컴포넌트 스타일에 SASS를 사용할 수 있습니다.
+`vue-loader`는 language block에 `lang` 속성을 지정하여 CSS 전처리기나 HTML에서 템플릿을 컴파일 하는 것과 같은 기본 언어가 아닌 것을 사용할 수 있게 합니다. 예를 들어 컴포넌트 스타일에 Sass를 사용할 수 있습니다.
 
 ``` html
 <style lang="sass">
-  /* write SASS! */
+  /* write Sass! */
 </style>
 ```
 
diff --git a/docs/pt_BR/README.md b/docs/pt_BR/README.md
index 3e4bc58a1..7df3b3fb3 100644
--- a/docs/pt_BR/README.md
+++ b/docs/pt_BR/README.md
@@ -9,7 +9,7 @@
 O `vue-loader` fornece muitos recursos interessantes:
 
 - ES2015 habilitado por padrão;
-- Permite usar outros carregadores webpack para cada parte de um componente Vue, por exemplo SASS para `<style>` e Jade para `<template>`;
+- Permite usar outros carregadores webpack para cada parte de um componente Vue, por exemplo Sass para `<style>` e Jade para `<template>`;
 - Permite seções customizadas em um arquivo .vue que pode ter carregadores encadeados personalizados aplicados a eles;
 - Trata ativos estáticos referenciado em `<style>` e `<template>` como dependência de módulo e então manipula com carregadores webpack;
 - Pode simular escopo CSS para cada componente;
@@ -32,7 +32,7 @@ Mais do que isso, com o uso dos "loaders" o webpack é capaz de transformar todo
 - Transpilar módulos ES2015, CoffeScript ou TypeScript em módulos simples CommonJs ES5;
 - Você pode escolher se quer canalizar o código fonte através de um linter \(analisador de código\) antes de fazer a compilação;
 - Transpilar modelos Jade em HTML sem formatação e em seguida colocá-lo como uma sequência de string JavaScript;
-- Traspilar arquivos SASS em CSS sem formatação, em seguida os converter em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
+- Traspilar arquivos Sass em CSS sem formatação, em seguida os converter em trechos de código JavaScript que insere o resultado CSS como uma tag `<style>`;
 - Processar um arquivo de imagem referenciado em HTML ou CSS, movê-la para o destino desejado baseado no arquivo de configuração, e nomeá-la usando seu hash md5;
 
 webpack é tão poderoso que quando você entender como ele funciona, poderá melhorar drasticamente seu fluxo de trabalho front-end. Sua principal desvantagem é a configuração excessiva e complexa; Mas com este guia você deve se capaz de encontrar solução para muitas questões comuns usando webpack com Vue.js e `vue-loader`.
diff --git a/docs/pt_BR/configurations/pre-processors.md b/docs/pt_BR/configurations/pre-processors.md
index d593b58b2..f19b1e33d 100644
--- a/docs/pt_BR/configurations/pre-processors.md
+++ b/docs/pt_BR/configurations/pre-processors.md
@@ -4,7 +4,7 @@ No webpack, todos os pré-processadores precisam ser aplicados com um carregador
 
 ### CSS
 
-Por exemplo, vamos compilar nossa tag `<style>` com SASS:
+Por exemplo, vamos compilar nossa tag `<style>` com Sass:
 
 ```bash
 npm install sass-loader node-sass --save-dev
@@ -20,7 +20,7 @@ Por baixo do capô, o conteúdo de texto dentro da tag `<style>` será primeiram
 
 #### Advertências de sass-loader
 
-Ao contrário do que seu nome indica, [sass-loader](https://github.com/jtangelder/sass-loader) analisa a sintaxe *SCSS* por padrão. Se você atualmente deseja usar a indentação da sintaxe *SASS*, você tem que configurar as opções de vue-loader para sass-loader adequadamente.
+Ao contrário do que seu nome indica, [sass-loader](https://github.com/jtangelder/sass-loader) analisa a sintaxe *SCSS* por padrão. Se você atualmente deseja usar a indentação da sintaxe *Sass*, você tem que configurar as opções de vue-loader para sass-loader adequadamente.
 
 ```js
 {
diff --git a/docs/pt_BR/start/spec.md b/docs/pt_BR/start/spec.md
index a9d0c1667..b5f8d29b9 100644
--- a/docs/pt_BR/start/spec.md
+++ b/docs/pt_BR/start/spec.md
@@ -30,11 +30,11 @@ Um arquivo `*.vue` é um formato de arquivo personalizado que usa sintaxe semelh
 
 `vue-loader` analisará o arquivo, extrair cada bloco de linguagem canalizá-lo através de outros carregadores se necessário, e finalmente montá-lo de volta em um módulo CommonJs cujo `module.exports` seja um objeto de opções do componente Vue.js.
 
-`vue-loader` suporta o uso de linguagens não-padrão, tais como pré-processadores CSS e linguagem que compila para HTML a partir de um template, especificando o atributo `lang` para um bloco de linguagem. Por exemplo, você pode usar SASS para o estilo do seu componente como este:
+`vue-loader` suporta o uso de linguagens não-padrão, tais como pré-processadores CSS e linguagem que compila para HTML a partir de um template, especificando o atributo `lang` para um bloco de linguagem. Por exemplo, você pode usar Sass para o estilo do seu componente como este:
 
 ```html
 <style lang="sass">
-  /* escreva SASS! */
+  /* escreva Sass! */
 </style>
 ```
 
diff --git a/docs/ru/README.md b/docs/ru/README.md
index 269b6a1a7..5fba5b290 100644
--- a/docs/ru/README.md
+++ b/docs/ru/README.md
@@ -9,7 +9,7 @@
 `vue-loader` предлагает множество полезных возможностей:
 
 - Поддержка ES2015 по умолчанию;
-- Позволяет использовать разные загрузчики webpack для разных частей Vue компонента, например, SASS для `<style>` и Jade для `<template>`;
+- Позволяет использовать разные загрузчики webpack для разных частей Vue компонента, например, Sass для `<style>` и Jade для `<template>`;
 - Позволяет использовать пользовательские секции во .vue-файлах, применяя к ним пользовательские цепочки загрузчиков
 - Обращается со статическими ресурсами, указанными в `<style>` и `<template>`, как с зависимостями модуля, и обрабатывает их webpack загрузчиками;
 - Может эмулировать scoped CSS для компонентов;
@@ -32,7 +32,7 @@
 - Скомпилировать ES2015, CoffeeScript или TypeScript модули в обычные ES5 CommonJS модули;
 - Пропустить код через статический анализатор, прежде чем приступать к компиляции;
 - Скомпилировать Jade шаблоны в обычный HTML и добавить его на страницу в виде строки JavaScript;
-- Скомпилировать SASS файлы в обычный CSS, затем конвертировать его в JS скрипт, который будет добавлять полученный CSS как тег `<style>`;
+- Скомпилировать Sass файлы в обычный CSS, затем конвертировать его в JS скрипт, который будет добавлять полученный CSS как тег `<style>`;
 - Обработать файлы изображений, указанные в HTML или CSS, переместить их в нужное место, согласно файлу конфигурации, и переименовать, используя их md5 хеш.
 
 webpack настолько крут, что когда вы поймете, как он работает, он значительно улучшит ваш процесс разработки клиентской части. Его основным недостатком является многословная и сложная конфигурация; но с этим руководством вы сможете найти решения для большинства задач, возникающих при работе с webpack в сочетании с Vue.js и `vue-loader`.
diff --git a/docs/ru/configurations/pre-processors.md b/docs/ru/configurations/pre-processors.md
index 71d7cda85..2863b665c 100644
--- a/docs/ru/configurations/pre-processors.md
+++ b/docs/ru/configurations/pre-processors.md
@@ -4,7 +4,7 @@
 
 ### CSS
 
-Например, пусть в теге `<style>` будет использоваться SASS:
+Например, пусть в теге `<style>` будет использоваться Sass:
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -12,7 +12,7 @@ npm install sass-loader node-sass --save-dev
 
 ``` html
 <style lang="sass">
-  /* используем SASS здесь */
+  /* используем Sass здесь */
 </style>
 ```
 
@@ -20,7 +20,7 @@ npm install sass-loader node-sass --save-dev
 
 #### Особенность sass-loader
 
-Вопреки тому, что он называется [*sass*-loader](https://github.com/jtangelder/sass-loader), по умолчанию парсится синтаксис *SCSS*. Если вы на самом деле хотите использовать синтаксис *SASS* с отступами, вам требуется настроить vue-loader для sass-loader соответственно.
+Вопреки тому, что он называется [*sass*-loader](https://github.com/jtangelder/sass-loader), по умолчанию парсится синтаксис *SCSS*. Если вы на самом деле хотите использовать синтаксис *Sass* с отступами, вам требуется настроить vue-loader для sass-loader соответственно.
 
 ```javascript
 {
@@ -108,7 +108,7 @@ div
 
 ``` html
 <style lang="sass?outputStyle=expanded">
-  /* используем SASS с расширенным выводом */
+  /* используем Sass с расширенным выводом */
 </style>
 ```
 
diff --git a/docs/ru/features/scoped-css.md b/docs/ru/features/scoped-css.md
index b561ce807..d9f4f7388 100644
--- a/docs/ru/features/scoped-css.md
+++ b/docs/ru/features/scoped-css.md
@@ -64,7 +64,7 @@
 .a[data-v-f3f3eg9] .b { /* ... */ }
 ```
 
-Некоторые пре-процессоры, такие как SASS, не могут правильно обработать `>>>`. В таких случаях вы можете использовать комбинатор `/deep/` — это псевдоним для `>>>` работающий точно также.
+Некоторые пре-процессоры, такие как Sass, не могут правильно обработать `>>>`. В таких случаях вы можете использовать комбинатор `/deep/` — это псевдоним для `>>>` работающий точно также.
 
 ### Динамически генерируемый контент
 
diff --git a/docs/ru/start/spec.md b/docs/ru/start/spec.md
index d50552543..4353fb0f0 100644
--- a/docs/ru/start/spec.md
+++ b/docs/ru/start/spec.md
@@ -30,11 +30,11 @@ export default {
 
 `vue-loader` парсит файл, извлекает каждую из секций, обрабатывает их при необходимости другими loader'ами, и в итоге собирает всё обратно в модуль CommonJS где `module.exports` будет объектом настроек компонента Vue.js.
 
-`vue-loader` предоставляет возможность использовать нестандартные языки, например пре-процессоры CSS и языки шаблонов компилируемые в HTML просто указав атрибут `lang` для секции файла. Например, вы можете использовать SASS для стилей вашего компонента:
+`vue-loader` предоставляет возможность использовать нестандартные языки, например пре-процессоры CSS и языки шаблонов компилируемые в HTML просто указав атрибут `lang` для секции файла. Например, вы можете использовать Sass для стилей вашего компонента:
 
 ``` html
 <style lang="sass">
-  /* используем SASS! */
+  /* используем Sass! */
 </style>
 ```
 
diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index 8681d0bc6..2c577b685 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -9,7 +9,7 @@
 这里有一些 `vue-loader` 提供的很酷的特性：
 
 - 默认支持 ES2015；
-- 允许对 Vue 组件的组成部分使用其它 webpack loader，比如对 `<style>` 使用 SASS 和对 `<template>` 使用 Jade；
+- 允许对 Vue 组件的组成部分使用其它 webpack loader，比如对 `<style>` 使用 Sass 和对 `<template>` 使用 Jade；
 - `.vue` 文件中允许自定义节点，然后使用自定义的 loader 进行处理；
 - 把 `<style>` 和 `<template>` 中的静态资源当作模块来对待，并使用 webpack loader 进行处理；
 - 对每个组件模拟出 CSS 作用域；
@@ -32,7 +32,7 @@
 - 转换 ES2015，CoffeeScript 或者 TypeScript 模块为普通的 ES5 CommonJS 模块；
 - 可以选择在编译之前检验你的源代码；
 - 将 Jade 模版转换为纯 HTML 并且嵌入 Javascript 字符串中；
-- 将 SASS 文件转换为纯 CSS，然后将其转换成 JavaScript 片段，将生成的 CSS 作为 `<style>` 标签插入页面；
+- 将 Sass 文件转换为纯 CSS，然后将其转换成 JavaScript 片段，将生成的 CSS 作为 `<style>` 标签插入页面；
 - 处理 HTML 或者 CSS 中引用的图片，移动到配置的路径中，并且使用 md5 hash 重命名。
 
 当你理解 webpack 原理后会感觉它是如此强大，它可以大大优化你的前端工作流程。它主要的缺点是配置复杂麻烦，但是使用本指南，应该可以帮助你找到 Vue.js 和 `vue-loader` 使用时的最常见问题的解决方案。
diff --git a/docs/zh-cn/configurations/pre-processors.md b/docs/zh-cn/configurations/pre-processors.md
index 0f40ea0e8..576ca3351 100644
--- a/docs/zh-cn/configurations/pre-processors.md
+++ b/docs/zh-cn/configurations/pre-processors.md
@@ -4,7 +4,7 @@
 
 ### CSS
 
-例如，使用 SASS 编译我们的 `<style>` 语言块：
+例如，使用 Sass 编译我们的 `<style>` 语言块：
 
 ``` bash
 npm install sass-loader node-sass --save-dev
@@ -20,7 +20,7 @@ npm install sass-loader node-sass --save-dev
 
 #### sass-loader 警告
 
-与名称相反，[*sass*-loader](https://github.com/jtangelder/sass-loader) 默认解析 *SCSS* 语法。如果你想要使用 *SASS* 语法，你需要配置 `vue-loader` 的选项：
+与名称相反，[*sass*-loader](https://github.com/jtangelder/sass-loader) 默认解析 *SCSS* 语法。如果你想要使用 *Sass* 语法，你需要配置 `vue-loader` 的选项：
 
 ```javascript
 {
diff --git a/docs/zh-cn/features/scoped-css.md b/docs/zh-cn/features/scoped-css.md
index 5ee171555..13b9a904b 100644
--- a/docs/zh-cn/features/scoped-css.md
+++ b/docs/zh-cn/features/scoped-css.md
@@ -64,7 +64,7 @@
 .a[data-v-f3f3eg9] .b { /* ... */ }
 ```
 
-有些像 SASS 之类的预处理器无法正确解析 `>>>`。这种情况下你可以使用 `/deep/` 操作符取而代之——这是一个 `>>>` 的别名，同样可以正常工作。
+有些像 Sass 之类的预处理器无法正确解析 `>>>`。这种情况下你可以使用 `/deep/` 操作符取而代之——这是一个 `>>>` 的别名，同样可以正常工作。
 
 ### 动态生成的内容
 
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index cf1b8549a..ba4a47319 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -30,11 +30,11 @@ export default {
 
 `vue-loader` 会解析文件，提取每个语言块，如有必要会通过其它 loader 处理，最后将他们组装成一个 CommonJS 模块，`module.exports` 出一个 Vue.js 组件对象。
 
-`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，编译为 HTML 的模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 SASS 语法编写样式：
+`vue-loader` 支持使用非默认语言，比如 CSS 预处理器，预编译的 HTML 模版语言，通过设置语言块的 `lang` 属性。例如，你可以像下面这样使用 Sass 语法编写样式：
 
 ``` html
 <style lang="sass">
-  /* write SASS! */
+  /* write Sass! */
 </style>
 ```
 

From 8b912adfcdd7b5e527fa69321f3174b5768ff903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E9=93=84=E8=BF=90?= <fnlctrl@gmail.com>
Date: Tue, 6 Mar 2018 22:30:30 +0800
Subject: [PATCH 839/877] fix: get transformToRequire from vueOptions instead
 of options for template-compiler (#1175)

---
 lib/template-compiler/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index ede7b38a8..7b60c70af 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -14,7 +14,7 @@ module.exports = function (html) {
   const vueOptions = this._compilation.__vueOptions__ || {}
   const options = loaderUtils.getOptions(this) || {}
   const needsHotReload = !isServer && !isProduction && vueOptions.hotReload !== false
-  const defaultModules = [transformRequire(options.transformToRequire), transformSrcset()]
+  const defaultModules = [transformRequire(vueOptions.transformToRequire), transformSrcset()]
 
   const compilerOptions = {
     preserveWhitespace: vueOptions.preserveWhitespace,

From 6cb3192c36a666ade3fbd596b2fe8efd05c07133 Mon Sep 17 00:00:00 2001
From: Vladimir Shushlin <VladimirShushlin@mail.ru>
Date: Tue, 6 Mar 2018 17:33:52 +0300
Subject: [PATCH 840/877] docs: add link to Emacs vue-mode to syntax
 highlighting (#1102)

---
 docs/en/start/spec.md    | 2 +-
 docs/ja/start/spec.md    | 2 +-
 docs/kr/start/spec.md    | 2 +-
 docs/pt_BR/start/spec.md | 2 +-
 docs/ru/start/spec.md    | 2 +-
 docs/zh-cn/start/spec.md | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 4e3dc582b..0e2ee0bb7 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -104,7 +104,7 @@ Beware that `src` imports follow the same path resolution rules to CommonJS `req
 
 ### Syntax Highlighting
 
-Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by treating `*.vue` files as HTML in your editor.
+Currently there is syntax highlighting support for [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Emacs](https://github.com/AdamNiederer/vue-mode), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), and [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). Contributions for other editors/IDEs are highly appreciated! If you are not using any pre-processors in Vue components, you can also get by treating `*.vue` files as HTML in your editor.
 
 ### Comments
 
diff --git a/docs/ja/start/spec.md b/docs/ja/start/spec.md
index 52d65c081..9f25525e1 100644
--- a/docs/ja/start/spec.md
+++ b/docs/ja/start/spec.md
@@ -95,7 +95,7 @@ export default {
 
 ### シンタックスハイライト
 
-現在それらはシンタクスハイライトをサポートしているのは、[Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). 他のエディタ/IDEへのコントリビュートは高く評価されます！もし Vue コンポーネント内でプリプロセッサを使用していない場合は、エディタで `*.vue` ファイルを HTML として扱うことが出来ます。
+現在それらはシンタクスハイライトをサポートしているのは、[Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Emacs](https://github.com/AdamNiederer/vue-mode), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, etc). 他のエディタ/IDEへのコントリビュートは高く評価されます！もし Vue コンポーネント内でプリプロセッサを使用していない場合は、エディタで `*.vue` ファイルを HTML として扱うことが出来ます。
 
 ### コメント
 
diff --git a/docs/kr/start/spec.md b/docs/kr/start/spec.md
index 14a498c7d..1c324aa7d 100644
--- a/docs/kr/start/spec.md
+++ b/docs/kr/start/spec.md
@@ -104,7 +104,7 @@ export default {
 
 ### 구문 강조
 
-현재 구문강조는 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), 와 [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 등)을 지원합니다. 다른 편집기/IDE에 대한 기여를 원합니다! Vue 컴포넌트에서 프리 프로세서를 사용하지 않는 경우 `*.vue`파일을 HTML로 인식하여 사용할 수도 있습니다.
+현재 구문강조는 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Emacs](https://github.com/AdamNiederer/vue-mode), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), 와 [JetBrains 제품](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, 등)을 지원합니다. 다른 편집기/IDE에 대한 기여를 원합니다! Vue 컴포넌트에서 프리 프로세서를 사용하지 않는 경우 `*.vue`파일을 HTML로 인식하여 사용할 수도 있습니다.
 
 
 ### 주석
diff --git a/docs/pt_BR/start/spec.md b/docs/pt_BR/start/spec.md
index b5f8d29b9..dcc563c66 100644
--- a/docs/pt_BR/start/spec.md
+++ b/docs/pt_BR/start/spec.md
@@ -103,7 +103,7 @@ As importações `src` também funcionam com blocos customizados, por exemplo:
 
 ### Realce de Sintaxe
 
-Atualmente existem realce de sintaxe \(ou [coloração de sintaxe](https://pt.wikipedia.org/wiki/Realce_de_sintaxe)\) suportado para [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), e [JetBrains products](https://plugins.jetbrains.com/plugin/8057) \(WebStorm, PhpStorm, etc\). Contribuições para outros editores/IDEs são incentivadas e muito bem-vindas! Se você não estiver usando nenhum pré-processador em componentes Vue, você também pode tratar arquivos `*.vue` como HTML em seu editor.
+Atualmente existem realce de sintaxe \(ou [coloração de sintaxe](https://pt.wikipedia.org/wiki/Realce_de_sintaxe)\) suportado para [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Emacs](https://github.com/AdamNiederer/vue-mode), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), e [JetBrains products](https://plugins.jetbrains.com/plugin/8057) \(WebStorm, PhpStorm, etc\). Contribuições para outros editores/IDEs são incentivadas e muito bem-vindas! Se você não estiver usando nenhum pré-processador em componentes Vue, você também pode tratar arquivos `*.vue` como HTML em seu editor.
 
 ### Comentários
 
diff --git a/docs/ru/start/spec.md b/docs/ru/start/spec.md
index 4353fb0f0..2fa123da1 100644
--- a/docs/ru/start/spec.md
+++ b/docs/ru/start/spec.md
@@ -104,7 +104,7 @@ export default {
 
 ### Подсветка синтаксиса
 
-На данный момент есть поддержка подсвестки синтаксиса для [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), и [продуктов JetBrains](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, и т.п.). Будем рады видеть разработки и для других редакторов и IDE! Если вы не используете никаких пре-процессоров в компонентах Vue, вы также можете использовать синтаксис HTML в вашем редакторе для `*.vue` файлов.
+На данный момент есть поддержка подсвестки синтаксиса для [Sublime Text](https://github.com/vuejs/vue-syntax-highlight), [Atom](https://atom.io/packages/language-vue), [Vim](https://github.com/posva/vim-vue), [Emacs](https://github.com/AdamNiederer/vue-mode), [Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue), [Brackets](https://github.com/pandao/brackets-vue), и [продуктов JetBrains](https://plugins.jetbrains.com/plugin/8057) (WebStorm, PhpStorm, и т.п.). Будем рады видеть разработки и для других редакторов и IDE! Если вы не используете никаких пре-процессоров в компонентах Vue, вы также можете использовать синтаксис HTML в вашем редакторе для `*.vue` файлов.
 
 ### Комментарии
 
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index ba4a47319..850afdbe1 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -105,7 +105,7 @@ export default {
 ### 语法高亮
 
 
-目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight)、[Atom](https://atom.io/packages/language-vue)、[Vim](https://github.com/posva/vim-vue)、[Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue)、[Brackets](https://github.com/pandao/brackets-vue) 和 [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm、PhpStorm 等)。非常感谢其他编辑器/IDE 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
+目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight)、[Atom](https://atom.io/packages/language-vue)、[Vim](https://github.com/posva/vim-vue)、[Emacs](https://github.com/AdamNiederer/vue-mode)、[Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue)、[Brackets](https://github.com/pandao/brackets-vue) 和 [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm、PhpStorm 等)。非常感谢其他编辑器/IDE 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
 
 ### 注释
 

From 96635ead77d9673a5419c35ce3486f10a36bf003 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 15:50:11 -0500
Subject: [PATCH 841/877] docs: note about esModule option removal

---
 docs/en/options.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/en/options.md b/docs/en/options.md
index 601e1752a..9d22db3ee 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -163,6 +163,8 @@ module.exports = {
 
 ### esModule
 
+> This option has been removed in v14.0. In v14.0 and above, `*.vue` files always expose ES modules.
+
 - type: `boolean`
 - default: `true` (v13.0+)
 

From 2c8d1fb501b4f97874031fd89a4a8beaf17cf6e9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 15:59:42 -0500
Subject: [PATCH 842/877] feat: avoid adding index to css modules in first
 <style> tag

ref #1104, close #703, close #818
---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index bcc9a4f5f..2c97ebc9c 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -242,7 +242,7 @@ module.exports = function createHelpers (
       // $2: ?a=b
       const query = loaderUtils.parseQuery($2 || '?')
       Object.assign(query, OPTIONS, option, DEFAULT_OPTIONS)
-      if (index !== -1) {
+      if (index > 0) {
         // Note:
         //   Class name is generated according to its filename.
         //   Different <style> tags in the same .vue file may generate same names.

From dddd9116a87eb90d379a3361762b80cf44aeacbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Wed, 7 Mar 2018 05:01:51 +0800
Subject: [PATCH 843/877] feat: supported cascading postcss config (#1147)

close #1063
---
 lib/style-compiler/load-postcss-config.js |  7 +++++--
 package.json                              |  1 +
 test/fixtures/sub/.postcssrc.js           |  5 +++++
 test/fixtures/sub/postcss-cascade.vue     |  3 +++
 test/test.js                              | 14 ++++++++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/sub/.postcssrc.js
 create mode 100644 test/fixtures/sub/postcss-cascade.vue

diff --git a/lib/style-compiler/load-postcss-config.js b/lib/style-compiler/load-postcss-config.js
index eae1a37cf..f7b115404 100644
--- a/lib/style-compiler/load-postcss-config.js
+++ b/lib/style-compiler/load-postcss-config.js
@@ -14,13 +14,16 @@ module.exports = function loadPostcssConfig (loaderContext, inlineConfig = {}) {
     })
   }
 
-  if (process.env.VUE_LOADER_TEST || !loaded) {
+  if (process.env.VUE_LOADER_TEST || inlineConfig.cascade || !loaded) {
     const config = inlineConfig.config || {}
     const ctx = { webpack: loaderContext }
     if (config.ctx) {
       ctx.options = config.ctx
     }
-    loaded = load(ctx, config.path, { argv: false }).catch(err => {
+    const configPath = (inlineConfig.cascade && !config.path)
+      ? loaderContext.resourcePath
+      : config.path
+    loaded = load(ctx, configPath, { argv: false }).catch(err => {
       // postcss-load-config throws error when no config file is found,
       // but for us it's optional. only emit other errors
       if (err.message.indexOf('No PostCSS Config found') >= 0) {
diff --git a/package.json b/package.json
index 73c1ae8a5..b23aaa5f2 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "vue-template-compiler": "^2.0.0"
   },
   "devDependencies": {
+    "autoprefixer": "^7.2.5",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.0.0",
     "babel-preset-env": "^1.6.0",
diff --git a/test/fixtures/sub/.postcssrc.js b/test/fixtures/sub/.postcssrc.js
new file mode 100644
index 000000000..961986e2b
--- /dev/null
+++ b/test/fixtures/sub/.postcssrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  plugins: {
+    autoprefixer: {}
+  }
+}
diff --git a/test/fixtures/sub/postcss-cascade.vue b/test/fixtures/sub/postcss-cascade.vue
new file mode 100644
index 000000000..82fdf388f
--- /dev/null
+++ b/test/fixtures/sub/postcss-cascade.vue
@@ -0,0 +1,3 @@
+<style>
+body { display: flex }
+</style>
diff --git a/test/test.js b/test/test.js
index fe9ca5216..984dfafe3 100644
--- a/test/test.js
+++ b/test/test.js
@@ -488,6 +488,20 @@ describe('vue-loader', () => {
     })
   })
 
+  it('load cascading postcss config file', done => {
+    fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
+    test({
+      entry: 'sub/postcss-cascade.vue',
+      vue: { postcss: { cascade: true }}
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('display: -webkit-box')
+      fs.unlinkSync('.postcssrc')
+      done()
+    })
+  })
+
   it('load postcss config file by path', done => {
     fs.writeFileSync('test/.postcssrc', JSON.stringify({ parser: 'sugarss' }))
     test({

From dfb60e035b7c750c620e62e52bbf8b3bed412c3e Mon Sep 17 00:00:00 2001
From: tomwang <174604588@qq.com>
Date: Wed, 7 Mar 2018 05:17:25 +0800
Subject: [PATCH 844/877] docs: update asset-url.md (#1174)

---
 docs/en/configurations/asset-url.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/configurations/asset-url.md b/docs/en/configurations/asset-url.md
index 5f9b1809b..cfded6aa1 100644
--- a/docs/en/configurations/asset-url.md
+++ b/docs/en/configurations/asset-url.md
@@ -23,7 +23,7 @@ createElement('img', { attrs: { src: require('../image.png') }})
 - If the URL starts with `~`, anything after it is interpreted as a module request. This means you can even reference assets inside node modules:
 
   ``` html
-  <img src="~/some-npm-package/foo.png">
+  <img src="~some-npm-package/foo.png">
   ```
 
 - (13.7.0+) If the URL starts with `@`, it's also interpreted as a module request. This is useful if your webpack config has an alias for `@`, which by default points to `/src` in any project created by `vue-cli`.

From ba83acf48e0390e5eb052d8739e46af7f38c12a6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 16:20:45 -0500
Subject: [PATCH 845/877] chore: ignore logs

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e45d3c71e..b801020d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ docs/_book
 .DS_Store
 .idea
 *.iml
+*.log

From 88e93ec077cd4e2f15a35272ec42aee0ffee8360 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 16:20:50 -0500
Subject: [PATCH 846/877] test: fix css modules test

---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 984dfafe3..fa1236296 100644
--- a/test/test.js
+++ b/test/test.js
@@ -618,7 +618,7 @@ describe('vue-loader', () => {
       })
     }
     // default localIdentName
-    testWithIdent(undefined, /^\w{23}/, () => {
+    testWithIdent(undefined, /^\w{22}/, () => {
       // specified localIdentName
       const ident = '[path][name]---[local]---[hash:base64:5]'
       const regex = /css-modules---red---\w{5}/

From 65de872e79748020982af704af97b3474075f8af Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 16:32:39 -0500
Subject: [PATCH 847/877] workflow: auto generate release note

---
 .gitignore   |   1 +
 package.json |   4 +-
 yarn.lock    | 603 +++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 589 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index b801020d2..a7d34f090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ docs/_book
 .idea
 *.iml
 *.log
+RELEASE.md
diff --git a/package.json b/package.json
index b23aaa5f2..d739a3089 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,8 @@
     "lint": "eslint lib test --fix",
     "test": "eslint lib && mocha --slow 5000 --timeout 10000",
     "docs": "cd docs && gitbook install && gitbook serve",
-    "docs:deploy": "bash ./docs/deploy.sh"
+    "docs:deploy": "bash ./docs/deploy.sh",
+    "postpublish": "conventional-changelog -p angular -r 2 > RELEASE.md"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"
@@ -68,6 +69,7 @@
     "chai": "^4.1.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.12.7",
+    "conventional-changelog": "^1.1.18",
     "css-loader": "^0.28.4",
     "eslint": "^3.19.0",
     "eslint-plugin-vue-libs": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 515ec62a4..5ac9be957 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+JSONStream@^1.0.4:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abab@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -102,6 +109,12 @@ ansi-styles@^3.1.0, ansi-styles@^3.2.0:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -144,6 +157,14 @@ array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
 
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
+array-ify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -158,7 +179,7 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
-arrify@^1.0.0:
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
@@ -200,6 +221,10 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
 async@^2.1.2, async@^2.4.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
@@ -221,6 +246,17 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
+autoprefixer@^7.2.5:
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
+  dependencies:
+    browserslist "^2.11.3"
+    caniuse-lite "^1.0.30000805"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.17"
+    postcss-value-parser "^3.2.3"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -839,7 +875,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.1.2:
+browserslist@^2.1.2, browserslist@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
   dependencies:
@@ -876,10 +912,29 @@ callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
 
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase-keys@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  dependencies:
+    camelcase "^4.1.0"
+    map-obj "^2.0.0"
+    quick-lru "^1.0.0"
+
 camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -901,6 +956,10 @@ caniuse-lite@^1.0.30000792:
   version "1.0.30000792"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
 
+caniuse-lite@^1.0.30000805:
+  version "1.0.30000813"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000813.tgz#7b25e27fdfb8d133f3c932b01f77452140fcc6c9"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -941,6 +1000,14 @@ chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 character-parser@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
@@ -1119,6 +1186,13 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
+compare-func@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  dependencies:
+    array-ify "^1.0.0"
+    dot-prop "^3.0.0"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1162,6 +1236,134 @@ content-type-parser@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
 
+conventional-changelog-angular@^1.6.6:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-atom@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz#4917759947f4db86073f9d3838a2d54302d5843d"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-codemirror@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz#debc43991d487d7964e65087fbbe034044bd51fb"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-core@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz#45b6347c4c6512e1f163f7ff55c9f5bcb88fd990"
+  dependencies:
+    conventional-changelog-writer "^3.0.4"
+    conventional-commits-parser "^2.1.5"
+    dateformat "^3.0.0"
+    get-pkg-repo "^1.0.0"
+    git-raw-commits "^1.3.4"
+    git-remote-origin-url "^2.0.0"
+    git-semver-tags "^1.3.4"
+    lodash "^4.2.1"
+    normalize-package-data "^2.3.5"
+    q "^1.5.1"
+    read-pkg "^1.1.0"
+    read-pkg-up "^1.0.1"
+    through2 "^2.0.0"
+
+conventional-changelog-ember@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz#f3825d7434168f3d9211b5532dc1d5769532b668"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-eslint@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz#8bae05ebbf574e6506caf7b37dc51ca21b74d220"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-express@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz#812a9cf778677e12f978ac9c40d85297c0bfcca9"
+  dependencies:
+    q "^1.5.1"
+
+conventional-changelog-jquery@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jscs@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+  dependencies:
+    q "^1.4.1"
+
+conventional-changelog-jshint@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz#b2de33cd0870d9af804ac6a4fded0ee25b69c9bb"
+  dependencies:
+    compare-func "^1.3.1"
+    q "^1.5.1"
+
+conventional-changelog-preset-loader@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz#b29af6332f9313857be36427623c9016bfeeaf33"
+
+conventional-changelog-writer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz#705b46a8b8277bd7fd79cad8032095b5d803864c"
+  dependencies:
+    compare-func "^1.3.1"
+    conventional-commits-filter "^1.1.5"
+    dateformat "^3.0.0"
+    handlebars "^4.0.2"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    semver "^5.5.0"
+    split "^1.0.0"
+    through2 "^2.0.0"
+
+conventional-changelog@^1.1.18:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.18.tgz#ffe28798e4ddef5f6e2f74398e8248bcb233360b"
+  dependencies:
+    conventional-changelog-angular "^1.6.6"
+    conventional-changelog-atom "^0.2.4"
+    conventional-changelog-codemirror "^0.3.4"
+    conventional-changelog-core "^2.0.5"
+    conventional-changelog-ember "^0.3.6"
+    conventional-changelog-eslint "^1.0.5"
+    conventional-changelog-express "^0.3.4"
+    conventional-changelog-jquery "^0.1.0"
+    conventional-changelog-jscs "^0.1.0"
+    conventional-changelog-jshint "^0.3.4"
+    conventional-changelog-preset-loader "^1.1.6"
+
+conventional-commits-filter@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65"
+  dependencies:
+    is-subset "^0.1.1"
+    modify-values "^1.0.0"
+
+conventional-commits-parser@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0"
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.0"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+    trim-off-newlines "^1.0.0"
+
 convert-source-map@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -1355,12 +1557,24 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  dependencies:
+    array-find-index "^1.0.1"
+
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
   dependencies:
     es5-ext "^0.10.9"
 
+dargs@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  dependencies:
+    number-is-nan "^1.0.0"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -1375,6 +1589,10 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
+dateformat@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -1391,7 +1609,14 @@ debug@^2.1.1, debug@^2.2.0, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize-keys@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -1504,6 +1729,12 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+dot-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  dependencies:
+    is-obj "^1.0.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -1553,7 +1784,7 @@ errno@^0.1.3:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -1871,6 +2102,13 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -1987,6 +2225,20 @@ get-own-enumerable-property-symbols@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b"
 
+get-pkg-repo@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    meow "^3.3.0"
+    normalize-package-data "^2.3.0"
+    parse-github-repo-url "^1.3.0"
+    through2 "^2.0.0"
+
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -1997,6 +2249,30 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+git-raw-commits@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001"
+  dependencies:
+    dargs "^4.0.1"
+    lodash.template "^4.0.2"
+    meow "^4.0.0"
+    split2 "^2.0.0"
+    through2 "^2.0.0"
+
+git-remote-origin-url@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  dependencies:
+    gitconfiglocal "^1.0.0"
+    pify "^2.3.0"
+
+git-semver-tags@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92"
+  dependencies:
+    meow "^4.0.0"
+    semver "^5.5.0"
+
 gitbook-plugin-edit-link@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/gitbook-plugin-edit-link/-/gitbook-plugin-edit-link-2.0.2.tgz#d8fcd927eced81e7a662a72d59db609eafd7e72f"
@@ -2009,6 +2285,12 @@ gitbook-plugin-theme-vuejs@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/gitbook-plugin-theme-vuejs/-/gitbook-plugin-theme-vuejs-1.1.0.tgz#dc779c8e58113440a55755c2470fc3912948a9cc"
 
+gitconfiglocal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  dependencies:
+    ini "^1.3.2"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -2071,6 +2353,16 @@ growl@1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
 
+handlebars@^4.0.2:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  optionalDependencies:
+    uglify-js "^2.6"
+
 har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
@@ -2107,6 +2399,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -2290,7 +2586,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@~1.3.0:
+ini@^1.3.2, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
@@ -2445,7 +2741,7 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-obj@^1.0.1:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
@@ -2465,7 +2761,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
@@ -2503,16 +2799,30 @@ is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-subset@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
   dependencies:
     html-comment-regex "^1.1.0"
 
+is-text-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  dependencies:
+    text-extensions "^1.0.0"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -2610,6 +2920,10 @@ json-loader@^0.5.4:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
+json-parse-better-errors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -2624,7 +2938,7 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@~5.0.1:
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
@@ -2636,6 +2950,10 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -2756,6 +3074,16 @@ listr@^0.12.0:
     stream-to-observable "^0.1.0"
     strip-ansi "^3.0.1"
 
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -2765,6 +3093,15 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
@@ -2800,7 +3137,7 @@ lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
-lodash.template@^4.4.0:
+lodash.template@^4.0.2, lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
   dependencies:
@@ -2821,6 +3158,10 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.2.1:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -2850,6 +3191,13 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
@@ -2867,6 +3215,14 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
+map-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+
 marked@^0.3.12:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.12.tgz#7cf25ff2252632f3fe2406bde258e94eee927519"
@@ -2895,6 +3251,35 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+meow@^3.3.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
+meow@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d"
+  dependencies:
+    camelcase-keys "^4.0.0"
+    decamelize-keys "^1.0.0"
+    loud-rejection "^1.0.0"
+    minimist "^1.1.3"
+    minimist-options "^3.0.1"
+    normalize-package-data "^2.3.4"
+    read-pkg-up "^3.0.0"
+    redent "^2.0.0"
+    trim-newlines "^2.0.0"
+
 micromatch@^2.1.5:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -2952,14 +3337,25 @@ minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimist-options@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@^1.2.0:
+minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -2981,6 +3377,10 @@ mocha@^4.0.1:
     mkdirp "0.5.1"
     supports-color "4.4.0"
 
+modify-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -3052,7 +3452,7 @@ normalize-newline@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-newline/-/normalize-newline-3.0.0.tgz#1cbea804aba436001f83938ab21ec039d69ae9d3"
 
-normalize-package-data@^2.3.2:
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -3154,6 +3554,13 @@ onetime@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
 
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -3239,6 +3646,10 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-github-repo-url@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -3254,6 +3665,13 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
 parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
@@ -3262,6 +3680,12 @@ path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -3282,12 +3706,26 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
 pathval@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -3310,7 +3748,7 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
-pify@^2.0.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -3607,6 +4045,14 @@ postcss@^6.0.1, postcss@^6.0.14, postcss@^6.0.8:
     source-map "^0.6.1"
     supports-color "^5.1.0"
 
+postcss@^6.0.17:
+  version "6.0.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
+  dependencies:
+    chalk "^2.3.1"
+    source-map "^0.6.1"
+    supports-color "^5.2.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -3638,6 +4084,10 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -3771,7 +4221,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-q@^1.1.2:
+q@^1.1.2, q@^1.4.1, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -3798,6 +4248,10 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
+quick-lru@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -3831,6 +4285,13 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
@@ -3838,6 +4299,21 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
+read-pkg@^1.0.0, read-pkg@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -3846,6 +4322,14 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
@@ -3858,6 +4342,18 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@^2.1.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -3881,6 +4377,20 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
+redent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  dependencies:
+    indent-string "^3.0.0"
+    strip-indent "^2.0.0"
+
 reduce-css-calc@^1.2.6:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
@@ -4104,7 +4614,7 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -4201,7 +4711,7 @@ source-map@0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.4.x:
+source-map@0.4.x, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
@@ -4233,6 +4743,18 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
+split2@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  dependencies:
+    through2 "^2.0.2"
+
+split@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  dependencies:
+    through "2"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -4325,6 +4847,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -4333,6 +4861,12 @@ strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  dependencies:
+    get-stdin "^4.0.1"
+
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
@@ -4394,6 +4928,12 @@ supports-color@^5.1.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.2.0, supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  dependencies:
+    has-flag "^3.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -4450,11 +4990,22 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+text-extensions@^1.0.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
+
 text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through@^2.3.6:
+through2@^2.0.0, through2@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+through@2, "through@>=2.2.7 <3", through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -4486,6 +5037,18 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
+trim-newlines@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+
+trim-off-newlines@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@@ -4518,7 +5081,7 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@^2.6.1, uglify-js@^2.8.29:
+uglify-js@^2.6, uglify-js@^2.6.1, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -4768,6 +5331,10 @@ wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -4793,7 +5360,7 @@ xml-name-validator@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 
-xtend@^4.0.0:
+xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 

From 4b6c843e4a7ef4dd8957b2cfedb9e6ee3a5767e8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 22:20:54 -0500
Subject: [PATCH 848/877] chore: remove this.cacheable calls as it is true by
 default

---
 lib/loader.js                         | 2 --
 lib/style-compiler/index.js           | 1 -
 lib/template-compiler/index.js        | 1 -
 lib/template-compiler/preprocessor.js | 1 -
 4 files changed, 5 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 1cd2446e4..42ec97d1e 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -8,8 +8,6 @@ const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 const componentNormalizerPath = normalize.lib('runtime/component-normalizer')
 
 module.exports = function (content) {
-  this.cacheable()
-
   let output = ''
 
   const loaderContext = this
diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index 8cc3e5a42..681473b28 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -6,7 +6,6 @@ const trim = require('./plugins/trim')
 const scopeId = require('./plugins/scope-id')
 
 module.exports = function (css, map) {
-  this.cacheable()
   const cb = this.async()
   const loaderOptions = loaderUtils.getOptions(this) || {}
   const inlineConfig = (this._compilation.__vueOptions__ || {}).postcss
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 7b60c70af..0fdf6ea79 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -8,7 +8,6 @@ const transformRequire = require('./modules/transform-require')
 const transformSrcset = require('./modules/transform-srcset')
 
 module.exports = function (html) {
-  this.cacheable()
   const isServer = this.target === 'node'
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
   const vueOptions = this._compilation.__vueOptions__ || {}
diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index 0ca6a4eaf..586f31411 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -4,7 +4,6 @@ const cons = require('consolidate')
 const loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
-  this.cacheable && this.cacheable()
   const callback = this.async()
   const opt = loaderUtils.getOptions(this) || {}
 

From 905b8131af2c47910d64f0cbf83946837f06ec8d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 6 Mar 2018 23:55:24 -0500
Subject: [PATCH 849/877] refactor: options cache without using
 this._compilation

---
 lib/helpers.js                        |  9 +++-
 lib/loader.js                         | 12 ++---
 lib/selector.js                       |  1 -
 lib/style-compiler/index.js           |  3 +-
 lib/template-compiler/index.js        |  3 +-
 lib/template-compiler/preprocessor.js |  6 ++-
 lib/utils/options-cache.js            | 77 +++++++++++++++++++++++++++
 7 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 lib/utils/options-cache.js

diff --git a/lib/helpers.js b/lib/helpers.js
index 2c97ebc9c..dba93e06b 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -67,6 +67,7 @@ function ensureBang (loader) {
 }
 
 function resolveLoaders (
+  optionsId,
   options,
   moduleId,
   isProduction,
@@ -97,6 +98,7 @@ function resolveLoaders (
       id: moduleId,
       hasScoped,
       hasComment,
+      optionsId,
       buble: bubleTemplateOptions
     })
 
@@ -142,6 +144,7 @@ function resolveLoaders (
 }
 
 module.exports = function createHelpers (
+  optionsId,
   loaderContext,
   options,
   moduleId,
@@ -161,6 +164,7 @@ module.exports = function createHelpers (
     preLoaders,
     postLoaders
   } = resolveLoaders(
+    optionsId,
     options,
     moduleId,
     isProduction,
@@ -304,6 +308,7 @@ module.exports = function createHelpers (
         '?' +
         JSON.stringify({
           // a marker for vue-style-loader to know that this is an import from a vue file
+          optionsId,
           vue: true,
           id: moduleId,
           scoped: !!scoped,
@@ -359,8 +364,8 @@ module.exports = function createHelpers (
             defaultLoaders.html +
             '!' +
             templatePreprocessorPath +
-            '?engine=' +
-            lang +
+            `?engine=${lang}` +
+            `&optionsId=${optionsId}` +
             '!'
           )
         case 'styles':
diff --git a/lib/loader.js b/lib/loader.js
index 42ec97d1e..0c29efaf8 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -4,6 +4,7 @@ const parse = require('./parser')
 const createHelpers = require('./helpers')
 const loaderUtils = require('loader-utils')
 const normalize = require('./utils/normalize')
+const { saveOptions } = require('./utils/options-cache')
 const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 const componentNormalizerPath = normalize.lib('runtime/component-normalizer')
 
@@ -19,12 +20,10 @@ module.exports = function (content) {
   // enabled via vue-cli's --target web-component
   const isShadowMode = !!options.shadowMode
 
-  // share options between the main loader of style/template loaders
-  Object.defineProperty(this._compilation, '__vueOptions__', {
-    value: options,
-    enumerable: false,
-    configurable: true
-  })
+  // share options between the main loader of style/template loaders.
+  // to support having multiple uses of vue-loader with different options,
+  // we cache and retrieve options for each unique options object.
+  const optionsId = saveOptions(options)
 
   const filePath = this.resourcePath
   const fileName = path.basename(filePath)
@@ -68,6 +67,7 @@ module.exports = function (content) {
     getRequestString,
     getSrcRequestString
   } = createHelpers(
+    optionsId,
     loaderContext,
     options,
     moduleId,
diff --git a/lib/selector.js b/lib/selector.js
index e344d42e8..d528510a6 100644
--- a/lib/selector.js
+++ b/lib/selector.js
@@ -7,7 +7,6 @@ const parse = require('./parser')
 const loaderUtils = require('loader-utils')
 
 module.exports = function (content) {
-  this.cacheable()
   const query = loaderUtils.getOptions(this) || {}
   const context = (this._compiler && this._compiler.context) || this.options.context || process.cwd()
   let filename = path.basename(this.resourcePath)
diff --git a/lib/style-compiler/index.js b/lib/style-compiler/index.js
index 681473b28..a089184a2 100644
--- a/lib/style-compiler/index.js
+++ b/lib/style-compiler/index.js
@@ -1,5 +1,6 @@
 const postcss = require('postcss')
 const loaderUtils = require('loader-utils')
+const { loadOptions } = require('../utils/options-cache')
 const loadPostcssConfig = require('./load-postcss-config')
 
 const trim = require('./plugins/trim')
@@ -8,7 +9,7 @@ const scopeId = require('./plugins/scope-id')
 module.exports = function (css, map) {
   const cb = this.async()
   const loaderOptions = loaderUtils.getOptions(this) || {}
-  const inlineConfig = (this._compilation.__vueOptions__ || {}).postcss
+  const inlineConfig = loadOptions(loaderOptions.optionsId).postcss
 
   loadPostcssConfig(this, inlineConfig)
     .then(config => {
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 0fdf6ea79..973ea5b4b 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -2,6 +2,7 @@ const prettier = require('prettier')
 const loaderUtils = require('loader-utils')
 const normalize = require('../utils/normalize')
 const compiler = require('vue-template-compiler')
+const { loadOptions } = require('../utils/options-cache')
 const transpile = require('vue-template-es2015-compiler')
 const hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 const transformRequire = require('./modules/transform-require')
@@ -10,8 +11,8 @@ const transformSrcset = require('./modules/transform-srcset')
 module.exports = function (html) {
   const isServer = this.target === 'node'
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  const vueOptions = this._compilation.__vueOptions__ || {}
   const options = loaderUtils.getOptions(this) || {}
+  const vueOptions = loadOptions(options.optionsId)
   const needsHotReload = !isServer && !isProduction && vueOptions.hotReload !== false
   const defaultModules = [transformRequire(vueOptions.transformToRequire), transformSrcset()]
 
diff --git a/lib/template-compiler/preprocessor.js b/lib/template-compiler/preprocessor.js
index 586f31411..8b12de85d 100644
--- a/lib/template-compiler/preprocessor.js
+++ b/lib/template-compiler/preprocessor.js
@@ -2,6 +2,7 @@
 
 const cons = require('consolidate')
 const loaderUtils = require('loader-utils')
+const { loadOptions } = require('../utils/options-cache')
 
 module.exports = function (content) {
   const callback = this.async()
@@ -19,8 +20,9 @@ module.exports = function (content) {
   }
 
   // allow passing options to the template preprocessor via `template` option
-  if (this._compilation.__vueOptions__) {
-    Object.assign(opt, this._compilation.__vueOptions__.template)
+  const vueOptions = loadOptions(opt.optionsId)
+  if (vueOptions.template) {
+    Object.assign(opt, vueOptions.template)
   }
 
   // for relative includes
diff --git a/lib/utils/options-cache.js b/lib/utils/options-cache.js
new file mode 100644
index 000000000..7532d07cd
--- /dev/null
+++ b/lib/utils/options-cache.js
@@ -0,0 +1,77 @@
+/*
+Inter-loader Option idToOptions
+
+Vue-loader works by delegating language blocks to sub-loaders.
+The main loader needs to share its options object with the sub-loaders.
+Technically we should pass everything the sub loaders need via their own
+options, however there are two problems with this approach:
+
+1. Some options (e.g. postcss, compilerModules) may contain non-serializable
+   values and cannot be passed via inline requests
+2. Passing everything via inline requests makes the module string extremely
+   verbose, and can be quite annoying in error messages.
+
+To get around this, we cache the options in this module here in order to share
+it between loaders.
+
+- In order to support multiple uses of vue-loader with different options,
+each options object is cached with an id.
+- To share options across threads in threadMode, options are serialized and
+cached on disk.
+*/
+
+const fs = require('fs')
+const path = require('path')
+const hash = require('hash-sum')
+
+const optionsToId = new Map()
+const idToOptions = new Map()
+
+exports.saveOptions = options => {
+  if (optionsToId.has(options)) {
+    return optionsToId.get(options)
+  }
+
+  const threadMode = options.threadMode
+  const serialized = threadMode ? serialize(options) : null
+  const id = serialized ? hash(serialized) : String(idToOptions.size)
+
+  idToOptions.set(id, options)
+  optionsToId.set(options, id)
+
+  if (serialized) {
+    const fsidToOptionsPath = getidToOptionsPath(id)
+    if (!fs.existsSync(fsidToOptionsPath)) {
+      fs.writeFileSync(fsidToOptionsPath, serialized)
+    }
+  }
+
+  return id
+}
+
+exports.loadOptions = id => {
+  const res = idToOptions.get(id)
+  if (res) {
+    return res
+  }
+  const fsidToOptionsPath = getidToOptionsPath(id)
+  if (fs.existsSync(fsidToOptionsPath)) {
+    return JSON.parse(fs.readFileSync(fsidToOptionsPath, 'utf-8'))
+  } else {
+    return {}
+  }
+}
+
+function serialize (options) {
+  let res
+  try {
+    res = JSON.stringify(options)
+  } catch (e) {
+    throw new Error(`options must be JSON serializable in thread mode.`)
+  }
+  return res
+}
+
+function getidToOptionsPath (id) {
+  return path.resolve(__dirname, `.options-idToOptions-${id}`)
+}

From 078fa1c2cc556d4c0f40fac1ca9cbcaf93f5c4b3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 00:06:53 -0500
Subject: [PATCH 850/877] test: add test case for multiple rule uses (ref
 #1131)

---
 test/fixtures/multiple-rules-1.vue |  9 ++++
 test/fixtures/multiple-rules-2.vue |  9 ++++
 test/fixtures/multiple-rules.js    |  4 ++
 test/test.js                       | 69 ++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 test/fixtures/multiple-rules-1.vue
 create mode 100644 test/fixtures/multiple-rules-2.vue
 create mode 100644 test/fixtures/multiple-rules.js

diff --git a/test/fixtures/multiple-rules-1.vue b/test/fixtures/multiple-rules-1.vue
new file mode 100644
index 000000000..858b3eb1e
--- /dev/null
+++ b/test/fixtures/multiple-rules-1.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="multiple-rule">Hello World</div>
+</template>
+
+<style>
+.multiple-rule-1 {
+  font-size: 7px;
+}
+</style>
diff --git a/test/fixtures/multiple-rules-2.vue b/test/fixtures/multiple-rules-2.vue
new file mode 100644
index 000000000..97d226939
--- /dev/null
+++ b/test/fixtures/multiple-rules-2.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="multiple-rule">Hello World</div>
+</template>
+
+<style>
+.multiple-rule-2 {
+  font-size: 28px;
+}
+</style>
diff --git a/test/fixtures/multiple-rules.js b/test/fixtures/multiple-rules.js
new file mode 100644
index 000000000..fa741e723
--- /dev/null
+++ b/test/fixtures/multiple-rules.js
@@ -0,0 +1,4 @@
+import Rule1 from './multiple-rules-1.vue'
+import Rule2 from './multiple-rules-2.vue'
+
+window.rules = [Rule1, Rule2]
diff --git a/test/test.js b/test/test.js
index fa1236296..c58bff45e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1035,4 +1035,73 @@ describe('vue-loader', () => {
       done()
     })
   })
+
+  it('multiple rule definitions', done => {
+    test({
+      modify: config => {
+        // remove default rule
+        config.module.rules.shift()
+      },
+      entry: './test/fixtures/multiple-rules.js',
+      module: {
+        rules: [
+          {
+            test: /\.vue$/,
+            oneOf: [
+              {
+                include: /-1\.vue$/,
+                loader: loaderPath,
+                options: {
+                  postcss: [
+                    css => {
+                      css.walkDecls('font-size', decl => {
+                        decl.value = `${parseInt(decl.value, 10) * 2}px`
+                      })
+                    }
+                  ],
+                  compilerModules: [{
+                    postTransformNode: el => {
+                      el.staticClass = '"multiple-rule-1"'
+                    }
+                  }]
+                }
+              },
+              {
+                include: /-2\.vue$/,
+                loader: loaderPath,
+                options: {
+                  postcss: [
+                    css => {
+                      css.walkDecls('font-size', decl => {
+                        decl.value = `${parseInt(decl.value, 10) / 2}px`
+                      })
+                    }
+                  ],
+                  compilerModules: [{
+                    postTransformNode: el => {
+                      el.staticClass = '"multiple-rule-2"'
+                    }
+                  }]
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }, (window, module) => {
+      const vnode1 = mockRender(window.rules[0])
+      const vnode2 = mockRender(window.rules[1])
+      expect(vnode1.data.staticClass).to.equal('multiple-rule-1')
+      expect(vnode2.data.staticClass).to.equal('multiple-rule-2')
+      const styles = window.document.querySelectorAll('style')
+      const expr = /\.multiple-rule-\d\s*\{\s*font-size:\s*([.0-9]+)px;/
+      for (let i = 0, l = styles.length; i < l; i++) {
+        const content = styles[i].textContent
+        if (expr.test(content)) {
+          expect(parseFloat(RegExp.$1)).to.be.equal(14)
+        }
+      }
+      done()
+    })
+  })
 })

From 8ef70c1dcde6670171b44a2778a201ff909f9eae Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 00:14:39 -0500
Subject: [PATCH 851/877] test: add test for thread mode

---
 .gitignore                 |  1 +
 lib/utils/options-cache.js |  2 +-
 test/test.js               | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a7d34f090..e8ea33d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ docs/_book
 *.iml
 *.log
 RELEASE.md
+.options-cache-*
diff --git a/lib/utils/options-cache.js b/lib/utils/options-cache.js
index 7532d07cd..ccc9999f6 100644
--- a/lib/utils/options-cache.js
+++ b/lib/utils/options-cache.js
@@ -73,5 +73,5 @@ function serialize (options) {
 }
 
 function getidToOptionsPath (id) {
-  return path.resolve(__dirname, `.options-idToOptions-${id}`)
+  return path.resolve(__dirname, `.options-cache-${id}`)
 }
diff --git a/test/test.js b/test/test.js
index c58bff45e..eaa64b391 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1104,4 +1104,28 @@ describe('vue-loader', () => {
       done()
     })
   })
+
+  it('thread mode', done => {
+    test({
+      entry: 'basic.vue',
+      vue: {
+        threadMode: true
+      }
+    }, (window, module, rawModule) => {
+      const vnode = mockRender(module, {
+        msg: 'hi'
+      })
+
+      // <h2 class="red">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('red')
+      expect(vnode.children[0].text).to.equal('hi')
+
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
+      done()
+    })
+  })
 })

From 084bf3d8fb08e15e56bbf8c2b4b545963b86d38b Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 00:21:05 -0500
Subject: [PATCH 852/877] feat: use more sensible default localIdentName for
 css modules

---
 lib/helpers.js | 2 +-
 test/test.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index dba93e06b..2367acea7 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -238,7 +238,7 @@ module.exports = function createHelpers (
       modules: true
     }
     const OPTIONS = {
-      localIdentName: '[hash:base64]',
+      localIdentName: '[local]_[hash:base64:8]',
       importLoaders: 1
     }
     return loader.replace(/((?:^|!)css(?:-loader)?)(\?[^!]*)?/, (m, $1, $2) => {
diff --git a/test/test.js b/test/test.js
index eaa64b391..377c3b0c9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -618,7 +618,7 @@ describe('vue-loader', () => {
       })
     }
     // default localIdentName
-    testWithIdent(undefined, /^\w{22}/, () => {
+    testWithIdent(undefined, /^red_\w{8}/, () => {
       // specified localIdentName
       const ident = '[path][name]---[local]---[hash:base64:5]'
       const regex = /css-modules---red---\w{5}/

From 1b554b6d2d4b201c3001543928dc834ee790987a Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 00:25:31 -0500
Subject: [PATCH 853/877] chore: fix comment

---
 lib/utils/options-cache.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/options-cache.js b/lib/utils/options-cache.js
index ccc9999f6..07de4b9eb 100644
--- a/lib/utils/options-cache.js
+++ b/lib/utils/options-cache.js
@@ -1,5 +1,5 @@
 /*
-Inter-loader Option idToOptions
+Inter-loader Option Cache
 
 Vue-loader works by delegating language blocks to sub-loaders.
 The main loader needs to share its options object with the sub-loaders.

From 0b36a2c13abc290abb5189f60ea8aff5c84a373e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Wed, 7 Mar 2018 13:48:41 +0800
Subject: [PATCH 854/877] fix: removed module id for non-scoped component
 (#1146)

* removed module id for non-scoped component (close #853)

* improved test case for style import twice

* Update helpers.js
---
 lib/helpers.js                           |  4 ++--
 test/fixtures/style-import-twice-sub.vue |  3 +++
 test/fixtures/style-import-twice.vue     |  9 +++++++
 test/test.js                             | 30 ++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/style-import-twice-sub.vue
 create mode 100644 test/fixtures/style-import-twice.vue

diff --git a/lib/helpers.js b/lib/helpers.js
index 2367acea7..0a8d08bb3 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -95,7 +95,7 @@ function resolveLoaders (
   const templateCompilerOptions =
     '?' +
     JSON.stringify({
-      id: moduleId,
+      id: hasScoped ? moduleId : undefined,
       hasScoped,
       hasComment,
       optionsId,
@@ -310,7 +310,7 @@ module.exports = function createHelpers (
           // a marker for vue-style-loader to know that this is an import from a vue file
           optionsId,
           vue: true,
-          id: moduleId,
+          id: scoped ? moduleId : undefined,
           scoped: !!scoped,
           sourceMap: needCssSourceMap
         }) +
diff --git a/test/fixtures/style-import-twice-sub.vue b/test/fixtures/style-import-twice-sub.vue
new file mode 100644
index 000000000..6ae3d7173
--- /dev/null
+++ b/test/fixtures/style-import-twice-sub.vue
@@ -0,0 +1,3 @@
+<template><div></div></template>
+<style src="./style-import.css"></style>
+<style src="./style-import-scoped.css" scoped></style>
diff --git a/test/fixtures/style-import-twice.vue b/test/fixtures/style-import-twice.vue
new file mode 100644
index 000000000..1459b47e0
--- /dev/null
+++ b/test/fixtures/style-import-twice.vue
@@ -0,0 +1,9 @@
+<template><SubComponent></SubComponent></template>
+<style src="./style-import.css"></style>
+<style src="./style-import-scoped.css" scoped></style>
+<script>
+import SubComponent from './style-import-twice-sub.vue'
+export default {
+  components: { SubComponent }
+}
+</script>
diff --git a/test/test.js b/test/test.js
index 377c3b0c9..aff24e89d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -121,6 +121,19 @@ function interopDefault (module) {
     : module
 }
 
+function initStylesForAllSubComponents (module) {
+  if (module.components) {
+    for (const name in module.components) {
+      const sub = module.components[name]
+      const instance = {}
+      if (sub && sub.beforeCreate) {
+        sub.beforeCreate.forEach(hook => hook.call(instance))
+      }
+      initStylesForAllSubComponents(sub)
+    }
+  }
+}
+
 describe('vue-loader', () => {
   it('basic', done => {
     test({
@@ -256,6 +269,23 @@ describe('vue-loader', () => {
     })
   })
 
+  it('style import for a same file twice', done => {
+    test({
+      entry: 'style-import-twice.vue'
+    }, (window, module) => {
+      initStylesForAllSubComponents(module)
+      const styles = window.document.querySelectorAll('style')
+      expect(styles.length).to.equal(3)
+      expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
+      // import with scoped
+      const id = 'data-v-' + genId('style-import-twice.vue')
+      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
+      const id2 = 'data-v-' + genId('style-import-twice-sub.vue')
+      expect(styles[2].textContent).to.contain('h1[' + id2 + '] { color: green;\n}')
+      done()
+    })
+  })
+
   it('template import', done => {
     test({
       entry: 'template-import.vue'

From fc83157ac9ec80bff9498a25e2473c6cbdbad35c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 00:49:12 -0500
Subject: [PATCH 855/877] test: fix test for duplication style injection

---
 lib/loader.js              | 13 ++++++++-----
 lib/utils/options-cache.js |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/loader.js b/lib/loader.js
index 0c29efaf8..96a2b793f 100644
--- a/lib/loader.js
+++ b/lib/loader.js
@@ -14,16 +14,19 @@ module.exports = function (content) {
   const loaderContext = this
   const isServer = this.target === 'node'
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
-  const options = loaderUtils.getOptions(this) || {}
 
-  // shadow mode is an internal option
-  // enabled via vue-cli's --target web-component
-  const isShadowMode = !!options.shadowMode
+  const rawOptions = loaderUtils.getOptions(this)
 
   // share options between the main loader of style/template loaders.
   // to support having multiple uses of vue-loader with different options,
   // we cache and retrieve options for each unique options object.
-  const optionsId = saveOptions(options)
+  const optionsId = saveOptions(rawOptions)
+
+  const options = rawOptions || {}
+
+  // shadow mode is an internal option
+  // enabled via vue-cli's --target web-component
+  const isShadowMode = !!options.shadowMode
 
   const filePath = this.resourcePath
   const fileName = path.basename(filePath)
diff --git a/lib/utils/options-cache.js b/lib/utils/options-cache.js
index 07de4b9eb..b1fd200cb 100644
--- a/lib/utils/options-cache.js
+++ b/lib/utils/options-cache.js
@@ -32,14 +32,14 @@ exports.saveOptions = options => {
     return optionsToId.get(options)
   }
 
-  const threadMode = options.threadMode
+  const threadMode = options && options.threadMode
   const serialized = threadMode ? serialize(options) : null
   const id = serialized ? hash(serialized) : String(idToOptions.size)
 
-  idToOptions.set(id, options)
+  idToOptions.set(id, options || {})
   optionsToId.set(options, id)
 
-  if (serialized) {
+  if (options && serialized) {
     const fsidToOptionsPath = getidToOptionsPath(id)
     if (!fs.existsSync(fsidToOptionsPath)) {
       fs.writeFileSync(fsidToOptionsPath, serialized)

From b22db1dadb7c5a9e13f0535267e05431c1e92717 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 01:11:46 -0500
Subject: [PATCH 856/877] 14.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d739a3089..e098eb836 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.1.1",
+  "version": "14.2.0",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From a945fca721747a09463a91e331efa9340a0b1517 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 02:31:18 -0500
Subject: [PATCH 857/877] docs: update new options

---
 docs/en/SUMMARY.md |   2 +
 docs/en/options.md | 118 ++++++++++++++++++++++++++-------------------
 2 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md
index 0827be78b..d0379b86e 100644
--- a/docs/en/SUMMARY.md
+++ b/docs/en/SUMMARY.md
@@ -24,6 +24,8 @@
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
   - [postcss.config](options.md#postcssconfig)
+  - [postcss.useConfigFile](options.md#postcssuseconfigfile)
+  - [postcss.cascade](options.md#postcsscascade)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
diff --git a/docs/en/options.md b/docs/en/options.md
index 9d22db3ee..5fff6ece0 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -161,6 +161,15 @@ module.exports = {
 
   Note this is automatically set to `false` if the `devtool` option is not present in the main webpack config.
 
+### postcss.cascade
+
+> New in 14.2.0
+
+- type: `boolean`
+- default: `false`
+
+  Set this to `true` to enable cascading PostCSS config file loading. For example, you can have extra `.postcssrc` files in nested source directories to apply different PostCSS configs to different files in your project.
+
 ### esModule
 
 > This option has been removed in v14.0. In v14.0 and above, `*.vue` files always expose ES modules.
@@ -238,62 +247,62 @@ module.exports = {
 - type: `boolean`
 - default: `false`
 
-Automatically extracts the CSS using `extract-text-webpack-plugin`. Works for most pre-processors out of the box, and handles minification in production as well.
+  Automatically extracts the CSS using `extract-text-webpack-plugin`. Works for most pre-processors out of the box, and handles minification in production as well.
 
-The value passed in can be `true`, or an instance of the plugin (so that you can use multiple instances of the extract plugin for multiple extracted files).
+  The value passed in can be `true`, or an instance of the plugin (so that you can use multiple instances of the extract plugin for multiple extracted files).
 
-This should be only used in production so that hot-reload works during development.
+  This should be only used in production so that hot-reload works during development.
 
-Example:
+  Example:
 
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-
-module.exports = {
-  // other options...
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          extractCSS: true
+  ``` js
+  // webpack.config.js
+  var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+  module.exports = {
+    // other options...
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader',
+          options: {
+            extractCSS: true
+          }
         }
-      }
+      ]
+    },
+    plugins: [
+      new ExtractTextPlugin("style.css")
     ]
-  },
-  plugins: [
-    new ExtractTextPlugin("style.css")
-  ]
-}
-```
+  }
+  ```
 
-Or passing in an instance of the plugin:
+  Or passing in an instance of the plugin:
 
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-var plugin = new ExtractTextPlugin("style.css")
-
-module.exports = {
-  // other options...
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          extractCSS: plugin
+  ``` js
+  // webpack.config.js
+  var ExtractTextPlugin = require("extract-text-webpack-plugin")
+  var plugin = new ExtractTextPlugin("style.css")
+
+  module.exports = {
+    // other options...
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader',
+          options: {
+            extractCSS: plugin
+          }
         }
-      }
+      ]
+    },
+    plugins: [
+      plugin
     ]
-  },
-  plugins: [
-    plugin
-  ]
-}
-```
+  }
+  ```
 
 ### optimizeSSR
 
@@ -302,7 +311,7 @@ module.exports = {
 - type: `boolean`
 - default: `true` when the webpack config has `target: 'node'` and `vue-template-compiler` is at version 2.4.0 or above.
 
-Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees returned by render functions into plain strings, which improves SSR performance. In some cases you might want to explicitly turn it off because the resulting render functions can only be used for SSR and cannot be used for client-side rendering or testing.
+  Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees returned by render functions into plain strings, which improves SSR performance. In some cases you might want to explicitly turn it off because the resulting render functions can only be used for SSR and cannot be used for client-side rendering or testing.
 
 ### hotReload
 
@@ -312,5 +321,16 @@ Enable Vue 2.4 SSR compilation optimization that compiles part of the vdom trees
 - default: `true` in development mode, `false` in production mode or when the webpack config has `target: 'node'`.
 - allowed value: `false` (`true` will not force Hot Reload neither in production mode nor when `target: 'node'`)
 
-Whether to use webpack [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/) to apply changes in the browser **without reloading the page**.
-Use this option (value `false`) to disable the Hot Reload feature in development mode.
+  Whether to use webpack [Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/) to apply changes in the browser **without reloading the page**.
+  Use this option (value `false`) to disable the Hot Reload feature in development mode.
+
+### threadMode
+
+> New in 14.2.0
+
+- type: `boolean`
+- default: `false`
+
+  Setting this to true enables filesystem-based option caching so that the options for the main `vue-loader` can be properly shared with sub-loaders in other threads.
+
+  Only needed when using together with HappyPack or `thread-loader`.

From 05f08a7ae5c144f29375d3c9166990b8fc5ce747 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 02:36:06 -0500
Subject: [PATCH 858/877] fix: fix template HMR

---
 lib/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers.js b/lib/helpers.js
index 0a8d08bb3..4e922c375 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -95,7 +95,7 @@ function resolveLoaders (
   const templateCompilerOptions =
     '?' +
     JSON.stringify({
-      id: hasScoped ? moduleId : undefined,
+      id: moduleId,
       hasScoped,
       hasComment,
       optionsId,

From 0ed050d282d4d00c7eecd4edc73f78efaea56eb6 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Wed, 7 Mar 2018 02:36:12 -0500
Subject: [PATCH 859/877] 14.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e098eb836..97d8a555b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.2.0",
+  "version": "14.2.1",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From c5b1aee9e3b6f9b4f0d7c36eacd8cc71eff07e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Wed, 7 Mar 2018 20:11:32 +0800
Subject: [PATCH 860/877] [docs][zh-cn] synced updates to v14.2 (#1180)

* [docs][zh-cn] synced updates

* Update options.md
---
 docs/zh-cn/configurations/asset-url.md | 2 +-
 docs/zh-cn/options.md                  | 2 ++
 docs/zh-cn/start/spec.md               | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index 2601b56e4..37f3f73a1 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -23,7 +23,7 @@ createElement('img', { attrs: { src: require('../image.png') }})
 - 如果路径以 `~` 开头，其后的部分将会被看作模块依赖。这意味着你可以用该特性来引用一个 node 依赖中的资源：
 
   ``` html
-  <img src="~/some-npm-package/foo.png">
+  <img src="~some-npm-package/foo.png">
   ```
 
 - (13.7.0+) 如果路径以 `@` 开头，也会被看作模块依赖。如果你的 webpack 配置中给 `@` 配置了 alias，这就很有用了。所有 `vue-cli` 创建的项目都默认配置了将 `@` 指向 `/src`。
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index 501550727..a6775b817 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -162,6 +162,8 @@ module.exports = {
 
 ### esModule
 
+> 这个选项已经从 v14.0 中移除。在 v14.0 及以上版本中，`*.vue` 文件始终暴露为 ES 模块。
+
 - 类型: `Boolean`
 - 默认值: `undefined`
 
diff --git a/docs/zh-cn/start/spec.md b/docs/zh-cn/start/spec.md
index 850afdbe1..1c11ecdae 100644
--- a/docs/zh-cn/start/spec.md
+++ b/docs/zh-cn/start/spec.md
@@ -104,7 +104,6 @@ export default {
 
 ### 语法高亮
 
-
 目前语法高亮支持 [Sublime Text](https://github.com/vuejs/vue-syntax-highlight)、[Atom](https://atom.io/packages/language-vue)、[Vim](https://github.com/posva/vim-vue)、[Emacs](https://github.com/AdamNiederer/vue-mode)、[Visual Studio Code](https://marketplace.visualstudio.com/items/liuji-jim.vue)、[Brackets](https://github.com/pandao/brackets-vue) 和 [JetBrains products](https://plugins.jetbrains.com/plugin/8057) (WebStorm、PhpStorm 等)。非常感谢其他编辑器/IDE 所做的贡献！如果在 Vue 组件中没有使用任何预处理器，你可以把 `.vue` 文件当作 HTML 对待。
 
 ### 注释

From 6c1e53fc8d3891eb5c1608b365467d7028fb2cbe Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Fri, 9 Mar 2018 01:17:25 +0900
Subject: [PATCH 861/877] update ja docs (#1182)

* docs(ja): update valid option

ref: https://github.com/vuejs/vue-loader/commit/069bc3142a3d7bfbe5db36377b4abf2c81c32909

* docs(ja): add hot reload docs

ref: https://github.com/vuejs/vue-loader/commit/14921e4a92cf3d515ffc8bba9bfb56ce887f4281

* docs(ja): translate hot reload docs

* docs(ja): Webpack -> webpack

* docs(ja): update hot reload and scoped css docs

ref: https://github.com/vuejs/vue-loader/commit/d89bd3ce56f1a98926dc820d12d8e3ab335ce80a

* docs(ja): translate hot reload and scoped css section

* docs(ja): http -> https

ref: https://github.com/vuejs/vue-loader/commit/c39ba70ed9883073ec93e41c6a8e8ef06ab68f07

* docs(ja): add cacheBusting option

* docs(ja): translate cacheBusting option

* docs(ja): update workflow/testing0-with-mock section

ref: https://github.com/vuejs/vue-loader/commit/21809a08ee948f8a38c251646a00dfbfa8ba2802

* docs(ja): update postcss related docs

ref: https://github.com/vuejs/vue-loader/commit/2db8c0a07585812755ed52d2890e01462873a786

* docs(ja): translate postcss related docs

* docs(ja): remove cacheBusting option

ref: https://github.com/vuejs/vue-loader/commit/26cad3d467d1a8033ac84e0ca00e6392a66ccaf2

* docs(ja): update configrations/asset-url docs

ref: https://github.com/vuejs/vue-loader/commit/781df8cc8143b90137ff13974102581a538c24a6

* docs(ja): translate configrations/asset-url docs

* docs(ja):  remove webpack 1 reference, refer new cli

ref: https://github.com/vuejs/vue-loader/commit/7fb1cd84a006b631102481a810cf201cdefe9e36

* docs(ja): remove workflow/testing-with-mocks docs

ref: https://github.com/vuejs/vue-loader/commit/611fda8c76b5f2c612536eb90ac5694384717659

* docs(ja): add notice to esmodule option

ref: https://github.com/vuejs/vue-loader/commit/96635ead77d9673a5419c35ce3486f10a36bf003

* docs(ja): translate esmodule option doc

* docs(ja): udpate configrations/asset-url doc

* docs(ja): add new options

ref: https://github.com/vuejs/vue-loader/commit/a945fca721747a09463a91e331efa9340a0b1517

* docs(ja): add hotRealod option (leak option ... orz)

* docs(ja): adjust option doc layouting

* docs(ja): translate otpions

* docs(ja): fix review comments
---
 docs/ja/README.md                       |   4 +-
 docs/ja/SUMMARY.md                      |   5 +-
 docs/ja/configurations/advanced.md      |  25 ------
 docs/ja/configurations/asset-url.md     |  19 ++++
 docs/ja/configurations/custom-blocks.md |   1 -
 docs/ja/configurations/extract-css.md   |  35 --------
 docs/ja/features/css-modules.md         |  11 ---
 docs/ja/features/hot-reload.md          |  38 ++++++++
 docs/ja/features/postcss.md             |  44 +++++----
 docs/ja/features/scoped-css.md          |  67 ++++++++------
 docs/ja/options.md                      | 115 +++++++++++++++---------
 docs/ja/start/setup.md                  |  11 ++-
 docs/ja/workflow/linting.md             |  66 +++-----------
 docs/ja/workflow/production.md          |  10 +--
 docs/ja/workflow/testing-with-mocks.md  |  70 ---------------
 docs/ja/workflow/testing.md             | 101 +--------------------
 16 files changed, 222 insertions(+), 400 deletions(-)
 delete mode 100644 docs/ja/workflow/testing-with-mocks.md

diff --git a/docs/ja/README.md b/docs/ja/README.md
index 67e5eeb2d..a38668eb7 100644
--- a/docs/ja/README.md
+++ b/docs/ja/README.md
@@ -20,9 +20,9 @@
 
 すでに webpack に精通している場合は、次の説明を省略してもかまいません。しかし、webpack を初めて使う人のために、ここで簡単な紹介を行います。
 
-[webpack](http://webpack.github.io/) とはモジュールのバンドラーです。それぞれのファイルをモジュールとして扱い、それらの間の依存関係を解決し、デプロイの準備が整った静的アセットにバンドルします。
+[webpack](https://webpack.github.io/) とはモジュールのバンドラーです。それぞれのファイルをモジュールとして扱い、それらの間の依存関係を解決し、デプロイの準備が整った静的アセットにバンドルします。
 
-![webpack](http://webpack.github.io/assets/what-is-webpack.png)
+![webpack](https://webpack.github.io/assets/what-is-webpack.png)
 
 基本的な例として、CommonJS モジュールが多数あるとします。これらはブラウザで直接実行できません。なのでそれらを `<script>` タグを介して読み込むことのできる単一のファイルに "バンドル" する必要があります。webpack は `require()` での依存性解決と実行を行うことが出来ます。
 
diff --git a/docs/ja/SUMMARY.md b/docs/ja/SUMMARY.md
index b9203f55a..a6460a588 100644
--- a/docs/ja/SUMMARY.md
+++ b/docs/ja/SUMMARY.md
@@ -18,13 +18,14 @@
   - [プロダクションビルド](workflow/production.md)
   - [リント](workflow/linting.md)
   - [テスト](workflow/testing.md)
-  - [モックを使用したテスト](workflow/testing-with-mocks.md)
 - [オプションリファレンス](options.md)
   - [loaders](options.md#loaders)
   - [preLoaders](options.md#preloaders)
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
   - [postcss.config](options.md#postcssconfig)
+  - [postcss.useConfigFile](options.md#postcssuseconfigfile)
+  - [postcss.cascade](options.md#postcsscascade)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
@@ -33,4 +34,4 @@
   - [transformToRequire](options.md#transformtorequire)
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
-  - [optimizeSSR](options.md#optimizessr)
\ No newline at end of file
+  - [optimizeSSR](options.md#optimizessr)
diff --git a/docs/ja/configurations/advanced.md b/docs/ja/configurations/advanced.md
index ec447a521..cd29c9f98 100644
--- a/docs/ja/configurations/advanced.md
+++ b/docs/ja/configurations/advanced.md
@@ -10,8 +10,6 @@
 
 > メモ: `preLoaders` と `postLoaders` は 10.3.0 以降でのみサポートされます
 
-### webpack 2.x
-
 ``` js
 module.exports = {
   // 他のオプション
@@ -57,27 +55,4 @@ module.exports = {
 }
 ```
 
-### webpack 1.x
-
-``` js
-// webpack.config.js
-module.exports = {
-  // ほかのオプション
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  },
-  // `vue-loader` の設定
-  vue: {
-    loaders: {
-      // 上記の設定と同じ
-    }
-  }
-}
-```
-
 高度な loader の設定のより実用的な使用方法は、[CSS を単一のファイルに抽出する](./expression-css.md)にあります。
diff --git a/docs/ja/configurations/asset-url.md b/docs/ja/configurations/asset-url.md
index 1b5c61e44..013cad0b9 100644
--- a/docs/ja/configurations/asset-url.md
+++ b/docs/ja/configurations/asset-url.md
@@ -13,8 +13,27 @@
 ``` js
 createElement('img', { attrs: { src: require('../image.png') }})
 ```
+
+### 変換ルール
+
+- URL が絶対パス (例: `./images/foo.png`) の場合、そのままの状態で維持されます。
+
+- URL が `.` による開始である場合、相対的なモジュール要求として解釈され、ファイルシステムのフォルダ構造に基いて解決されます。
+
+- URL が `~` による開始である場合、モジュール要求として解釈された後、何もしません。これは、Node モジュール内部でアセットを参照することもできます:
+
+  ``` html
+  <img src="~some-npm-package/foo.png">
+  ```
+
+- (13.7.0以降) URL が `@` による開始である場合、モジュール要求として解釈されます。これは、webpack 設定ファイルに `@` のエイリアスがある場合は、便利です。デフォルトでは、`vue-cli` によって作成されたプロジェクトでは `./src` を指します。
+
+### 関連ローダー
+
 もちろん `.png` ファイルは JavaScript のファイルではありません。[file-loader](https://github.com/webpack/file-loader) または [url-loader](https://github.com/webpack/url-loader) を使用して webpack を設定する必要があります。`vue-cli` でスキャフォールドされたプロジェクトでは同じような設定がなされています。
 
+### なぜなのか
+
 利点の全ては次の通りです:
 
 1. `file-loader` はアセットファイルのコピー先や配置先を制定したり、バージョンハッシュを利用してキャッシングを改善する方法を指定する事が出来ます。さらに、これは、単に**あなたの `* .vue` ファイルの隣にイメージを置くことができ、配備するURLを心配するのではなくフォルダ構造に基づいて相対パスを使用する**ことを意味します。
diff --git a/docs/ja/configurations/custom-blocks.md b/docs/ja/configurations/custom-blocks.md
index b0a764346..2b81846a6 100644
--- a/docs/ja/configurations/custom-blocks.md
+++ b/docs/ja/configurations/custom-blocks.md
@@ -41,7 +41,6 @@ comp-a h2 {
 #### webpack.config.js
 
 ``` js
-// webpack 2.x
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
 
 module.exports = {
diff --git a/docs/ja/configurations/extract-css.md b/docs/ja/configurations/extract-css.md
index 1dbc1b8ef..e1a4a381e 100644
--- a/docs/ja/configurations/extract-css.md
+++ b/docs/ja/configurations/extract-css.md
@@ -39,8 +39,6 @@ module.exports = {
 
 すべての Vue コンポーネントで処理されたすべての CSS を 1 つの CSS ファイルに抽出する例:
 
-### webpack 2.x
-
 ``` js
 // webpack.config.js
 var ExtractTextPlugin = require("extract-text-webpack-plugin")
@@ -68,36 +66,3 @@ module.exports = {
   ]
 }
 ```
-
-### webpack 1.x
-
-``` bash
-npm install extract-text-webpack-plugin --save-dev
-```
-
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-
-module.exports = {
-  // 他の設定
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      },
-    ]
-  },
-  vue: {
-    loaders: {
-      css: ExtractTextPlugin.extract("css"),
-      // <style lang="less">　または他の言語も含めることができます
-      less: ExtractTextPlugin.extract("css!less")
-    }
-  },
-  plugins: [
-    new ExtractTextPlugin("style.css")
-  ]
-}
-```
diff --git a/docs/ja/features/css-modules.md b/docs/ja/features/css-modules.md
index 2486066dc..9e46e8709 100644
--- a/docs/ja/features/css-modules.md
+++ b/docs/ja/features/css-modules.md
@@ -89,17 +89,6 @@ CSS モジュールは [css-loader](https://github.com/webpack/css-loader) に
 vue-loader の `cssModules`オプションを使って` css-loader`に追加のクエリオプションを提供することができます:
 
 ``` js
-// webpack 1
-vue: {
-  cssModules: {
-    // ローカルID名を上書きする
-    localIdentName: '[path][name]---[local]---[hash:base64:5]',
-    // キャメルケースを有効にする
-    camelCase: true
-  }
-}
-
-// webpack 2
 module: {
   rules: [
     {
diff --git a/docs/ja/features/hot-reload.md b/docs/ja/features/hot-reload.md
index 5959c7c4d..d9dad8bfc 100644
--- a/docs/ja/features/hot-reload.md
+++ b/docs/ja/features/hot-reload.md
@@ -4,4 +4,42 @@
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
+## 状態維持ルール
+
+- コンポーネントの `<template>` を編集するとき、編集されたコンポーネントのインスタンスは、そのまま再描画し、全て現在のプライベートな状態に維持します。これは、テンプレートが副作用を発生させない新しい描画関数にコンパイルされるため可能です。
+
+- コンポーネントの `<script>` 部分を編集するとき、編集されたコンポーネントのインスタンスは破棄され、そのまま再作成されます。(アプリケーション内の他のコンポーネントの状態は維持されています。) これは、`<script>` が副作用を生むかもしれないライフサイクルフックを含むことができるため、一貫性のある動作を保証するためには再描画の代わりに"リロード"が必要です。これはまた、コンポーネントライフサイクルフック内のタイマーのようなグローバルな副作用に注意する必要があることを意味します。場合によっては、コンポーネントでグローバルな副作用が発生する場合は、フルページリロードの必要があるかもしれません。
+
+- `<style>` ホットリロードは `vue-style-loader` を介して単独で動作するため、アプリケーションの状態に影響しません。
+
+## Usage
+
 `vue-cli` を使ってプロジェクトをスキャホールドすると、ホットリロードはすぐに使えるようになります。
+
+プロジェクトを手動で設定するときは、ホットリロードは、`webpack-dev-server --hot` によってプロジェクトを提供するとき、自動的に有効なります。
+
+上級者は、`vue-loader` によって内部的に使用されいてる [vue-hot-reload-api](https://github.com/vuejs/vue-hot-reload-api) を確認することができます。
+
+## ホットリロードの無効
+
+ホットリロードは以下の状況を除いて常に有効です:
+
+ * webpack の `target` が `node` (SSR)
+ * webpack ミニファイコード
+ * `process.env.NODE_ENV === 'production'`
+  
+ホットリロードを明示的に無効にするためには、`hotReload: false` オプションを使用してください:
+
+``` js
+module: {
+  rules: [
+    {
+      test: /\.vue$/,
+      loader: 'vue-loader',
+      options: {
+        hotReload: false // ホットリロードを無効
+      }
+    }
+  ]
+}
+```
diff --git a/docs/ja/features/postcss.md b/docs/ja/features/postcss.md
index 7a82d8367..3e3633f19 100644
--- a/docs/ja/features/postcss.md
+++ b/docs/ja/features/postcss.md
@@ -4,7 +4,7 @@
 
 ## 設定ファイルの使用
 
-バージョン 11.0 以降、 `vue-loader` は [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) でサポートされているものと同じ PostCss の設定ファイルのオートロードをサポートします:
+`vue-loader` は [`postcss-loader`](https://github.com/postcss/postcss-loader#usage) でサポートされているものと同じ PostCss の設定ファイルのオートロードをサポートします:
 
 - `postcss.config.js`
 - `.postcssrc`
@@ -12,24 +12,22 @@
 
 設定ファイルを使用すると `postcss-loader` で処理された通常の CSS ファイルと `*.vue` ファイル内の CSS で同じ設定を共有することができます。
 
-## インラインオプション
+## `postcss-loader` の使用
 
-あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の PostCSS の設定を指定することが出来ます。
+`vue-loader` は内部的にはスタイルで PostCSS を扱うため、スタンドアロンの CSS ファイルに `postcss-loader` を適用する必要あります。プロジェクトに PostCSS 設定ファイルがある場合は、style ブロックに `lang="postcss"` を指定する必要はありません。
 
-webpack 1.x の例:
+時々、ユーザーはシンタックスハイライトを目的のみに `lang="postcss"`を使用することもあります。13.6.0 から、以下の一般的な PostCSS 拡張 (`vue-loader` 自身の `loaders` オプションを介して)のためにローダーが明示的に指定されていない場合は、それらは `vue-loader` のデフォルト PostCSS 変換を単に追加します:
 
-``` js
-// webpack.config.js
-module.exports = {
-  // 他の設定
-  vue: {
-    // カスタムされた PostCSS プラグインを使用します
-    postcss: [require('postcss-cssnext')()]
-  }
-}
-```
+- `postcss`
+- `pcss`
+- `sugarss`
+- `sss`
+
+## インラインオプション
+
+あるいは、 `vue-loader` の `postcss` オプションを使用して `*.vue` ファイル用の PostCSS の設定を指定することが出来ます。
 
-webpack 2.x の例:
+例:
 
 ``` js
 // webpack.config.js
@@ -61,7 +59,21 @@ module.exports = {
   postcss: {
     plugins: [...], // プラグインのリスト
     options: {
-      parser: sugarss // sugarss パーサーを使用します
+      parser: 'sugarss' // sugarss パーサーを使用します
     }
   }
   ```
+
+### 自動設定ファイルの読み込みを無効にする
+
+`13.6.0 以降`では、`postcss.useConfigFile: false` を指定することによって自動 postcss 設定ファイルの読み込みが無効化されます:
+
+``` js
+postcss: {
+  useConfigFile: false,
+  plugins: [/* ... */],
+  options: {/* ... */}
+}
+```
+
+これにより `*.vue` ファイル内の postcss 設定をインライン設定で完全に制御することができます。
diff --git a/docs/ja/features/scoped-css.md b/docs/ja/features/scoped-css.md
index f10f899b9..88f178e63 100644
--- a/docs/ja/features/scoped-css.md
+++ b/docs/ja/features/scoped-css.md
@@ -1,5 +1,7 @@
 # スコープ付き CSS
 
+**再帰されたコンポーネントの子孫セレクタには気をつけてください！** セレクタ `.a .b` を持つ CSS ルールの場合、`.a` にマッチする要素に再帰的な子コンポーネントが含まれている場合、その子コンポーネントのすべての `.b` はルールにマッチします。# スコープ付き CSS
+
 `scoped` 属性をもつ `<style>` タグを利用するとき、その CSS は現在のコンポーネントの要素にのみ適用されます。これは Shadow DOM のスタイルのカプセル化に似ています。いくつか注意点がありますが、polyfill は必要ありません。PostCSS を使用して以下を変換することによって実現しています:
 
 ``` html
@@ -28,40 +30,49 @@
 </template>
 ```
 
-#### 注意
+## 秘訣
+
+### ローカルスタイルとグローバルスタイルの混在
+
+同じコンポーネントでスコープ付き、そして非スコープ付きスタイル両方を含むことができます:
+
+``` html
+<style>
+/* グローバルスタイル */
+</style>
 
-1. 同じコンポーネント内にスコープで区切られてものとそうでないスタイルを含むことが出来ます：
+<style scoped>
+/* ローカルスタイル */
+</style>
+```
 
-  ``` html
-  <style>
-  /* グローバルスタイル */
-  </style>
+### 子コンポーネントのルート要素
 
-  <style scoped>
-  /* ローカルスタイル */
-  </style>
-  ```
+`scoped` によって、親コンポーネントのスタイルは子コンポーネントに漏れません。ただし、子コンポーネントのルートノードは親スコープの CSS と子スコープの CSS と両方によって影響を受けます。これは、設計上、親はレイアウトが目的で子のルート要素をスタイルすることができます。
 
-2. 子コンポーネントのルートノードは親のスコープの CSS と子のスコープの CSS の両方の影響をうけます。
+### ディープセレクタ
+
+`scoped` スタイルのセレクタを "deep" にしたい、つまり子コンポーネントに及ぼしたい場合は、`>>>` コンビネータを使用することができます:
+
+``` html
+<style scoped>
+.a >>> .b { /* ... */ }
+</style>
+```
+
+上記は以下にコンパイルされます:
+
+``` css
+.a[data-v-f3f3eg9] .b { /* ... */ }
+```
 
-3. パーシャルはスコープ付きスタイルの影響をうけません。
+SASS のようないくつかのプリプロセッサは、`>>>` を適切に解析できないかもしれません。そのようなケースでは `/deep/` コンビネータを代わりに使用することができます。それは、`>>>` のエイリアスで、全く同じような動作します。
 
-4. **スコープされたスタイルは class の必要性を排除しません**。ブラウザが様々な CSS セレクタをレンダリングするため、`p { color: red }` はスコープされているとき何倍も遅くなります（すなわち属性セレクタと組み合わせた場合）。もし `.example { color: red }` のように class か id を使用するなら、パフォーマンスヒットは事実上なくなります。[この例](http://stevesouders.com/efws/css-selectors/csscreate.php)で違いをテストすることが出来ます。
+### 動的に生成されるコンテンツ
 
-5. **再帰されたコンポーネントの子孫セレクタには気をつけてください！** セレクタ `.a .b` を持つ CSS ルールの場合、`.a` にマッチする要素に再帰的な子コンポーネントが含まれている場合、その子コンポーネントのすべての `.b` はルールにマッチします。
+`v-html` によって作成された DOM コンテンツは、スコープ付きスタイルにの影響を受けませんが、ディープセレクタを使用してスタイルを設定することはできます。
 
-6. `scoped` スタイルで入れ子のセレクタが必要なら、CSS に対して `>>>` オペレータを、そして `scss` に対しては `/deep/` を使用する必要があります:
+### 留意すること
 
-    ``` html
-    <style scoped>
-    .a >>> .b {
-    
-    }
-    </style>
-    
-    <style lang="scss" scoped>
-    .a /deep/ .b {
-    
-    }
-    </style>
-    ```
+- **スコープ付きスタイルでは class は必要です。** ブラウザが様々な CSS セレクタを描画するため、`p { color: red }` はスコープされているとき何倍も遅くなります（すなわち属性セレクタと組み合わせた場合）。もし `.example { color: red }` のように class か id を使用するなら、パフォーマンスヒットは事実上なくなります。[この例](https://stevesouders.com/efws/css-selectors/csscreate.php)で違いをテストすることが出来ます。
+- **再帰されたコンポーネントの子孫セレクタには気をつけてください！** セレクタ `.a .b` を持つ CSS ルールの場合、`.a` にマッチする要素に再帰的な子コンポーネントが含まれている場合、その子コンポーネントのすべての `.b` はルールにマッチします。
diff --git a/docs/ja/options.md b/docs/ja/options.md
index 1ed95796b..bb243211e 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -1,10 +1,9 @@
 # オプションリファレンス
 
-## webpack 1 と 2 の使い方の違い
-
-webpack 2 の場合: オプションを loader ルールに直接渡します。
+## オプションの配置場所
 
 ``` js
+// webpack.config.js
 module.exports = {
   // ...
   module: {
@@ -21,20 +20,9 @@ module.exports = {
 }
 ```
 
-webpack 1.x の場合: webpack の設定のルートに `vue` ブロックを追加します。
-
-``` js
-module.exports = {
-  // ...
-  vue: {
-    // `vue-loader` オプション
-  }
-}
-```
-
 ### loaders
 
-- 型: `{ [lang: string]: string }`
+- 型: `{ [lang: string]: string | Object | Array }`
 
   `* .vue` ファイル内の言語ブロックに使用されるデフォルトの loader を上書きする webpack loader を指定するオブジェクト。キーは指定されている場合、言語ブロックの `lang` 属性に対応します。各タイプのデフォルトの `lang` は次のとおりです:
 
@@ -45,7 +33,6 @@ module.exports = {
   たとえば、`babel-loader` と `eslint-loader` を使ってすべての `<script>` ブロックを処理するには:
 
   ``` js
-  // webpack 2.x config
   module: {
     rules: [
       {
@@ -61,17 +48,36 @@ module.exports = {
   }
   ```
 
+  オブジェクトまたは配列構文(オプションはシリアライズ可能でなければなりません)も使用することができます:
+
+  ``` js
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: [
+              { loader: 'cache-loader' },
+              { loader: 'babel-loader', options: { presets: ['env'] } }
+            ]
+          }
+        }
+      }
+    ]
+  }
+  ```
+
 ### preLoaders
 
 - 型: `{ [lang: string]: string }`
-- 10.3.0 以降でサポートされます。
 
   config 形式は `loaders` と同じですが、`preLoaders` はデフォルト loader の前に対応する言語ブロックに適用されます。これを使用して言語ブロックを前処理することができます。一般的な使用例としては、i18n のビルド時です。
 
 ### postLoaders
 
 - 型: `{ [lang: string]: string }`
-- 10.3.0 以降でサポートされます。
 
   config 形式は `loaders` と同じですが、` postLoaders` はデフォルト loader の後に適用されます。これを使用して言語ブロックを後処理することができます。ただしこれは少し複雑になります:
 
@@ -80,7 +86,7 @@ module.exports = {
 
 ### postcss
 
-  > メモ: 11.0.0 以降では代わりに PostCSS の設定ファイル推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
+  > メモ: 代わりに、vue ファイルと通常の CSS が同じ設定を共有することができるため、PostCSS 設定ファイルの使用を推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
 
 - 型: `Array` もしくは `Function` か `Object`
 
@@ -136,6 +142,15 @@ module.exports = {
 
     PostCSS プラグインにコンテキストを提供します。より詳細については、[postcss-loader のドキュメント](https://github.com/postcss/postcss-loader#context-ctx) を参照してください。
 
+### postcss.useConfigFile
+
+> 13.6.0 で新規追加
+
+- 型: `boolean`
+- デフォルト: `true`
+
+  postcss 設定ファイルの自動読み込みを無効にするためには、これを `false` に設定します。  
+
 ### cssSourceMap
 
 - 型: `boolean`
@@ -145,8 +160,19 @@ module.exports = {
 
   注意: もしメインの webpack の設定に `devtool` オプションが存在しないければオートで `false` にセットされます。
 
+### postcss.cascade
+
+> 14.2.0 で新規追加
+
+- 型: `boolean`
+- デフォルト: `false`
+
+  PostCSS 設定ファイル読み込みのカスケーディングを有効にするにはこれを `true` に設定します。例えば、ネストされたソースディレクトリに `.postcssrc` ファイルを追加するとプロジェクトの異なるファイルに異なる PostCSS 設定を適用することができます。
+
 ### esModule
 
+> このオプションは v14.0 では削除されました。v14.0 以降では、`*.vue` ファイルは常に ES モジュールをエクスポートします。
+
 - 型: `boolean`
 - デフォルト: `true` (v13.0以降)
 
@@ -186,8 +212,8 @@ module.exports = {
 
 ### buble
 
-  型: `Object`
-  デフォルト: `{}`
+- 型: `Object`
+- デフォルト: `{}`
 
   `bubble-loader`(存在する場合)のオプションとテンプレートレンダリング関数のための buble のコンパイルパスを設定します。
 
@@ -198,21 +224,6 @@ module.exports = {
   設定の例:
 
   ``` js
-  // webpack 1
-  vue: {
-    buble: {
-      // オブジェクトスプレッド演算子を有効にする
-      // メモ: Object.assign polyfillを自分で提供する必要があります！
-      objectAssign: 'Object.assign',
-
-      // `with` の除去をオフにする
-      transforms: {
-        stripWith: false
-      }
-    }
-  }
-
-  // webpack 2
   module: {
     rules: [
       {
@@ -230,10 +241,10 @@ module.exports = {
 
 ### extractCSS
 
-  > 12.0.0 で追加
+> 12.0.0 で追加
 
-  - 型: `boolean`
-  - デフォルト: `false`
+- 型: `boolean`
+- デフォルト: `false`
 
   自動的に `extract-text-webpack-plugin` を使用して CSS を抽出します。ほとんどのプリプロセッサに対してすぐに動作し、本番環境においても同様に圧縮 (minify) 処理します。
 
@@ -299,5 +310,27 @@ module.exports = {
 - 型: `boolean`
 - デフォルト: webpack 設定が `target: 'node'` でかつ `vue-template-compiler` が バージョン 2.4.0 以上であれば、`true`
 
-描画 (render) 関数によって返された vdom ツリーの一部をプレーンな文字列にコンパイルする、Vue 2.4 SSR (サーバサイドレンダリング) のコンパイル最適化を有効にして、SSR のパフォーマンスを改善します。
-描画関数の結果が SSR のみを対象としたものになり、クライアントサイドレンダリングまたはテストには使用できなくなるため、あるケースによっては、明示的にオフにしたくなる場合があります。
+  描画 (render) 関数によって返された vdom ツリーの一部をプレーンな文字列にコンパイルする、Vue 2.4 SSR (サーバサイドレンダリング) のコンパイル最適化を有効にして、SSR のパフォーマンスを改善します。
+  描画関数の結果が SSR のみを対象としたものになり、クライアントサイドレンダリングまたはテストには使用できなくなるため、あるケースによっては、明示的にオフにしたくなる場合があります。
+
+### hotReload
+
+> 13.5.0 で新規追加
+
+- 型: `boolean`
+- デフォルト: 開発(development)モードでは `true` 、本番(production)モードまたは webpack 設定が `target: 'node' を持っているときは、`false`
+- 許可される値: `false` (`true` は本番モードまたは `target: 'node'` では、ホットリロードは強制されません。)
+
+  webpack の[ホットリロードリプレースメント](https://webpack.js.org/concepts/hot-module-replacement/) を使用して、**ページをリロードすることなく**ブラウザで変更を適用するかどうか。
+  開発モードでホットリロード機能を無効にするには、このオプション(値は `false`) を使用します。
+
+### threadMode
+
+> 14.2.0 で新規追加
+
+- 型: `boolean`
+- デフォルト: `false`
+
+  これを true に設定すると、ファイルシステムベースのオプションキャッシングが有効になり、メインの `vue-loader` のオプションを他のスレッドのサブローダーと適切に共有できるようになります。
+
+  HappyPack または`thread-loader` と一緒に使用する場合にのみ必要です。
diff --git a/docs/ja/start/setup.md b/docs/ja/start/setup.md
index 29fc8d877..18ddfd162 100644
--- a/docs/ja/start/setup.md
+++ b/docs/ja/start/setup.md
@@ -1,13 +1,12 @@
 # プロジェクトのセットアップ
 
-### `vue-cli` の使用
+### `@vue/cli` の使用
 
-`vue-loader` を使用するプロジェクトの足場作り (scaffolding) には `vue-cli` を使用することをお薦めします:
+`vue-loader` を使用するプロジェクトの足場作り (scaffolding) には `@vue/cli` を使用することをお薦めします:
 
 ``` bash
-npm install -g vue-cli
-vue init webpack-simple hello-vue
+npm install -g @vue/cli
+vue create hello-vue
 cd hello-vue
-npm install
-npm run dev # ready to go!
+npm run serve # 準備できました！
 ```
diff --git a/docs/ja/workflow/linting.md b/docs/ja/workflow/linting.md
index d55ca5c7f..0511a47b9 100644
--- a/docs/ja/workflow/linting.md
+++ b/docs/ja/workflow/linting.md
@@ -1,15 +1,17 @@
 # リント
 
-あなたは JavaScript でない `*.vue` の中のコードをどうやってリント (lint) するのか疑問に思っているかも知れません。[ESLint](http://eslint.org/) を使用していると仮定します(もし使っていないのならばすべきです!)
+あなたは JavaScript でない `*.vue` の中のコードをどうやってリント (lint) するのか疑問に思っているかも知れません。[ESLint](https://eslint.org/) を使用していると仮定します(もし使っていないのならばすべきです!)
 
-`* .vue`ファイル内のJavaScriptの抽出と埋め込みをサポートする[eslint-plugin-html](https://github.com/BenoitZugmeyer/eslint-plugin-html)も同様に必要です。
+Vue ファイル内の template と script の部分両方のリントをサポートする公式 [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) も同様に必要です。
 
-あなたの ESLint の設定にプラグインを含めてください:
+あなたの ESLint の設定にプラグインの設定を含めて使用してください:
 
 ``` json
-"plugins": [
-  "html"
-]
+{
+  "extends": [
+    "plugin:vue/essential"
+  ]
+}
 ```
 
 コマンドラインで次を実行してください:
@@ -24,49 +26,7 @@ eslint --ext js,vue MyComponent.vue
 npm install eslint eslint-loader --save-dev
 ```
 
-``` js
-// webpack.config.js
-module.exports = {
-  // 他のオプション
-  module: {
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue!eslint'
-      }
-    ]
-  }
-}
-```
-webpack ローダーチェーンは**まずはじめに**に適用されることをご了承ください。`vue` の前に `eslint` を適用して、コンパイル前のソースコードをリントしてください。
-
-1 つ私たちが考慮する必要があるのは、NPM パッケージでリリースされているサードパーティの* .vueコンポーネントを使用することです。そのような場合には、サードパーティー製のコンポーネントを処理するために  `vue-loader` を使用したいと思いますが、それをリントしたくはありません。そういうときはリントを webpack の [preLoaders](https://webpack.github.io/docs/loaders.html#loader-order) に分けることが可能です:
-
-``` js
-// webpack.config.js
-module.exports = {
-  // 他のオプション
-  module: {
-    // リント対象はローカルの *.vue ファイルのみ
-    preLoaders: [
-      {
-        test: /\.vue$/,
-        loader: 'eslint',
-        exclude: /node_modules/
-      }
-    ],
-    // しかし全ての *.vue ファイルで vue-loader を使用します
-    loaders: [
-      {
-        test: /\.vue$/,
-        loader: 'vue'
-      }
-    ]
-  }
-}
-```
-
-webpack 2.x:
+プリローダーとして適用されていることを確認してください:
 
 ``` js
 // webpack.config.js
@@ -74,17 +34,11 @@ module.exports = {
   // 他のオプション
   module: {
     rules: [
-      // *.vue のみを検査します
       {
         enforce: 'pre',
-        test: /\.vue$/,
+        test: /\.(js|vue)$/,
         loader: 'eslint-loader',
         exclude: /node_modules/
-      },
-      // しかし全ての *.vue ファイルで vue-loader は使用します
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader'
       }
     ]
   }
diff --git a/docs/ja/workflow/production.md b/docs/ja/workflow/production.md
index a7a6ba34e..7807b2dfd 100644
--- a/docs/ja/workflow/production.md
+++ b/docs/ja/workflow/production.md
@@ -19,18 +19,12 @@ module.exports = {
       }
     }),
     // デッドコード除去で縮小します
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    // webpack 1 のみ - 発生回数別にモジュールIDを最適化します
-    new webpack.optimize.OccurenceOrderPlugin()
+    new webpack.optimize.UglifyJsPlugin()
   ]
 }
 ```
 
-明らかに開発中にこの設定を使いたくないので、これにはいくつかの方法をとります:
+開発中にこの設定を使いたくないので、これにはいくつかの方法をとります:
 
 1. 環境変数に基づいて構成オブジェクトを動的に構築します
 2. または、開発用と運用用の2つの webpack 設定ファイルを使用します。[vue-hackernews-2.0](https://github.com/vuejs/vue-hackernews-2.0) に示すように、3 つ目のファイルに共通のオプションをいくつか共有することもできます
diff --git a/docs/ja/workflow/testing-with-mocks.md b/docs/ja/workflow/testing-with-mocks.md
deleted file mode 100644
index 91de6e1e4..000000000
--- a/docs/ja/workflow/testing-with-mocks.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# モックを使用したテスト
-
-現実のアプリケーションでは、私たちのコンポーネントは外部依存関係を持つ可能性が高いです。コンポーネントの単体テストを記述するときは、外部依存関係をモックにし、テストはテスト対象のコンポーネントの動作に依存するだけになるのが理想です。
-
-`vue-loader` は、[inject-loader](https://github.com/plasticine/inject-loader)を使って任意の依存関係を `*.vue` コンポーネントに注入する機能を提供します。一般的な考え方としては、コンポーネントモジュールを直接インポートするのではなく、`inject-loader` を使用して、そのモジュール用の「モジュールファクトリ」関数を作成するというものです。この関数がモックのオブジェクトで呼び出されると、モックが注入されたモジュールのインスタンスが返されます。
-
-次のようなコンポーネントがあるとします:
-
-``` html
-<!-- example.vue -->
-<template>
-  <div class="msg">{{ msg }}</div>
-</template>
-
-<script>
-// この依存はモックを必要としています
-import SomeService from '../service'
-
-export default {
-  data () {
-    return {
-      msg: SomeService.msg
-    }
-  }
-}
-</script>
-```
-
-モックをインポートする方法は次のとおりです:
-
-> 注意: inject-loader@3.x は現在 unstable です。
-
-``` bash
-npm install inject-loader@^2.0.0 --save-dev
-```
-
-``` js
-// example.spec.js
-const ExampleInjector = require('!!vue-loader?inject!./example.vue')
-```
-
-注意。狂気じみた文字列を必要とします - ここではいくつかのインライン [webpack loader](https://webpack.github.io/docs/loaders.html) を使用しています。簡単な説明としては:
-
-- `!!`は "グローバル設定からすべてのローダを無効にする"ことを意味します；
-- `vue-loader？inject！` は  `vue-loader` を使い、`？inject` クエリを渡す"ことを意味します。 これは `vue-loader` に、依存性注入モードでコンポーネントをコンパイルするように指示します。
-
-返される `ExampleInjector` は、`example.vue` モジュールのインスタンスを生成するために呼び出すことができるファクトリ関数です:
-
-``` js
-const ExampleWithMocks = ExampleInjector({
-  // モック
-  '../service': {
-    msg: 'Hello from a mocked service!'
-  }
-})
-```
-
-最後に、コンポーネントを通常どおりテストすることができます:
-
-``` js
-it('should render', () => {
-  const vm = new Vue({
-    template: '<div><test></test></div>',
-    components: {
-      'test': ExampleWithMocks
-    }
-  }).$mount()
-  expect(vm.$el.querySelector('.msg').textContent).toBe('Hello from a mocked service!')
-})
-```
diff --git a/docs/ja/workflow/testing.md b/docs/ja/workflow/testing.md
index 7d5fb830d..3b22e87e3 100644
--- a/docs/ja/workflow/testing.md
+++ b/docs/ja/workflow/testing.md
@@ -1,101 +1,4 @@
 # テスト
 
-> [webpack vue-cli テンプレート](https://github.com/vuejs-templates/webpack)には、事前に設定された単体テストと e2e テストの設定が用意されています。
-
-`* .vue`ファイルをテストするときには、普通の CommonJS ベースのテストランナーを使うことができません。なぜならそのテストランナーは `*.vue` ファイルの扱い方を知らないからです。代わりに、webpack + vue-loader を使用してテストファイルをバンドルします。推奨設定は [Karma](http://karma-runner.github.io/0.13/index.html) と [karma-webpack](https://github.com/webpack/karma-webpack) です。
-
-Karma はブラウザを起動してテストを実行するテストランナーです。テストするブラウザと、使用するテストフレームワーク（たとえば、MochaやJasmineなど）を選択できます。[PhantomJS](http://phantomjs.org/) のテストを[Jasmine](http://jasmine.github.io/edge/introduction.html) テストフレームワークで実行する Karma の設定例を次に示します:
-
-``` bash
-npm install\
-  karma karma-webpack\
-  karma-jasmine jasmine-core\
-  karma-phantomjs-launcher phantomjs-prebuilt\
-  --save-dev
-```
-
-``` js
-// 要求があれば同じwebpackの設定を使用することが可能です
-// ただし、テスト中に元のエントリが不要なので、
-// 元のエントリを削除することを忘れないでください
-var webpackConfig = require('./webpack.config.js')
-delete webpackConfig.entry
-
-// karma.conf.js
-module.exports = function (config) {
-  config.set({
-    browsers: ['PhantomJS'],
-    frameworks: ['jasmine'],
-    // これはすべてのテストのエントリーファイルです。
-    files: ['test/index.js'],
-    // バンドルのためにエントリーファイルをwebpackに渡します。
-    preprocessors: {
-      'test/index.js': ['webpack']
-    },
-    // webpackの設定を使用します
-    webpack: webpackConfig,
-    // 不要なテキスト出力を回避します
-    webpackMiddleware: {
-      noInfo: true
-    },
-    singleRun: true
-  })
-}
-```
-
-そして`test/index.js`ファイルのエントリの場合:
-
-``` js
-// test/index.js
-// 特別なwebpackの機能を使用してすべてのテストファイルを必要とさせます
-// https://webpack.github.io/docs/context.html#require-context
-var testsContext = require.context('.', true, /\.spec$/)
-testsContext.keys().forEach(testsContext)
-```
-
-このエントリファイルは、単に同じフォルダ内の `.spec.js` で終わる他のすべてのファイルを必要とします。これで実際にいくつかのテストを書くことができます:
-
-``` js
-// test/component-a.spec.js
-var Vue = require('vue')
-var ComponentA = require('../../src/components/a.vue')
-
-describe('a.vue', function () {
-
-  // JavaScriptのオプションのアサーション
-  it('should have correct message', function () {
-    expect(ComponentA.data().msg).toBe('Hello from Component A!')
-  })
-
-  // 実際にコンポーネントをレンダリングしてレンダリングされた結果をアサートします
-  it('should render correct message', function () {
-    var vm = new Vue({
-      template: '<div><test></test></div>',
-      components: {
-        'test': ComponentA
-      }
-    }).$mount()
-    expect(vm.$el.querySelector('h2.red').textContent).toBe('Hello from Component A!')
-  })
-})
-```
-
-テストを実行するには、次の NPM スクリプトを追加します:
-
-``` js
-// package.json
-...
-"scripts": {
-  ...
-  "test": "karma start karma.conf.js"
-}
-...
-```
-
-最後に実行します:
-
-``` bash
-npm test
-```
-
-最後にもう一度、[こちらを参照してください](https://github.com/vuejs-templates/webpack)。テストに関する完全な実例が含まれています。
+- [@vue/cli](https://github.com/vuejs/vue-cli) は事前に設定されたユニットテストと e2e テストのセットアップを提供します。
+- `* .vue` ファイルのユニットテストを手動で設定する場合は、[`@vue/test-utils` のドキュメント](https://vue-test-utils.vuejs.org/ja/)を参照してください。

From 62cfe99a98bea500590ecadd62839626ee8de952 Mon Sep 17 00:00:00 2001
From: kazuya kawaguchi <kawakazu80@gmail.com>
Date: Fri, 9 Mar 2018 10:57:12 +0900
Subject: [PATCH 862/877] docs: consistency of vue files notation (#1183)

---
 docs/en/options.md    | 2 +-
 docs/ja/options.md    | 2 +-
 docs/zh-cn/options.md | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index 5fff6ece0..a1496b70f 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -87,7 +87,7 @@ module.exports = {
 
 ### postcss
 
-> Note: It is recommended to use a PostCSS config file instead so that your styles in vue files and normal CSS can share the same config. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
+> Note: It is recommended to use a PostCSS config file instead so that your styles in `*.vue` files and normal CSS can share the same config. [The usage is the same as `postcss-loader`](https://github.com/postcss/postcss-loader#usage).
 
 - type: `Array` or `Function` or `Object`
 
diff --git a/docs/ja/options.md b/docs/ja/options.md
index bb243211e..7f823d362 100644
--- a/docs/ja/options.md
+++ b/docs/ja/options.md
@@ -86,7 +86,7 @@ module.exports = {
 
 ### postcss
 
-  > メモ: 代わりに、vue ファイルと通常の CSS が同じ設定を共有することができるため、PostCSS 設定ファイルの使用を推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
+  > メモ: 代わりに、`*.vue` ファイルと通常の CSS が同じ設定を共有することができるため、PostCSS 設定ファイルの使用を推奨されています。[使用法は `postcss-loader` と同じです](https://github.com/postcss/postcss-loader#usage)。
 
 - 型: `Array` もしくは `Function` か `Object`
 
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index a6775b817..b94f98fe1 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -86,11 +86,11 @@ module.exports = {
 
 ### postcss
 
-> 注意：这里推荐使用 PostCSS 配置文件代替，这样你的 `.vue` 文件中的样式和普通的 CSS 样式可以共享相同的配置。[用法和 `postcss-loader` 相同](https://github.com/postcss/postcss-loader#usage)。
+> 注意：这里推荐使用 PostCSS 配置文件代替，这样你的 `*.vue` 文件中的样式和普通的 CSS 样式可以共享相同的配置。[用法和 `postcss-loader` 相同](https://github.com/postcss/postcss-loader#usage)。
 
 - 类型：`Array` or `Function` or `Object`
 
-  指定要应用于 `.vue` 文件中 CSS 的自定义 PostCSS 插件。如果使用函数，函数将使用相同的 loader 上下文调用，并返回一个插件数组。
+  指定要应用于 `*.vue` 文件中 CSS 的自定义 PostCSS 插件。如果使用函数，函数将使用相同的 loader 上下文调用，并返回一个插件数组。
 
   ``` js
   // ...

From f06e3e7d010f0bcecc1aaac66af6d312e09e86bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Fri, 9 Mar 2018 21:24:49 +0800
Subject: [PATCH 863/877] refactor: sorted all current test cases into some
 groups (#1101)

* adjusted structure of current test cases

* resorted test cases

* separeted all test cases into files
---
 test/advanced.js |  272 +++++++++++
 test/basic.js    |  105 +++++
 test/custom.js   |  156 +++++++
 test/script.js   |   34 ++
 test/shared.js   |  139 ++++++
 test/ssr.js      |   78 ++++
 test/style.js    |  221 +++++++++
 test/template.js |  251 ++++++++++
 test/test.js     | 1161 ----------------------------------------------
 9 files changed, 1256 insertions(+), 1161 deletions(-)
 create mode 100644 test/advanced.js
 create mode 100644 test/basic.js
 create mode 100644 test/custom.js
 create mode 100644 test/script.js
 create mode 100644 test/shared.js
 create mode 100644 test/ssr.js
 create mode 100644 test/style.js
 create mode 100644 test/template.js
 delete mode 100644 test/test.js

diff --git a/test/advanced.js b/test/advanced.js
new file mode 100644
index 000000000..23f7e583c
--- /dev/null
+++ b/test/advanced.js
@@ -0,0 +1,272 @@
+process.env.VUE_LOADER_TEST = true
+
+const path = require('path')
+const { expect } = require('chai')
+const {
+  mfs,
+  loaderPath,
+  bundle,
+  test,
+  mockRender
+} = require('./shared')
+
+const normalizeNewline = require('normalize-newline')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const SourceMapConsumer = require('source-map').SourceMapConsumer
+
+describe('advanced features', () => {
+  it('pre/post loaders', done => {
+    test({
+      entry: 'basic.vue',
+      vue: {
+        preLoaders: {
+          js: require.resolve('./mock-loaders/js'),
+          css: require.resolve('./mock-loaders/css')
+        },
+        postLoaders: {
+          html: require.resolve('./mock-loaders/html')
+        }
+      }
+    }, (window, module) => {
+      const vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      // <h2 class="green">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('green')
+      expect(vnode.children[0].text).to.equal('hi')
+
+      expect(module.data().msg).to.contain('Changed!')
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('comp-a h2 {\n  color: #00f;\n}')
+      done()
+    })
+  })
+
+  it('support chaining with other loaders', done => {
+    const mockLoaderPath = require.resolve('./mock-loaders/js')
+    test({
+      entry: 'basic.vue',
+      modify: config => {
+        config.module.rules[0].loader = loaderPath + '!' + mockLoaderPath
+      }
+    }, (window, module) => {
+      expect(module.data().msg).to.equal('Changed!')
+      done()
+    })
+  })
+
+  it('expose filename', done => {
+    test({
+      entry: 'basic.vue'
+    }, (window, module, rawModule) => {
+      expect(module.__file).to.equal(path.normalize('test/fixtures/basic.vue'))
+      done()
+    })
+  })
+
+  it('extract CSS', done => {
+    bundle({
+      entry: 'extract-css.vue',
+      vue: {
+        loaders: {
+          css: ExtractTextPlugin.extract('css-loader'),
+          stylus: ExtractTextPlugin.extract('css-loader?sourceMap!stylus-loader')
+        }
+      },
+      plugins: [
+        new ExtractTextPlugin('test.output.css')
+      ]
+    }, (code, warnings) => {
+      let css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('h1 {\n  color: #f00;\n}')
+      expect(css).to.contain('h2 {\n  color: green;\n}')
+      done()
+    })
+  })
+
+  it('extract CSS using option', done => {
+    bundle({
+      entry: 'extract-css.vue',
+      vue: {
+        extractCSS: true
+      },
+      plugins: [
+        new ExtractTextPlugin('test.output.css')
+      ]
+    }, (code, warnings) => {
+      let css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('h1 {\n  color: #f00;\n}')
+      expect(css).to.contain('h2 {\n  color: green;\n}')
+      done()
+    })
+  })
+
+  it('extract CSS using option (passing plugin instance)', done => {
+    const plugin = new ExtractTextPlugin('test.output.css')
+    bundle({
+      entry: 'extract-css.vue',
+      vue: {
+        extractCSS: plugin
+      },
+      plugins: [
+        plugin
+      ]
+    }, (code, warnings) => {
+      let css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('h1 {\n  color: #f00;\n}')
+      expect(css).to.contain('h2 {\n  color: green;\n}')
+      done()
+    })
+  })
+
+  it('pre-processors with extract css', done => {
+    test({
+      entry: 'pre.vue',
+      vue: {
+        extractCSS: true
+      },
+      plugins: [
+        new ExtractTextPlugin('test.output.css')
+      ]
+    }, (window, module) => {
+      const vnode = mockRender(module)
+
+      expect(vnode.children[0].tag).to.equal('h1')
+      expect(vnode.children[1].tag).to.equal('comp-a')
+      expect(vnode.children[2].tag).to.equal('comp-b')
+
+      expect(module.data().msg).to.contain('Hello from coffee!')
+
+      let css = mfs.readFileSync('/test.output.css').toString()
+      css = normalizeNewline(css)
+      expect(css).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
+
+      done()
+    })
+  })
+
+  it('source map', done => {
+    bundle({
+      entry: 'basic.vue',
+      devtool: '#source-map'
+    }, (code, warnings) => {
+      const map = mfs.readFileSync('/test.build.js.map', 'utf-8')
+      const smc = new SourceMapConsumer(JSON.parse(map))
+      let line
+      let col
+      const targetRE = /^\s+msg: 'Hello from Component A!'/
+      code.split(/\r?\n/g).some((l, i) => {
+        if (targetRE.test(l)) {
+          line = i + 1
+          col = 0
+          return true
+        }
+      })
+      const pos = smc.originalPositionFor({
+        line: line,
+        column: col
+      })
+      expect(pos.source.indexOf('basic.vue') > -1)
+      expect(pos.line).to.equal(9)
+      done()
+    })
+  })
+
+  it('multiple rule definitions', done => {
+    test({
+      modify: config => {
+        // remove default rule
+        config.module.rules.shift()
+      },
+      entry: './test/fixtures/multiple-rules.js',
+      module: {
+        rules: [
+          {
+            test: /\.vue$/,
+            oneOf: [
+              {
+                include: /-1\.vue$/,
+                loader: loaderPath,
+                options: {
+                  postcss: [
+                    css => {
+                      css.walkDecls('font-size', decl => {
+                        decl.value = `${parseInt(decl.value, 10) * 2}px`
+                      })
+                    }
+                  ],
+                  compilerModules: [{
+                    postTransformNode: el => {
+                      el.staticClass = '"multiple-rule-1"'
+                    }
+                  }]
+                }
+              },
+              {
+                include: /-2\.vue$/,
+                loader: loaderPath,
+                options: {
+                  postcss: [
+                    css => {
+                      css.walkDecls('font-size', decl => {
+                        decl.value = `${parseInt(decl.value, 10) / 2}px`
+                      })
+                    }
+                  ],
+                  compilerModules: [{
+                    postTransformNode: el => {
+                      el.staticClass = '"multiple-rule-2"'
+                    }
+                  }]
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }, (window, module) => {
+      const vnode1 = mockRender(window.rules[0])
+      const vnode2 = mockRender(window.rules[1])
+      expect(vnode1.data.staticClass).to.equal('multiple-rule-1')
+      expect(vnode2.data.staticClass).to.equal('multiple-rule-2')
+      const styles = window.document.querySelectorAll('style')
+      const expr = /\.multiple-rule-\d\s*\{\s*font-size:\s*([.0-9]+)px;/
+      for (let i = 0, l = styles.length; i < l; i++) {
+        const content = styles[i].textContent
+        if (expr.test(content)) {
+          expect(parseFloat(RegExp.$1)).to.be.equal(14)
+        }
+      }
+      done()
+    })
+  })
+
+  it('thread mode', done => {
+    test({
+      entry: 'basic.vue',
+      vue: {
+        threadMode: true
+      }
+    }, (window, module, rawModule) => {
+      const vnode = mockRender(module, {
+        msg: 'hi'
+      })
+
+      // <h2 class="red">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('red')
+      expect(vnode.children[0].text).to.equal('hi')
+
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
+      done()
+    })
+  })
+})
diff --git a/test/basic.js b/test/basic.js
new file mode 100644
index 000000000..5668239b4
--- /dev/null
+++ b/test/basic.js
@@ -0,0 +1,105 @@
+process.env.VUE_LOADER_TEST = true
+
+const { expect } = require('chai')
+const {
+  genId,
+  test,
+  mockRender,
+  initStylesForAllSubComponents
+} = require('./shared')
+
+const normalizeNewline = require('normalize-newline')
+
+describe('basic usage', () => {
+  it('basic', done => {
+    test({
+      entry: 'basic.vue'
+    }, (window, module, rawModule) => {
+      const vnode = mockRender(module, {
+        msg: 'hi'
+      })
+
+      // <h2 class="red">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.staticClass).to.equal('red')
+      expect(vnode.children[0].text).to.equal('hi')
+
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
+      done()
+    })
+  })
+
+  it('pre-processors', done => {
+    test({
+      entry: 'pre.vue'
+    }, (window, module) => {
+      const vnode = mockRender(module)
+      // div
+      //   h1 This is the app
+      //   comp-a
+      //   comp-b
+      expect(vnode.children[0].tag).to.equal('h1')
+      expect(vnode.children[1].tag).to.equal('comp-a')
+      expect(vnode.children[2].tag).to.equal('comp-b')
+
+      expect(module.data().msg).to.contain('Hello from coffee!')
+      const style = window.document.querySelector('style').textContent
+      expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
+      done()
+    })
+  })
+
+  it('style import', done => {
+    test({
+      entry: 'style-import.vue'
+    }, (window) => {
+      const styles = window.document.querySelectorAll('style')
+      expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
+      // import with scoped
+      const id = 'data-v-' + genId('style-import.vue')
+      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
+      done()
+    })
+  })
+
+  it('style import for a same file twice', done => {
+    test({
+      entry: 'style-import-twice.vue'
+    }, (window, module) => {
+      initStylesForAllSubComponents(module)
+      const styles = window.document.querySelectorAll('style')
+      expect(styles.length).to.equal(3)
+      expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
+      // import with scoped
+      const id = 'data-v-' + genId('style-import-twice.vue')
+      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
+      const id2 = 'data-v-' + genId('style-import-twice-sub.vue')
+      expect(styles[2].textContent).to.contain('h1[' + id2 + '] { color: green;\n}')
+      done()
+    })
+  })
+
+  it('template import', done => {
+    test({
+      entry: 'template-import.vue'
+    }, (window, module) => {
+      const vnode = mockRender(module)
+      // '<div><h1>hello</h1></div>'
+      expect(vnode.children[0].tag).to.equal('h1')
+      expect(vnode.children[0].children[0].text).to.equal('hello')
+      done()
+    })
+  })
+
+  it('script import', done => {
+    test({
+      entry: 'script-import.vue'
+    }, (window, module) => {
+      expect(module.data().msg).to.contain('Hello from Component A!')
+      done()
+    })
+  })
+})
diff --git a/test/custom.js b/test/custom.js
new file mode 100644
index 000000000..9056dbfea
--- /dev/null
+++ b/test/custom.js
@@ -0,0 +1,156 @@
+process.env.VUE_LOADER_TEST = true
+
+const { expect } = require('chai')
+const {
+  mfs,
+  bundle,
+  test,
+  mockRender
+} = require('./shared')
+
+const normalizeNewline = require('normalize-newline')
+const webpack = require('webpack')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+
+describe('custom block features', () => {
+  it('extract custom blocks to a separate file', done => {
+    bundle({
+      entry: 'custom-language.vue',
+      vue: {
+        loaders: {
+          'documentation': ExtractTextPlugin.extract('raw-loader')
+        }
+      },
+      plugins: [
+        new ExtractTextPlugin('doc.md')
+      ]
+    }, (code, warnings) => {
+      let unitTest = mfs.readFileSync('/doc.md').toString()
+      unitTest = normalizeNewline(unitTest)
+      expect(unitTest).to.contain('This is example documentation for a component.')
+      done()
+    })
+  })
+
+  it('add custom blocks to the webpack output', done => {
+    bundle({
+      entry: 'custom-language.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'babel-loader'
+        }
+      }
+    }, (code, warnings) => {
+      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('custom blocks work with src imports', done => {
+    bundle({
+      entry: 'custom-import.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'babel-loader'
+        }
+      }
+    }, (code, warnings) => {
+      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('passes Component to custom block loaders', done => {
+    const mockLoaderPath = require.resolve('./mock-loaders/docs')
+    test({
+      entry: 'custom-language.vue',
+      vue: {
+        loaders: {
+          'documentation': mockLoaderPath
+        }
+      }
+    }, (window, module) => {
+      expect(module.__docs).to.contain('This is example documentation for a component.')
+      done()
+    })
+  })
+
+  it('custom blocks can be ignored', done => {
+    bundle({
+      entry: 'custom-language.vue'
+    }, (code, warnings) => {
+      expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('custom blocks with ES module default export', done => {
+    test({
+      entry: 'custom-blocks.vue',
+      vue: {
+        loaders: {
+          esm: require.resolve('./mock-loaders/identity')
+        }
+      }
+    }, (window, module) => {
+      // option added by custom block code
+      expect(module.foo).to.equal(1)
+      done()
+    })
+  })
+
+  it('passes attributes as options to the loader', done => {
+    bundle({
+      entry: 'custom-options.vue',
+      vue: {
+        loaders: {
+          'unit-test': 'babel-loader!skeleton-loader'
+        }
+      },
+      plugins: [
+        new webpack.LoaderOptionsPlugin({
+          options: {
+            skeletonLoader: {
+              procedure: (content, sourceMap, callback, options) => {
+                expect(options.foo).to.equal('bar')
+                expect(options.opt2).to.equal('value2')
+
+                // Return the content to output.
+                return content
+              }
+            }
+          }
+        })
+      ]
+    }, (code, warnings) => {
+      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
+      done()
+    })
+  })
+
+  it('pre/post loaders for custom blocks', done => {
+    test({
+      entry: 'custom-blocks.vue',
+      vue: {
+        preLoaders: {
+          i18n: require.resolve('./mock-loaders/yaml')
+        },
+        loaders: {
+          i18n: require.resolve('./mock-loaders/i18n'),
+          blog: 'marked'
+        },
+        postLoaders: {
+          blog: require.resolve('./mock-loaders/blog')
+        }
+      }
+    }, (window, module) => {
+      const vnode = mockRender(module, {
+        msg: JSON.parse(module.__i18n).en.hello,
+        blog: module.__blog
+      })
+      expect(vnode.children[0].children[0].text).to.equal('hello world')
+      expect(vnode.children[2].data.domProps.innerHTML).to.equal('<h2 id="foo">foo</h2>')
+      done()
+    })
+  })
+})
diff --git a/test/script.js b/test/script.js
new file mode 100644
index 000000000..c0644669e
--- /dev/null
+++ b/test/script.js
@@ -0,0 +1,34 @@
+process.env.VUE_LOADER_TEST = true
+
+const { expect } = require('chai')
+const {
+  test,
+  mockRender
+} = require('./shared')
+
+describe('script block features', () => {
+  it('allows to export extended constructor', done => {
+    test({
+      entry: 'extend.vue'
+    }, (window, Module) => {
+      // extend.vue should export Vue constructor
+      const vnode = mockRender(Module.options, {
+        msg: 'success'
+      })
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.children[0].text).to.equal('success')
+      expect(new Module().msg === 'success')
+      done()
+    })
+  })
+
+  it('named exports', done => {
+    test({
+      entry: 'named-exports.vue'
+    }, (window, _, rawModule) => {
+      expect(rawModule.default.name).to.equal('named-exports')
+      expect(rawModule.foo()).to.equal(1)
+      done()
+    })
+  })
+})
diff --git a/test/shared.js b/test/shared.js
new file mode 100644
index 000000000..8790f0272
--- /dev/null
+++ b/test/shared.js
@@ -0,0 +1,139 @@
+const path = require('path')
+const jsdom = require('jsdom')
+const webpack = require('webpack')
+const merge = require('webpack-merge')
+const MemoryFS = require('memory-fs')
+const { expect } = require('chai')
+const hash = require('hash-sum')
+const Vue = require('vue')
+
+const mfs = new MemoryFS()
+const loaderPath = path.resolve(__dirname, '../index.js')
+const globalConfig = {
+  // mode: 'development',
+  devtool: false,
+  output: {
+    path: '/',
+    filename: 'test.build.js'
+  },
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: loaderPath
+      }
+    ]
+  },
+  plugins: [
+    new webpack.optimize.ModuleConcatenationPlugin()
+  ]
+}
+
+function genId (file) {
+  return hash(path.join('test', 'fixtures', file))
+}
+
+function bundle (options, cb, wontThrowError) {
+  let config = merge({}, globalConfig, options)
+
+  if (config.vue) {
+    const vueOptions = options.vue
+    delete config.vue
+    const vueIndex = config.module.rules.findIndex(r => r.test.test('.vue'))
+    const vueRule = config.module.rules[vueIndex]
+    config.module.rules[vueIndex] = Object.assign({}, vueRule, { options: vueOptions })
+  }
+
+  if (/\.vue$/.test(config.entry)) {
+    const vueFile = config.entry
+    config = merge(config, {
+      entry: require.resolve('./fixtures/entry'),
+      resolve: {
+        alias: {
+          '~target': path.resolve(__dirname, './fixtures', vueFile)
+        }
+      }
+    })
+  }
+
+  if (options.modify) {
+    delete config.modify
+    options.modify(config)
+  }
+
+  const webpackCompiler = webpack(config)
+  webpackCompiler.outputFileSystem = mfs
+  webpackCompiler.run((err, stats) => {
+    const errors = stats.compilation.errors
+    if (!wontThrowError) {
+      expect(err).to.be.null
+      if (errors && errors.length) {
+        errors.forEach(error => {
+          console.error(error.message)
+        })
+      }
+      expect(errors).to.be.empty
+    }
+    cb(mfs.readFileSync('/test.build.js').toString(), stats, err)
+  })
+}
+
+function test (options, assert, wontThrowError) {
+  bundle(options, (code, stats, err) => {
+    jsdom.env({
+      html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
+      src: [code],
+      done: (errors, window) => {
+        if (errors) {
+          console.log(errors[0].data.error.stack)
+          if (!wontThrowError) {
+            expect(errors).to.be.null
+          }
+        }
+        const module = interopDefault(window.vueModule)
+        const instance = {}
+        if (module && module.beforeCreate) {
+          module.beforeCreate.forEach(hook => hook.call(instance))
+        }
+        assert(window, module, window.vueModule, instance, errors, { stats, err })
+      }
+    })
+  }, wontThrowError)
+}
+
+function mockRender (options, data = {}) {
+  const vm = new Vue(Object.assign({}, options, { data () { return data } }))
+  vm.$mount()
+  return vm._vnode
+}
+
+function interopDefault (module) {
+  return module
+    ? module.default ? module.default : module
+    : module
+}
+
+function initStylesForAllSubComponents (module) {
+  if (module.components) {
+    for (const name in module.components) {
+      const sub = module.components[name]
+      const instance = {}
+      if (sub && sub.beforeCreate) {
+        sub.beforeCreate.forEach(hook => hook.call(instance))
+      }
+      initStylesForAllSubComponents(sub)
+    }
+  }
+}
+
+module.exports = {
+  mfs,
+  loaderPath,
+  globalConfig,
+  genId,
+  bundle,
+  test,
+  mockRender,
+  interopDefault,
+  initStylesForAllSubComponents
+}
diff --git a/test/ssr.js b/test/ssr.js
new file mode 100644
index 000000000..e3c950a7f
--- /dev/null
+++ b/test/ssr.js
@@ -0,0 +1,78 @@
+process.env.VUE_LOADER_TEST = true
+
+const { expect } = require('chai')
+
+const {
+  bundle,
+  interopDefault,
+  globalConfig
+} = require('./shared')
+
+const SSR = require('vue-server-renderer')
+
+describe('SSR', () => {
+  it('css-modules in SSR', done => {
+    bundle({
+      entry: 'css-modules.vue',
+      target: 'node',
+      output: Object.assign({}, globalConfig.output, {
+        libraryTarget: 'commonjs2'
+      })
+    }, (code, warnings) => {
+      // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
+      function requireFromString (src, filename) {
+        const Module = module.constructor
+        const m = new Module()
+        m._compile(src, filename)
+        return m.exports
+      }
+
+      const output = interopDefault(requireFromString(code, './test.build.js'))
+      const mockInstance = {}
+
+      output.beforeCreate.forEach(hook => hook.call(mockInstance))
+      expect(mockInstance.style.red).to.exist
+
+      done()
+    })
+  })
+
+  it('SSR style and moduleId extraction', done => {
+    bundle({
+      target: 'node',
+      entry: './test/fixtures/ssr-style.js',
+      output: {
+        path: '/',
+        filename: 'test.build.js',
+        libraryTarget: 'commonjs2'
+      },
+      externals: ['vue']
+    }, code => {
+      const renderer = SSR.createBundleRenderer(code, {
+        basedir: __dirname,
+        runInNewContext: 'once'
+      })
+      const context = {
+        _registeredComponents: new Set()
+      }
+      renderer.renderToString(context, (err, res) => {
+        if (err) return done(err)
+        expect(res).to.contain('data-server-rendered')
+        expect(res).to.contain('<h1>Hello</h1>')
+        expect(res).to.contain('Hello from Component A!')
+        expect(res).to.contain('<div class="foo">functional</div>')
+        // from main component
+        expect(context.styles).to.contain('h1 { color: green;')
+        // from imported child component
+        expect(context.styles).to.contain('comp-a h2 {\n  color: #f00;')
+        // from imported css file
+        expect(context.styles).to.contain('h1 { color: red;')
+        // from imported functional component
+        expect(context.styles).to.contain('.foo { color: red;')
+        // collect component identifiers during render
+        expect(Array.from(context._registeredComponents).length).to.equal(3)
+        done()
+      })
+    })
+  })
+})
diff --git a/test/style.js b/test/style.js
new file mode 100644
index 000000000..c3a0c5cd0
--- /dev/null
+++ b/test/style.js
@@ -0,0 +1,221 @@
+process.env.VUE_LOADER_TEST = true
+
+const fs = require('fs')
+const path = require('path')
+const { expect } = require('chai')
+const {
+  genId,
+  test,
+  mockRender
+} = require('./shared')
+
+const normalizeNewline = require('normalize-newline')
+
+describe('style block features', () => {
+  it('scoped style', done => {
+    test({
+      entry: 'scoped-css.vue'
+    }, (window, module) => {
+      const id = 'data-v-' + genId('scoped-css.vue')
+      expect(module._scopeId).to.equal(id)
+
+      const vnode = mockRender(module, {
+        ok: true
+      })
+      // <div>
+      //   <div><h1>hi</h1></div>
+      //   <p class="abc def">hi</p>
+      //   <template v-if="ok"><p class="test">yo</p></template>
+      //   <svg><template><p></p></template></svg>
+      // </div>
+      expect(vnode.children[0].tag).to.equal('div')
+      expect(vnode.children[1].text).to.equal(' ')
+      expect(vnode.children[2].tag).to.equal('p')
+      expect(vnode.children[2].data.staticClass).to.equal('abc def')
+      expect(vnode.children[4].tag).to.equal('p')
+      expect(vnode.children[4].data.staticClass).to.equal('test')
+
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain(`.test[${id}] {\n  color: yellow;\n}`)
+      expect(style).to.contain(`.test[${id}]:after {\n  content: \'bye!\';\n}`)
+      expect(style).to.contain(`h1[${id}] {\n  color: green;\n}`)
+      // scoped keyframes
+      expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id} 5s infinite, other 5s;`)
+      expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
+      expect(style).to.contain(`.anim-3[${id}] {\n  animation: 5s color-${id} infinite, 5s other;`)
+      expect(style).to.contain(`@keyframes color-${id} {`)
+      expect(style).to.contain(`@-webkit-keyframes color-${id} {`)
+
+      expect(style).to.contain(`.anim-multiple[${id}] {\n  animation: color-${id} 5s infinite,opacity-${id} 2s;`)
+      expect(style).to.contain(`.anim-multiple-2[${id}] {\n  animation-name: color-${id},opacity-${id};`)
+      expect(style).to.contain(`@keyframes opacity-${id} {`)
+      expect(style).to.contain(`@-webkit-keyframes opacity-${id} {`)
+      // >>> combinator
+      expect(style).to.contain(`.foo p[${id}] .bar {\n  color: red;\n}`)
+      done()
+    })
+  })
+
+  it('media-query', done => {
+    test({
+      entry: 'media-query.vue'
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      const id = 'data-v-' + genId('media-query.vue')
+      expect(style).to.contain('@media print {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
+      done()
+    })
+  })
+
+  it('supports-query', done => {
+    test({
+      entry: 'supports-query.vue'
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      const id = 'data-v-' + genId('supports-query.vue')
+      expect(style).to.contain('@supports ( color: #000 ) {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
+      done()
+    })
+  })
+
+  it('postcss options', done => {
+    test({
+      entry: 'postcss.vue',
+      vue: {
+        postcss: {
+          options: {
+            parser: require('sugarss')
+          }
+        }
+      }
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      done()
+    })
+  })
+
+  it('load postcss config file', done => {
+    fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
+    test({
+      entry: 'postcss.vue'
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      fs.unlinkSync('.postcssrc')
+      done()
+    })
+  })
+
+  it('load cascading postcss config file', done => {
+    fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
+    test({
+      entry: 'sub/postcss-cascade.vue',
+      vue: { postcss: { cascade: true }}
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('display: -webkit-box')
+      fs.unlinkSync('.postcssrc')
+      done()
+    })
+  })
+
+  it('load postcss config file by path', done => {
+    fs.writeFileSync('test/.postcssrc', JSON.stringify({ parser: 'sugarss' }))
+    test({
+      entry: 'postcss.vue',
+      vue: {
+        postcss: {
+          config: {
+            path: path.resolve('test')
+          }
+        }
+      }
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      fs.unlinkSync('test/.postcssrc')
+      done()
+    })
+  })
+
+  it('load postcss config file with js syntax error', done => {
+    fs.writeFileSync('.postcssrc.js', 'module.exports = { hello }')
+    test({
+      entry: 'basic.vue'
+    }, (window, module, vueModule, instance, jsdomErr, webpackInfo) => {
+      const { stats: { compilation: { warnings, errors }}, err } = webpackInfo
+      expect(jsdomErr).to.be.null
+      expect(err).to.be.null
+      expect(errors).to.be.empty
+      expect(warnings.length).to.equal(1)
+      expect(warnings[0]).to.match(/Error loading PostCSS config\:/)
+      fs.unlinkSync('.postcssrc.js')
+      done()
+    }, true)
+  })
+
+  it('postcss lang', done => {
+    test({
+      entry: 'postcss-lang.vue'
+    }, (window) => {
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
+      done()
+    })
+  })
+
+  it('css-modules', done => {
+    function testWithIdent (localIdentName, regexToMatch, cb) {
+      test({
+        entry: 'css-modules.vue',
+        vue: {
+          cssModules: localIdentName && {
+            localIdentName: localIdentName
+          }
+        }
+      }, (window, module, raw, instance) => {
+        // get local class name
+        const className = instance.style.red
+        expect(className).to.match(regexToMatch)
+
+        // class name in style
+        let style = [].slice.call(window.document.querySelectorAll('style')).map((style) => {
+          return style.textContent
+        }).join('\n')
+        style = normalizeNewline(style)
+        expect(style).to.contain('.' + className + ' {\n  color: red;\n}')
+
+        // animation name
+        const match = style.match(/@keyframes\s+(\S+)\s+{/)
+        expect(match).to.have.length(2)
+        const animationName = match[1]
+        expect(animationName).to.not.equal('fade')
+        expect(style).to.contain('animation: ' + animationName + ' 1s;')
+
+        // default module + pre-processor + scoped
+        const anotherClassName = instance.$style.red
+        expect(anotherClassName).to.match(regexToMatch).and.not.equal(className)
+        const id = 'data-v-' + genId('css-modules.vue')
+        expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
+
+        cb()
+      })
+    }
+    // default localIdentName
+    testWithIdent(undefined, /^red_\w{8}/, () => {
+      // specified localIdentName
+      const ident = '[path][name]---[local]---[hash:base64:5]'
+      const regex = /css-modules---red---\w{5}/
+      testWithIdent(ident, regex, done)
+    })
+  })
+})
diff --git a/test/template.js b/test/template.js
new file mode 100644
index 000000000..a4a70f037
--- /dev/null
+++ b/test/template.js
@@ -0,0 +1,251 @@
+process.env.VUE_LOADER_TEST = true
+
+const path = require('path')
+const { expect } = require('chai')
+const {
+  test,
+  mockRender
+} = require('./shared')
+
+const normalizeNewline = require('normalize-newline')
+
+describe('template block features', () => {
+  it('template with comments', done => {
+    test({
+      entry: 'template-comment.vue'
+    }, (window, module, rawModule) => {
+      expect(module.comments).to.equal(true)
+      const vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.children.length).to.equal(2)
+      expect(vnode.children[0].data.staticClass).to.equal('red')
+      expect(vnode.children[0].children[0].text).to.equal('hi')
+      expect(vnode.children[1].isComment).to.true
+      expect(vnode.children[1].text).to.equal(' comment here ')
+      done()
+    })
+  })
+
+  it('transpile ES2015 features in template', done => {
+    test({
+      entry: 'es2015.vue'
+    }, (window, module) => {
+      const vnode = mockRender(module, {
+        a: 'hello',
+        b: true
+      })
+      // <div :class="{[a]:true}"></div>
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.data.class['test-hello']).to.equal(true)
+      expect(vnode.data.class['b']).to.equal(true)
+      done()
+    })
+  })
+
+  it('translates relative URLs and respects resolve alias', done => {
+    test({
+      entry: 'resolve.vue',
+      resolve: {
+        alias: {
+          fixtures: path.resolve(__dirname, './fixtures')
+        }
+      },
+      module: {
+        rules: [
+          { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
+        ]
+      }
+    }, (window, module) => {
+      const vnode = mockRender(module)
+      // <div>
+      //   <img src="logo.c9e00e.png">
+      //   <img src="logo.c9e00e.png">
+      // </div>
+      expect(vnode.children[0].tag).to.equal('img')
+      expect(vnode.children[0].data.attrs.src).to.equal('logo.c9e00e.png')
+      expect(vnode.children[2].tag).to.equal('img')
+      expect(vnode.children[2].data.attrs.src).to.equal('logo.c9e00e.png')
+
+      const style = window.document.querySelector('style').textContent
+      expect(style).to.contain('html { background-image: url(logo.c9e00e.png);\n}')
+      expect(style).to.contain('body { background-image: url(logo.c9e00e.png);\n}')
+      done()
+    })
+  })
+
+  it('transformToRequire option', done => {
+    test({
+      entry: 'transform.vue',
+      module: {
+        rules: [
+          {
+            test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+            loader: 'url-loader'
+          }
+        ]
+      }
+    }, (window, module) => {
+      function includeDataURL (s) {
+        return !!s.match(/\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*/i)
+      }
+      const vnode = mockRender(module)
+      // img tag
+      expect(includeDataURL(vnode.children[0].data.attrs.src)).to.equal(true)
+      // image tag (SVG)
+      expect(includeDataURL(vnode.children[2].children[0].data.attrs['xlink:href'])).to.equal(true)
+      const style = window.document.querySelector('style').textContent
+
+      const dataURL = vnode.children[0].data.attrs.src
+
+      // image tag with srcset
+      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL)
+      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + ' 2x')
+      // image tag with multiline srcset
+      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + ', ' + dataURL + ' 2x')
+      expect(vnode.children[10].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL)
+      expect(vnode.children[12].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
+      expect(vnode.children[14].data.attrs.srcset).to.equal(dataURL + ', ' + dataURL + ' 2x, ' + dataURL + ' 3x')
+      expect(vnode.children[16].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
+
+      // style
+      expect(includeDataURL(style)).to.equal(true)
+      done()
+    })
+  })
+
+  it('should allow adding custom html loaders', done => {
+    test({
+      entry: 'markdown.vue',
+      vue: {
+        loaders: {
+          html: 'marked'
+        }
+      }
+    }, (window, module) => {
+      const vnode = mockRender(module, {
+        msg: 'hi'
+      })
+      // <h2 id="-msg-">{{msg}}</h2>
+      expect(vnode.tag).to.equal('h2')
+      expect(vnode.data.attrs.id).to.equal('-msg-')
+      expect(vnode.children[0].text).to.equal('hi')
+      done()
+    })
+  })
+
+  it('custom compiler modules', done => {
+    test({
+      entry: 'custom-module.vue',
+      vue: {
+        compilerModules: [
+          {
+            postTransformNode: el => {
+              if (el.staticStyle) {
+                el.staticStyle = `$processStyle(${el.staticStyle})`
+              }
+              if (el.styleBinding) {
+                el.styleBinding = `$processStyle(${el.styleBinding})`
+              }
+            }
+          }
+        ]
+      }
+    }, (window, module) => {
+      const results = []
+      // var vnode =
+      mockRender(
+        Object.assign(module, { methods: { $processStyle: style => results.push(style) }}),
+        { transform: 'translateX(10px)' }
+      )
+      expect(results).to.deep.equal([
+        { 'flex-direction': 'row' },
+        { 'transform': 'translateX(10px)' }
+      ])
+      done()
+    })
+  })
+
+  it('custom compiler directives', done => {
+    test({
+      entry: 'custom-directive.vue',
+      vue: {
+        compilerDirectives: {
+          i18n (el, dir) {
+            if (dir.name === 'i18n' && dir.value) {
+              el.i18n = dir.value
+              if (!el.props) {
+                el.props = []
+              }
+              el.props.push({ name: 'textContent', value: `_s(${JSON.stringify(dir.value)})` })
+            }
+          }
+        }
+      }
+    }, (window, module) => {
+      const vnode = mockRender(module)
+      expect(vnode.data.domProps.textContent).to.equal('keypath')
+      done()
+    })
+  })
+
+  it('functional component with styles', done => {
+    test({
+      entry: 'functional-style.vue'
+    }, (window, module, rawModule) => {
+      expect(module.functional).to.equal(true)
+      const vnode = mockRender(module)
+      // <div class="foo">hi</div>
+      expect(vnode.tag).to.equal('div')
+      expect(vnode.data.class).to.equal('foo')
+      expect(vnode.children[0].text).to.equal('functional')
+
+      let style = window.document.querySelector('style').textContent
+      style = normalizeNewline(style)
+      expect(style).to.contain('.foo { color: red;\n}')
+      done()
+    })
+  })
+
+  it('functional template', done => {
+    test({
+      entry: 'functional-root.vue',
+      vue: {
+        preserveWhitespace: false
+      }
+    }, (window, module) => {
+      expect(module.components.Functional._compiled).to.equal(true)
+      expect(module.components.Functional.functional).to.equal(true)
+      expect(module.components.Functional.staticRenderFns).to.exist
+      expect(module.components.Functional.render).to.be.a('function')
+
+      const vnode = mockRender(module, {
+        fn () {
+          done()
+        }
+      }).children[0]
+
+      // Basic vnode
+      expect(vnode.children[0].data.staticClass).to.equal('red')
+      expect(vnode.children[0].children[0].text).to.equal('hello')
+      // Default slot vnode
+      expect(vnode.children[1].tag).to.equal('span')
+      expect(vnode.children[1].children[0].text).to.equal('hello')
+      // Named slot vnode
+      expect(vnode.children[2].tag).to.equal('div')
+      expect(vnode.children[2].children[0].text).to.equal('Second slot')
+      // // Scoped slot vnode
+      expect(vnode.children[3].text).to.equal('hello')
+      // // Static content vnode
+      expect(vnode.children[4].tag).to.equal('div')
+      expect(vnode.children[4].children[0].text).to.equal('Some ')
+      expect(vnode.children[4].children[1].tag).to.equal('span')
+      expect(vnode.children[4].children[1].children[0].text).to.equal('text')
+      // // v-if vnode
+      expect(vnode.children[5].text).to.equal('')
+
+      vnode.children[6].data.on.click()
+    })
+  })
+})
diff --git a/test/test.js b/test/test.js
deleted file mode 100644
index aff24e89d..000000000
--- a/test/test.js
+++ /dev/null
@@ -1,1161 +0,0 @@
-process.env.VUE_LOADER_TEST = true
-
-const fs = require('fs')
-const path = require('path')
-const jsdom = require('jsdom')
-const webpack = require('webpack')
-const merge = require('webpack-merge')
-const MemoryFS = require('memory-fs')
-const expect = require('chai').expect
-const hash = require('hash-sum')
-const Vue = require('vue')
-const SSR = require('vue-server-renderer')
-// var compiler = require('../lib/template-compiler')
-const normalizeNewline = require('normalize-newline')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const SourceMapConsumer = require('source-map').SourceMapConsumer
-
-const mfs = new MemoryFS()
-const loaderPath = path.resolve(__dirname, '../index.js')
-const globalConfig = {
-  // mode: 'development',
-  devtool: false,
-  output: {
-    path: '/',
-    filename: 'test.build.js'
-  },
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: loaderPath
-      }
-    ]
-  },
-  plugins: [
-    new webpack.optimize.ModuleConcatenationPlugin()
-  ]
-}
-
-function genId (file) {
-  return hash(path.join('test', 'fixtures', file))
-}
-
-function bundle (options, cb, wontThrowError) {
-  let config = merge({}, globalConfig, options)
-
-  if (config.vue) {
-    const vueOptions = options.vue
-    delete config.vue
-    const vueIndex = config.module.rules.findIndex(r => r.test.test('.vue'))
-    const vueRule = config.module.rules[vueIndex]
-    config.module.rules[vueIndex] = Object.assign({}, vueRule, { options: vueOptions })
-  }
-
-  if (/\.vue$/.test(config.entry)) {
-    const vueFile = config.entry
-    config = merge(config, {
-      entry: require.resolve('./fixtures/entry'),
-      resolve: {
-        alias: {
-          '~target': path.resolve(__dirname, './fixtures', vueFile)
-        }
-      }
-    })
-  }
-
-  if (options.modify) {
-    delete config.modify
-    options.modify(config)
-  }
-
-  const webpackCompiler = webpack(config)
-  webpackCompiler.outputFileSystem = mfs
-  webpackCompiler.run((err, stats) => {
-    const errors = stats.compilation.errors
-    if (!wontThrowError) {
-      expect(err).to.be.null
-      if (errors && errors.length) {
-        errors.forEach(error => {
-          console.error(error.message)
-        })
-      }
-      expect(errors).to.be.empty
-    }
-    cb(mfs.readFileSync('/test.build.js').toString(), stats, err)
-  })
-}
-
-function test (options, assert, wontThrowError) {
-  bundle(options, (code, stats, err) => {
-    jsdom.env({
-      html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
-      src: [code],
-      done: (errors, window) => {
-        if (errors) {
-          console.log(errors[0].data.error.stack)
-          if (!wontThrowError) {
-            expect(errors).to.be.null
-          }
-        }
-        const module = interopDefault(window.vueModule)
-        const instance = {}
-        if (module && module.beforeCreate) {
-          module.beforeCreate.forEach(hook => hook.call(instance))
-        }
-        assert(window, module, window.vueModule, instance, errors, { stats, err })
-      }
-    })
-  }, wontThrowError)
-}
-
-function mockRender (options, data = {}) {
-  const vm = new Vue(Object.assign({}, options, { data () { return data } }))
-  vm.$mount()
-  return vm._vnode
-}
-
-function interopDefault (module) {
-  return module
-    ? module.default ? module.default : module
-    : module
-}
-
-function initStylesForAllSubComponents (module) {
-  if (module.components) {
-    for (const name in module.components) {
-      const sub = module.components[name]
-      const instance = {}
-      if (sub && sub.beforeCreate) {
-        sub.beforeCreate.forEach(hook => hook.call(instance))
-      }
-      initStylesForAllSubComponents(sub)
-    }
-  }
-}
-
-describe('vue-loader', () => {
-  it('basic', done => {
-    test({
-      entry: 'basic.vue'
-    }, (window, module, rawModule) => {
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-
-      // <h2 class="red">{{msg}}</h2>
-      expect(vnode.tag).to.equal('h2')
-      expect(vnode.data.staticClass).to.equal('red')
-      expect(vnode.children[0].text).to.equal('hi')
-
-      expect(module.data().msg).to.contain('Hello from Component A!')
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
-      done()
-    })
-  })
-
-  it('expose filename', done => {
-    test({
-      entry: 'basic.vue'
-    }, (window, module, rawModule) => {
-      expect(module.__file).to.equal(path.normalize('test/fixtures/basic.vue'))
-      done()
-    })
-  })
-
-  it('pre-processors', done => {
-    test({
-      entry: 'pre.vue'
-    }, (window, module) => {
-      const vnode = mockRender(module)
-      // div
-      //   h1 This is the app
-      //   comp-a
-      //   comp-b
-      expect(vnode.children[0].tag).to.equal('h1')
-      expect(vnode.children[1].tag).to.equal('comp-a')
-      expect(vnode.children[2].tag).to.equal('comp-b')
-
-      expect(module.data().msg).to.contain('Hello from coffee!')
-      const style = window.document.querySelector('style').textContent
-      expect(style).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
-      done()
-    })
-  })
-
-  it('pre-processors with extract css', done => {
-    test({
-      entry: 'pre.vue',
-      vue: {
-        extractCSS: true
-      },
-      plugins: [
-        new ExtractTextPlugin('test.output.css')
-      ]
-    }, (window, module) => {
-      const vnode = mockRender(module)
-
-      expect(vnode.children[0].tag).to.equal('h1')
-      expect(vnode.children[1].tag).to.equal('comp-a')
-      expect(vnode.children[2].tag).to.equal('comp-b')
-
-      expect(module.data().msg).to.contain('Hello from coffee!')
-
-      let css = mfs.readFileSync('/test.output.css').toString()
-      css = normalizeNewline(css)
-      expect(css).to.contain('body {\n  font: 100% Helvetica, sans-serif;\n  color: #999;\n}')
-
-      done()
-    })
-  })
-
-  it('scoped style', done => {
-    test({
-      entry: 'scoped-css.vue'
-    }, (window, module) => {
-      const id = 'data-v-' + genId('scoped-css.vue')
-      expect(module._scopeId).to.equal(id)
-
-      const vnode = mockRender(module, {
-        ok: true
-      })
-      // <div>
-      //   <div><h1>hi</h1></div>
-      //   <p class="abc def">hi</p>
-      //   <template v-if="ok"><p class="test">yo</p></template>
-      //   <svg><template><p></p></template></svg>
-      // </div>
-      expect(vnode.children[0].tag).to.equal('div')
-      expect(vnode.children[1].text).to.equal(' ')
-      expect(vnode.children[2].tag).to.equal('p')
-      expect(vnode.children[2].data.staticClass).to.equal('abc def')
-      expect(vnode.children[4].tag).to.equal('p')
-      expect(vnode.children[4].data.staticClass).to.equal('test')
-
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain(`.test[${id}] {\n  color: yellow;\n}`)
-      expect(style).to.contain(`.test[${id}]:after {\n  content: \'bye!\';\n}`)
-      expect(style).to.contain(`h1[${id}] {\n  color: green;\n}`)
-      // scoped keyframes
-      expect(style).to.contain(`.anim[${id}] {\n  animation: color-${id} 5s infinite, other 5s;`)
-      expect(style).to.contain(`.anim-2[${id}] {\n  animation-name: color-${id}`)
-      expect(style).to.contain(`.anim-3[${id}] {\n  animation: 5s color-${id} infinite, 5s other;`)
-      expect(style).to.contain(`@keyframes color-${id} {`)
-      expect(style).to.contain(`@-webkit-keyframes color-${id} {`)
-
-      expect(style).to.contain(`.anim-multiple[${id}] {\n  animation: color-${id} 5s infinite,opacity-${id} 2s;`)
-      expect(style).to.contain(`.anim-multiple-2[${id}] {\n  animation-name: color-${id},opacity-${id};`)
-      expect(style).to.contain(`@keyframes opacity-${id} {`)
-      expect(style).to.contain(`@-webkit-keyframes opacity-${id} {`)
-      // >>> combinator
-      expect(style).to.contain(`.foo p[${id}] .bar {\n  color: red;\n}`)
-      done()
-    })
-  })
-
-  it('style import', done => {
-    test({
-      entry: 'style-import.vue'
-    }, (window) => {
-      const styles = window.document.querySelectorAll('style')
-      expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
-      // import with scoped
-      const id = 'data-v-' + genId('style-import.vue')
-      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
-      done()
-    })
-  })
-
-  it('style import for a same file twice', done => {
-    test({
-      entry: 'style-import-twice.vue'
-    }, (window, module) => {
-      initStylesForAllSubComponents(module)
-      const styles = window.document.querySelectorAll('style')
-      expect(styles.length).to.equal(3)
-      expect(styles[0].textContent).to.contain('h1 { color: red;\n}')
-      // import with scoped
-      const id = 'data-v-' + genId('style-import-twice.vue')
-      expect(styles[1].textContent).to.contain('h1[' + id + '] { color: green;\n}')
-      const id2 = 'data-v-' + genId('style-import-twice-sub.vue')
-      expect(styles[2].textContent).to.contain('h1[' + id2 + '] { color: green;\n}')
-      done()
-    })
-  })
-
-  it('template import', done => {
-    test({
-      entry: 'template-import.vue'
-    }, (window, module) => {
-      const vnode = mockRender(module)
-      // '<div><h1>hello</h1></div>'
-      expect(vnode.children[0].tag).to.equal('h1')
-      expect(vnode.children[0].children[0].text).to.equal('hello')
-      done()
-    })
-  })
-
-  it('script import', done => {
-    test({
-      entry: 'script-import.vue'
-    }, (window, module) => {
-      expect(module.data().msg).to.contain('Hello from Component A!')
-      done()
-    })
-  })
-
-  it('source map', done => {
-    bundle({
-      entry: 'basic.vue',
-      devtool: '#source-map'
-    }, (code, warnings) => {
-      const map = mfs.readFileSync('/test.build.js.map', 'utf-8')
-      const smc = new SourceMapConsumer(JSON.parse(map))
-      let line
-      let col
-      const targetRE = /^\s+msg: 'Hello from Component A!'/
-      code.split(/\r?\n/g).some((l, i) => {
-        if (targetRE.test(l)) {
-          line = i + 1
-          col = 0
-          return true
-        }
-      })
-      const pos = smc.originalPositionFor({
-        line: line,
-        column: col
-      })
-      expect(pos.source.indexOf('basic.vue') > -1)
-      expect(pos.line).to.equal(9)
-      done()
-    })
-  })
-
-  it('media-query', done => {
-    test({
-      entry: 'media-query.vue'
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      const id = 'data-v-' + genId('media-query.vue')
-      expect(style).to.contain('@media print {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
-      done()
-    })
-  })
-
-  it('supports-query', done => {
-    test({
-      entry: 'supports-query.vue'
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      const id = 'data-v-' + genId('supports-query.vue')
-      expect(style).to.contain('@supports ( color: #000 ) {\n.foo[' + id + '] {\n    color: #000;\n}\n}')
-      done()
-    })
-  })
-
-  it('extract CSS', done => {
-    bundle({
-      entry: 'extract-css.vue',
-      vue: {
-        loaders: {
-          css: ExtractTextPlugin.extract('css-loader'),
-          stylus: ExtractTextPlugin.extract('css-loader?sourceMap!stylus-loader')
-        }
-      },
-      plugins: [
-        new ExtractTextPlugin('test.output.css')
-      ]
-    }, (code, warnings) => {
-      let css = mfs.readFileSync('/test.output.css').toString()
-      css = normalizeNewline(css)
-      expect(css).to.contain('h1 {\n  color: #f00;\n}')
-      expect(css).to.contain('h2 {\n  color: green;\n}')
-      done()
-    })
-  })
-
-  it('extract CSS using option', done => {
-    bundle({
-      entry: 'extract-css.vue',
-      vue: {
-        extractCSS: true
-      },
-      plugins: [
-        new ExtractTextPlugin('test.output.css')
-      ]
-    }, (code, warnings) => {
-      let css = mfs.readFileSync('/test.output.css').toString()
-      css = normalizeNewline(css)
-      expect(css).to.contain('h1 {\n  color: #f00;\n}')
-      expect(css).to.contain('h2 {\n  color: green;\n}')
-      done()
-    })
-  })
-
-  it('extract CSS using option (passing plugin instance)', done => {
-    const plugin = new ExtractTextPlugin('test.output.css')
-    bundle({
-      entry: 'extract-css.vue',
-      vue: {
-        extractCSS: plugin
-      },
-      plugins: [
-        plugin
-      ]
-    }, (code, warnings) => {
-      let css = mfs.readFileSync('/test.output.css').toString()
-      css = normalizeNewline(css)
-      expect(css).to.contain('h1 {\n  color: #f00;\n}')
-      expect(css).to.contain('h2 {\n  color: green;\n}')
-      done()
-    })
-  })
-
-  it('translates relative URLs and respects resolve alias', done => {
-    test({
-      entry: 'resolve.vue',
-      resolve: {
-        alias: {
-          fixtures: path.resolve(__dirname, './fixtures')
-        }
-      },
-      module: {
-        rules: [
-          { test: /\.png$/, loader: 'file-loader?name=[name].[hash:6].[ext]' }
-        ]
-      }
-    }, (window, module) => {
-      const vnode = mockRender(module)
-      // <div>
-      //   <img src="logo.c9e00e.png">
-      //   <img src="logo.c9e00e.png">
-      // </div>
-      expect(vnode.children[0].tag).to.equal('img')
-      expect(vnode.children[0].data.attrs.src).to.equal('logo.c9e00e.png')
-      expect(vnode.children[2].tag).to.equal('img')
-      expect(vnode.children[2].data.attrs.src).to.equal('logo.c9e00e.png')
-
-      const style = window.document.querySelector('style').textContent
-      expect(style).to.contain('html { background-image: url(logo.c9e00e.png);\n}')
-      expect(style).to.contain('body { background-image: url(logo.c9e00e.png);\n}')
-      done()
-    })
-  })
-
-  it('transformToRequire option', done => {
-    test({
-      entry: 'transform.vue',
-      module: {
-        rules: [
-          {
-            test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-            loader: 'url-loader'
-          }
-        ]
-      }
-    }, (window, module) => {
-      function includeDataURL (s) {
-        return !!s.match(/\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*/i)
-      }
-      const vnode = mockRender(module)
-      // img tag
-      expect(includeDataURL(vnode.children[0].data.attrs.src)).to.equal(true)
-      // image tag (SVG)
-      expect(includeDataURL(vnode.children[2].children[0].data.attrs['xlink:href'])).to.equal(true)
-      const style = window.document.querySelector('style').textContent
-
-      const dataURL = vnode.children[0].data.attrs.src
-
-      // image tag with srcset
-      expect(vnode.children[4].data.attrs.srcset).to.equal(dataURL)
-      expect(vnode.children[6].data.attrs.srcset).to.equal(dataURL + ' 2x')
-      // image tag with multiline srcset
-      expect(vnode.children[8].data.attrs.srcset).to.equal(dataURL + ', ' + dataURL + ' 2x')
-      expect(vnode.children[10].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL)
-      expect(vnode.children[12].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
-      expect(vnode.children[14].data.attrs.srcset).to.equal(dataURL + ', ' + dataURL + ' 2x, ' + dataURL + ' 3x')
-      expect(vnode.children[16].data.attrs.srcset).to.equal(dataURL + ' 2x, ' + dataURL + ' 3x')
-
-      // style
-      expect(includeDataURL(style)).to.equal(true)
-      done()
-    })
-  })
-
-  it('postcss options', done => {
-    test({
-      entry: 'postcss.vue',
-      vue: {
-        postcss: {
-          options: {
-            parser: require('sugarss')
-          }
-        }
-      }
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
-      done()
-    })
-  })
-
-  it('load postcss config file', done => {
-    fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
-    test({
-      entry: 'postcss.vue'
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
-      fs.unlinkSync('.postcssrc')
-      done()
-    })
-  })
-
-  it('load cascading postcss config file', done => {
-    fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
-    test({
-      entry: 'sub/postcss-cascade.vue',
-      vue: { postcss: { cascade: true }}
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('display: -webkit-box')
-      fs.unlinkSync('.postcssrc')
-      done()
-    })
-  })
-
-  it('load postcss config file by path', done => {
-    fs.writeFileSync('test/.postcssrc', JSON.stringify({ parser: 'sugarss' }))
-    test({
-      entry: 'postcss.vue',
-      vue: {
-        postcss: {
-          config: {
-            path: path.resolve('test')
-          }
-        }
-      }
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
-      fs.unlinkSync('test/.postcssrc')
-      done()
-    })
-  })
-
-  it('load postcss config file with js syntax error', done => {
-    fs.writeFileSync('.postcssrc.js', 'module.exports = { hello }')
-    test({
-      entry: 'basic.vue'
-    }, (window, module, vueModule, instance, jsdomErr, webpackInfo) => {
-      const { stats: { compilation: { warnings, errors }}, err } = webpackInfo
-      expect(jsdomErr).to.be.null
-      expect(err).to.be.null
-      expect(errors).to.be.empty
-      expect(warnings.length).to.equal(1)
-      expect(warnings[0]).to.match(/Error loading PostCSS config\:/)
-      fs.unlinkSync('.postcssrc.js')
-      done()
-    }, true)
-  })
-
-  it('postcss lang', done => {
-    test({
-      entry: 'postcss-lang.vue'
-    }, (window) => {
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('h1 {\n  color: red;\n  font-size: 14px\n}')
-      done()
-    })
-  })
-
-  it('transpile ES2015 features in template', done => {
-    test({
-      entry: 'es2015.vue'
-    }, (window, module) => {
-      const vnode = mockRender(module, {
-        a: 'hello',
-        b: true
-      })
-      // <div :class="{[a]:true}"></div>
-      expect(vnode.tag).to.equal('div')
-      expect(vnode.data.class['test-hello']).to.equal(true)
-      expect(vnode.data.class['b']).to.equal(true)
-      done()
-    })
-  })
-
-  it('allows to export extended constructor', done => {
-    test({
-      entry: 'extend.vue'
-    }, (window, Module) => {
-      // extend.vue should export Vue constructor
-      const vnode = mockRender(Module.options, {
-        msg: 'success'
-      })
-      expect(vnode.tag).to.equal('div')
-      expect(vnode.children[0].text).to.equal('success')
-      expect(new Module().msg === 'success')
-      done()
-    })
-  })
-
-  it('css-modules', done => {
-    function testWithIdent (localIdentName, regexToMatch, cb) {
-      test({
-        entry: 'css-modules.vue',
-        vue: {
-          cssModules: localIdentName && {
-            localIdentName: localIdentName
-          }
-        }
-      }, (window, module, raw, instance) => {
-        // get local class name
-        const className = instance.style.red
-        expect(className).to.match(regexToMatch)
-
-        // class name in style
-        let style = [].slice.call(window.document.querySelectorAll('style')).map((style) => {
-          return style.textContent
-        }).join('\n')
-        style = normalizeNewline(style)
-        expect(style).to.contain('.' + className + ' {\n  color: red;\n}')
-
-        // animation name
-        const match = style.match(/@keyframes\s+(\S+)\s+{/)
-        expect(match).to.have.length(2)
-        const animationName = match[1]
-        expect(animationName).to.not.equal('fade')
-        expect(style).to.contain('animation: ' + animationName + ' 1s;')
-
-        // default module + pre-processor + scoped
-        const anotherClassName = instance.$style.red
-        expect(anotherClassName).to.match(regexToMatch).and.not.equal(className)
-        const id = 'data-v-' + genId('css-modules.vue')
-        expect(style).to.contain('.' + anotherClassName + '[' + id + ']')
-
-        cb()
-      })
-    }
-    // default localIdentName
-    testWithIdent(undefined, /^red_\w{8}/, () => {
-      // specified localIdentName
-      const ident = '[path][name]---[local]---[hash:base64:5]'
-      const regex = /css-modules---red---\w{5}/
-      testWithIdent(ident, regex, done)
-    })
-  })
-
-  it('css-modules in SSR', done => {
-    bundle({
-      entry: 'css-modules.vue',
-      target: 'node',
-      output: Object.assign({}, globalConfig.output, {
-        libraryTarget: 'commonjs2'
-      })
-    }, (code, warnings) => {
-      // http://stackoverflow.com/questions/17581830/load-node-js-module-from-string-in-memory
-      function requireFromString (src, filename) {
-        const Module = module.constructor
-        const m = new Module()
-        m._compile(src, filename)
-        return m.exports
-      }
-
-      const output = interopDefault(requireFromString(code, './test.build.js'))
-      const mockInstance = {}
-
-      output.beforeCreate.forEach(hook => hook.call(mockInstance))
-      expect(mockInstance.style.red).to.exist
-
-      done()
-    })
-  })
-
-  it('should allow adding custom html loaders', done => {
-    test({
-      entry: 'markdown.vue',
-      vue: {
-        loaders: {
-          html: 'marked'
-        }
-      }
-    }, (window, module) => {
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-      // <h2 id="-msg-">{{msg}}</h2>
-      expect(vnode.tag).to.equal('h2')
-      expect(vnode.data.attrs.id).to.equal('-msg-')
-      expect(vnode.children[0].text).to.equal('hi')
-      done()
-    })
-  })
-
-  it('support chaining with other loaders', done => {
-    const mockLoaderPath = require.resolve('./mock-loaders/js')
-    test({
-      entry: 'basic.vue',
-      modify: config => {
-        config.module.rules[0].loader = loaderPath + '!' + mockLoaderPath
-      }
-    }, (window, module) => {
-      expect(module.data().msg).to.equal('Changed!')
-      done()
-    })
-  })
-
-  it('SSR style and moduleId extraction', done => {
-    bundle({
-      target: 'node',
-      entry: './test/fixtures/ssr-style.js',
-      output: {
-        path: '/',
-        filename: 'test.build.js',
-        libraryTarget: 'commonjs2'
-      },
-      externals: ['vue']
-    }, code => {
-      const renderer = SSR.createBundleRenderer(code, {
-        basedir: __dirname,
-        runInNewContext: 'once'
-      })
-      const context = {
-        _registeredComponents: new Set()
-      }
-      renderer.renderToString(context, (err, res) => {
-        if (err) return done(err)
-        expect(res).to.contain('data-server-rendered')
-        expect(res).to.contain('<h1>Hello</h1>')
-        expect(res).to.contain('Hello from Component A!')
-        expect(res).to.contain('<div class="foo">functional</div>')
-        // from main component
-        expect(context.styles).to.contain('h1 { color: green;')
-        // from imported child component
-        expect(context.styles).to.contain('comp-a h2 {\n  color: #f00;')
-        // from imported css file
-        expect(context.styles).to.contain('h1 { color: red;')
-        // from imported functional component
-        expect(context.styles).to.contain('.foo { color: red;')
-        // collect component identifiers during render
-        expect(Array.from(context._registeredComponents).length).to.equal(3)
-        done()
-      })
-    })
-  })
-
-  it('extract custom blocks to a separate file', done => {
-    bundle({
-      entry: 'custom-language.vue',
-      vue: {
-        loaders: {
-          'documentation': ExtractTextPlugin.extract('raw-loader')
-        }
-      },
-      plugins: [
-        new ExtractTextPlugin('doc.md')
-      ]
-    }, (code, warnings) => {
-      let unitTest = mfs.readFileSync('/doc.md').toString()
-      unitTest = normalizeNewline(unitTest)
-      expect(unitTest).to.contain('This is example documentation for a component.')
-      done()
-    })
-  })
-
-  it('add custom blocks to the webpack output', done => {
-    bundle({
-      entry: 'custom-language.vue',
-      vue: {
-        loaders: {
-          'unit-test': 'babel-loader'
-        }
-      }
-    }, (code, warnings) => {
-      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
-      done()
-    })
-  })
-
-  it('custom blocks work with src imports', done => {
-    bundle({
-      entry: 'custom-import.vue',
-      vue: {
-        loaders: {
-          'unit-test': 'babel-loader'
-        }
-      }
-    }, (code, warnings) => {
-      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
-      done()
-    })
-  })
-
-  it('passes Component to custom block loaders', done => {
-    const mockLoaderPath = require.resolve('./mock-loaders/docs')
-    test({
-      entry: 'custom-language.vue',
-      vue: {
-        loaders: {
-          'documentation': mockLoaderPath
-        }
-      }
-    }, (window, module) => {
-      expect(module.__docs).to.contain('This is example documentation for a component.')
-      done()
-    })
-  })
-
-  it('custom blocks can be ignored', done => {
-    bundle({
-      entry: 'custom-language.vue'
-    }, (code, warnings) => {
-      expect(code).not.to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
-      done()
-    })
-  })
-
-  it('custom blocks with ES module default export', done => {
-    test({
-      entry: 'custom-blocks.vue',
-      vue: {
-        loaders: {
-          esm: require.resolve('./mock-loaders/identity')
-        }
-      }
-    }, (window, module) => {
-      // option added by custom block code
-      expect(module.foo).to.equal(1)
-      done()
-    })
-  })
-
-  it('passes attributes as options to the loader', done => {
-    bundle({
-      entry: 'custom-options.vue',
-      vue: {
-        loaders: {
-          'unit-test': 'babel-loader!skeleton-loader'
-        }
-      },
-      plugins: [
-        new webpack.LoaderOptionsPlugin({
-          options: {
-            skeletonLoader: {
-              procedure: (content, sourceMap, callback, options) => {
-                expect(options.foo).to.equal('bar')
-                expect(options.opt2).to.equal('value2')
-
-                // Return the content to output.
-                return content
-              }
-            }
-          }
-        })
-      ]
-    }, (code, warnings) => {
-      expect(code).to.contain('describe(\'example\', function () {\n  it(\'basic\', function (done) {\n    done();\n  });\n})')
-      done()
-    })
-  })
-
-  it('pre/post loaders', done => {
-    test({
-      entry: 'basic.vue',
-      vue: {
-        preLoaders: {
-          js: require.resolve('./mock-loaders/js'),
-          css: require.resolve('./mock-loaders/css')
-        },
-        postLoaders: {
-          html: require.resolve('./mock-loaders/html')
-        }
-      }
-    }, (window, module) => {
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-      // <h2 class="green">{{msg}}</h2>
-      expect(vnode.tag).to.equal('h2')
-      expect(vnode.data.staticClass).to.equal('green')
-      expect(vnode.children[0].text).to.equal('hi')
-
-      expect(module.data().msg).to.contain('Changed!')
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('comp-a h2 {\n  color: #00f;\n}')
-      done()
-    })
-  })
-
-  it('pre/post loaders for custom blocks', done => {
-    test({
-      entry: 'custom-blocks.vue',
-      vue: {
-        preLoaders: {
-          i18n: require.resolve('./mock-loaders/yaml')
-        },
-        loaders: {
-          i18n: require.resolve('./mock-loaders/i18n'),
-          blog: 'marked'
-        },
-        postLoaders: {
-          blog: require.resolve('./mock-loaders/blog')
-        }
-      }
-    }, (window, module) => {
-      const vnode = mockRender(module, {
-        msg: JSON.parse(module.__i18n).en.hello,
-        blog: module.__blog
-      })
-      expect(vnode.children[0].children[0].text).to.equal('hello world')
-      expect(vnode.children[2].data.domProps.innerHTML).to.equal('<h2 id="foo">foo</h2>')
-      done()
-    })
-  })
-
-  it('custom compiler modules', done => {
-    test({
-      entry: 'custom-module.vue',
-      vue: {
-        compilerModules: [
-          {
-            postTransformNode: el => {
-              if (el.staticStyle) {
-                el.staticStyle = `$processStyle(${el.staticStyle})`
-              }
-              if (el.styleBinding) {
-                el.styleBinding = `$processStyle(${el.styleBinding})`
-              }
-            }
-          }
-        ]
-      }
-    }, (window, module) => {
-      const results = []
-      // var vnode =
-      mockRender(
-        Object.assign(module, { methods: { $processStyle: style => results.push(style) }}),
-        { transform: 'translateX(10px)' }
-      )
-      expect(results).to.deep.equal([
-        { 'flex-direction': 'row' },
-        { 'transform': 'translateX(10px)' }
-      ])
-      done()
-    })
-  })
-
-  it('custom compiler directives', done => {
-    test({
-      entry: 'custom-directive.vue',
-      vue: {
-        compilerDirectives: {
-          i18n (el, dir) {
-            if (dir.name === 'i18n' && dir.value) {
-              el.i18n = dir.value
-              if (!el.props) {
-                el.props = []
-              }
-              el.props.push({ name: 'textContent', value: `_s(${JSON.stringify(dir.value)})` })
-            }
-          }
-        }
-      }
-    }, (window, module) => {
-      const vnode = mockRender(module)
-      expect(vnode.data.domProps.textContent).to.equal('keypath')
-      done()
-    })
-  })
-
-  it('functional component with styles', done => {
-    test({
-      entry: 'functional-style.vue'
-    }, (window, module, rawModule) => {
-      expect(module.functional).to.equal(true)
-      const vnode = mockRender(module)
-      // <div class="foo">hi</div>
-      expect(vnode.tag).to.equal('div')
-      expect(vnode.data.class).to.equal('foo')
-      expect(vnode.children[0].text).to.equal('functional')
-
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('.foo { color: red;\n}')
-      done()
-    })
-  })
-
-  it('template with comments', done => {
-    test({
-      entry: 'template-comment.vue'
-    }, (window, module, rawModule) => {
-      expect(module.comments).to.equal(true)
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-      expect(vnode.tag).to.equal('div')
-      expect(vnode.children.length).to.equal(2)
-      expect(vnode.children[0].data.staticClass).to.equal('red')
-      expect(vnode.children[0].children[0].text).to.equal('hi')
-      expect(vnode.children[1].isComment).to.true
-      expect(vnode.children[1].text).to.equal(' comment here ')
-      done()
-    })
-  })
-
-  it('functional template', done => {
-    test({
-      entry: 'functional-root.vue',
-      vue: {
-        preserveWhitespace: false
-      }
-    }, (window, module) => {
-      expect(module.components.Functional._compiled).to.equal(true)
-      expect(module.components.Functional.functional).to.equal(true)
-      expect(module.components.Functional.staticRenderFns).to.exist
-      expect(module.components.Functional.render).to.be.a('function')
-
-      const vnode = mockRender(module, {
-        fn () {
-          done()
-        }
-      }).children[0]
-
-      // Basic vnode
-      expect(vnode.children[0].data.staticClass).to.equal('red')
-      expect(vnode.children[0].children[0].text).to.equal('hello')
-      // Default slot vnode
-      expect(vnode.children[1].tag).to.equal('span')
-      expect(vnode.children[1].children[0].text).to.equal('hello')
-      // Named slot vnode
-      expect(vnode.children[2].tag).to.equal('div')
-      expect(vnode.children[2].children[0].text).to.equal('Second slot')
-      // // Scoped slot vnode
-      expect(vnode.children[3].text).to.equal('hello')
-      // // Static content vnode
-      expect(vnode.children[4].tag).to.equal('div')
-      expect(vnode.children[4].children[0].text).to.equal('Some ')
-      expect(vnode.children[4].children[1].tag).to.equal('span')
-      expect(vnode.children[4].children[1].children[0].text).to.equal('text')
-      // // v-if vnode
-      expect(vnode.children[5].text).to.equal('')
-
-      vnode.children[6].data.on.click()
-    })
-  })
-
-  it('named exports', done => {
-    test({
-      entry: 'named-exports.vue'
-    }, (window, _, rawModule) => {
-      expect(rawModule.default.name).to.equal('named-exports')
-      expect(rawModule.foo()).to.equal(1)
-      done()
-    })
-  })
-
-  it('multiple rule definitions', done => {
-    test({
-      modify: config => {
-        // remove default rule
-        config.module.rules.shift()
-      },
-      entry: './test/fixtures/multiple-rules.js',
-      module: {
-        rules: [
-          {
-            test: /\.vue$/,
-            oneOf: [
-              {
-                include: /-1\.vue$/,
-                loader: loaderPath,
-                options: {
-                  postcss: [
-                    css => {
-                      css.walkDecls('font-size', decl => {
-                        decl.value = `${parseInt(decl.value, 10) * 2}px`
-                      })
-                    }
-                  ],
-                  compilerModules: [{
-                    postTransformNode: el => {
-                      el.staticClass = '"multiple-rule-1"'
-                    }
-                  }]
-                }
-              },
-              {
-                include: /-2\.vue$/,
-                loader: loaderPath,
-                options: {
-                  postcss: [
-                    css => {
-                      css.walkDecls('font-size', decl => {
-                        decl.value = `${parseInt(decl.value, 10) / 2}px`
-                      })
-                    }
-                  ],
-                  compilerModules: [{
-                    postTransformNode: el => {
-                      el.staticClass = '"multiple-rule-2"'
-                    }
-                  }]
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }, (window, module) => {
-      const vnode1 = mockRender(window.rules[0])
-      const vnode2 = mockRender(window.rules[1])
-      expect(vnode1.data.staticClass).to.equal('multiple-rule-1')
-      expect(vnode2.data.staticClass).to.equal('multiple-rule-2')
-      const styles = window.document.querySelectorAll('style')
-      const expr = /\.multiple-rule-\d\s*\{\s*font-size:\s*([.0-9]+)px;/
-      for (let i = 0, l = styles.length; i < l; i++) {
-        const content = styles[i].textContent
-        if (expr.test(content)) {
-          expect(parseFloat(RegExp.$1)).to.be.equal(14)
-        }
-      }
-      done()
-    })
-  })
-
-  it('thread mode', done => {
-    test({
-      entry: 'basic.vue',
-      vue: {
-        threadMode: true
-      }
-    }, (window, module, rawModule) => {
-      const vnode = mockRender(module, {
-        msg: 'hi'
-      })
-
-      // <h2 class="red">{{msg}}</h2>
-      expect(vnode.tag).to.equal('h2')
-      expect(vnode.data.staticClass).to.equal('red')
-      expect(vnode.children[0].text).to.equal('hi')
-
-      expect(module.data().msg).to.contain('Hello from Component A!')
-      let style = window.document.querySelector('style').textContent
-      style = normalizeNewline(style)
-      expect(style).to.contain('comp-a h2 {\n  color: #f00;\n}')
-      done()
-    })
-  })
-})

From 9a52bf43022b99d3a4c6fbada3314fa691c3a890 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 19 Mar 2018 09:23:04 -0400
Subject: [PATCH 864/877] refacotr: rename test method name

---
 test/advanced.js | 14 +++++++-------
 test/basic.js    | 14 +++++++-------
 test/custom.js   |  8 ++++----
 test/script.js   |  6 +++---
 test/shared.js   |  4 ++--
 test/style.js    | 22 +++++++++++-----------
 test/template.js | 20 ++++++++++----------
 7 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/test/advanced.js b/test/advanced.js
index 23f7e583c..83199760c 100644
--- a/test/advanced.js
+++ b/test/advanced.js
@@ -6,7 +6,7 @@ const {
   mfs,
   loaderPath,
   bundle,
-  test,
+  mockBundleAndRun,
   mockRender
 } = require('./shared')
 
@@ -16,7 +16,7 @@ const SourceMapConsumer = require('source-map').SourceMapConsumer
 
 describe('advanced features', () => {
   it('pre/post loaders', done => {
-    test({
+    mockBundleAndRun({
       entry: 'basic.vue',
       vue: {
         preLoaders: {
@@ -46,7 +46,7 @@ describe('advanced features', () => {
 
   it('support chaining with other loaders', done => {
     const mockLoaderPath = require.resolve('./mock-loaders/js')
-    test({
+    mockBundleAndRun({
       entry: 'basic.vue',
       modify: config => {
         config.module.rules[0].loader = loaderPath + '!' + mockLoaderPath
@@ -58,7 +58,7 @@ describe('advanced features', () => {
   })
 
   it('expose filename', done => {
-    test({
+    mockBundleAndRun({
       entry: 'basic.vue'
     }, (window, module, rawModule) => {
       expect(module.__file).to.equal(path.normalize('test/fixtures/basic.vue'))
@@ -125,7 +125,7 @@ describe('advanced features', () => {
   })
 
   it('pre-processors with extract css', done => {
-    test({
+    mockBundleAndRun({
       entry: 'pre.vue',
       vue: {
         extractCSS: true
@@ -178,7 +178,7 @@ describe('advanced features', () => {
   })
 
   it('multiple rule definitions', done => {
-    test({
+    mockBundleAndRun({
       modify: config => {
         // remove default rule
         config.module.rules.shift()
@@ -247,7 +247,7 @@ describe('advanced features', () => {
   })
 
   it('thread mode', done => {
-    test({
+    mockBundleAndRun({
       entry: 'basic.vue',
       vue: {
         threadMode: true
diff --git a/test/basic.js b/test/basic.js
index 5668239b4..9b8890134 100644
--- a/test/basic.js
+++ b/test/basic.js
@@ -3,7 +3,7 @@ process.env.VUE_LOADER_TEST = true
 const { expect } = require('chai')
 const {
   genId,
-  test,
+  mockBundleAndRun,
   mockRender,
   initStylesForAllSubComponents
 } = require('./shared')
@@ -12,7 +12,7 @@ const normalizeNewline = require('normalize-newline')
 
 describe('basic usage', () => {
   it('basic', done => {
-    test({
+    mockBundleAndRun({
       entry: 'basic.vue'
     }, (window, module, rawModule) => {
       const vnode = mockRender(module, {
@@ -33,7 +33,7 @@ describe('basic usage', () => {
   })
 
   it('pre-processors', done => {
-    test({
+    mockBundleAndRun({
       entry: 'pre.vue'
     }, (window, module) => {
       const vnode = mockRender(module)
@@ -53,7 +53,7 @@ describe('basic usage', () => {
   })
 
   it('style import', done => {
-    test({
+    mockBundleAndRun({
       entry: 'style-import.vue'
     }, (window) => {
       const styles = window.document.querySelectorAll('style')
@@ -66,7 +66,7 @@ describe('basic usage', () => {
   })
 
   it('style import for a same file twice', done => {
-    test({
+    mockBundleAndRun({
       entry: 'style-import-twice.vue'
     }, (window, module) => {
       initStylesForAllSubComponents(module)
@@ -83,7 +83,7 @@ describe('basic usage', () => {
   })
 
   it('template import', done => {
-    test({
+    mockBundleAndRun({
       entry: 'template-import.vue'
     }, (window, module) => {
       const vnode = mockRender(module)
@@ -95,7 +95,7 @@ describe('basic usage', () => {
   })
 
   it('script import', done => {
-    test({
+    mockBundleAndRun({
       entry: 'script-import.vue'
     }, (window, module) => {
       expect(module.data().msg).to.contain('Hello from Component A!')
diff --git a/test/custom.js b/test/custom.js
index 9056dbfea..6d60f0027 100644
--- a/test/custom.js
+++ b/test/custom.js
@@ -4,7 +4,7 @@ const { expect } = require('chai')
 const {
   mfs,
   bundle,
-  test,
+  mockBundleAndRun,
   mockRender
 } = require('./shared')
 
@@ -62,7 +62,7 @@ describe('custom block features', () => {
 
   it('passes Component to custom block loaders', done => {
     const mockLoaderPath = require.resolve('./mock-loaders/docs')
-    test({
+    mockBundleAndRun({
       entry: 'custom-language.vue',
       vue: {
         loaders: {
@@ -85,7 +85,7 @@ describe('custom block features', () => {
   })
 
   it('custom blocks with ES module default export', done => {
-    test({
+    mockBundleAndRun({
       entry: 'custom-blocks.vue',
       vue: {
         loaders: {
@@ -129,7 +129,7 @@ describe('custom block features', () => {
   })
 
   it('pre/post loaders for custom blocks', done => {
-    test({
+    mockBundleAndRun({
       entry: 'custom-blocks.vue',
       vue: {
         preLoaders: {
diff --git a/test/script.js b/test/script.js
index c0644669e..96b9cb3e9 100644
--- a/test/script.js
+++ b/test/script.js
@@ -2,13 +2,13 @@ process.env.VUE_LOADER_TEST = true
 
 const { expect } = require('chai')
 const {
-  test,
+  mockBundleAndRun,
   mockRender
 } = require('./shared')
 
 describe('script block features', () => {
   it('allows to export extended constructor', done => {
-    test({
+    mockBundleAndRun({
       entry: 'extend.vue'
     }, (window, Module) => {
       // extend.vue should export Vue constructor
@@ -23,7 +23,7 @@ describe('script block features', () => {
   })
 
   it('named exports', done => {
-    test({
+    mockBundleAndRun({
       entry: 'named-exports.vue'
     }, (window, _, rawModule) => {
       expect(rawModule.default.name).to.equal('named-exports')
diff --git a/test/shared.js b/test/shared.js
index 8790f0272..5f290e7d2 100644
--- a/test/shared.js
+++ b/test/shared.js
@@ -78,7 +78,7 @@ function bundle (options, cb, wontThrowError) {
   })
 }
 
-function test (options, assert, wontThrowError) {
+function mockBundleAndRun (options, assert, wontThrowError) {
   bundle(options, (code, stats, err) => {
     jsdom.env({
       html: '<!DOCTYPE html><html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
@@ -132,7 +132,7 @@ module.exports = {
   globalConfig,
   genId,
   bundle,
-  test,
+  mockBundleAndRun,
   mockRender,
   interopDefault,
   initStylesForAllSubComponents
diff --git a/test/style.js b/test/style.js
index c3a0c5cd0..f637d0c5a 100644
--- a/test/style.js
+++ b/test/style.js
@@ -5,7 +5,7 @@ const path = require('path')
 const { expect } = require('chai')
 const {
   genId,
-  test,
+  mockBundleAndRun,
   mockRender
 } = require('./shared')
 
@@ -13,7 +13,7 @@ const normalizeNewline = require('normalize-newline')
 
 describe('style block features', () => {
   it('scoped style', done => {
-    test({
+    mockBundleAndRun({
       entry: 'scoped-css.vue'
     }, (window, module) => {
       const id = 'data-v-' + genId('scoped-css.vue')
@@ -58,7 +58,7 @@ describe('style block features', () => {
   })
 
   it('media-query', done => {
-    test({
+    mockBundleAndRun({
       entry: 'media-query.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
@@ -70,7 +70,7 @@ describe('style block features', () => {
   })
 
   it('supports-query', done => {
-    test({
+    mockBundleAndRun({
       entry: 'supports-query.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
@@ -82,7 +82,7 @@ describe('style block features', () => {
   })
 
   it('postcss options', done => {
-    test({
+    mockBundleAndRun({
       entry: 'postcss.vue',
       vue: {
         postcss: {
@@ -101,7 +101,7 @@ describe('style block features', () => {
 
   it('load postcss config file', done => {
     fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
-    test({
+    mockBundleAndRun({
       entry: 'postcss.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
@@ -114,7 +114,7 @@ describe('style block features', () => {
 
   it('load cascading postcss config file', done => {
     fs.writeFileSync('.postcssrc', JSON.stringify({ parser: 'sugarss' }))
-    test({
+    mockBundleAndRun({
       entry: 'sub/postcss-cascade.vue',
       vue: { postcss: { cascade: true }}
     }, (window) => {
@@ -128,7 +128,7 @@ describe('style block features', () => {
 
   it('load postcss config file by path', done => {
     fs.writeFileSync('test/.postcssrc', JSON.stringify({ parser: 'sugarss' }))
-    test({
+    mockBundleAndRun({
       entry: 'postcss.vue',
       vue: {
         postcss: {
@@ -148,7 +148,7 @@ describe('style block features', () => {
 
   it('load postcss config file with js syntax error', done => {
     fs.writeFileSync('.postcssrc.js', 'module.exports = { hello }')
-    test({
+    mockBundleAndRun({
       entry: 'basic.vue'
     }, (window, module, vueModule, instance, jsdomErr, webpackInfo) => {
       const { stats: { compilation: { warnings, errors }}, err } = webpackInfo
@@ -163,7 +163,7 @@ describe('style block features', () => {
   })
 
   it('postcss lang', done => {
-    test({
+    mockBundleAndRun({
       entry: 'postcss-lang.vue'
     }, (window) => {
       let style = window.document.querySelector('style').textContent
@@ -175,7 +175,7 @@ describe('style block features', () => {
 
   it('css-modules', done => {
     function testWithIdent (localIdentName, regexToMatch, cb) {
-      test({
+      mockBundleAndRun({
         entry: 'css-modules.vue',
         vue: {
           cssModules: localIdentName && {
diff --git a/test/template.js b/test/template.js
index a4a70f037..a04a2f330 100644
--- a/test/template.js
+++ b/test/template.js
@@ -3,7 +3,7 @@ process.env.VUE_LOADER_TEST = true
 const path = require('path')
 const { expect } = require('chai')
 const {
-  test,
+  mockBundleAndRun,
   mockRender
 } = require('./shared')
 
@@ -11,7 +11,7 @@ const normalizeNewline = require('normalize-newline')
 
 describe('template block features', () => {
   it('template with comments', done => {
-    test({
+    mockBundleAndRun({
       entry: 'template-comment.vue'
     }, (window, module, rawModule) => {
       expect(module.comments).to.equal(true)
@@ -29,7 +29,7 @@ describe('template block features', () => {
   })
 
   it('transpile ES2015 features in template', done => {
-    test({
+    mockBundleAndRun({
       entry: 'es2015.vue'
     }, (window, module) => {
       const vnode = mockRender(module, {
@@ -45,7 +45,7 @@ describe('template block features', () => {
   })
 
   it('translates relative URLs and respects resolve alias', done => {
-    test({
+    mockBundleAndRun({
       entry: 'resolve.vue',
       resolve: {
         alias: {
@@ -76,7 +76,7 @@ describe('template block features', () => {
   })
 
   it('transformToRequire option', done => {
-    test({
+    mockBundleAndRun({
       entry: 'transform.vue',
       module: {
         rules: [
@@ -116,7 +116,7 @@ describe('template block features', () => {
   })
 
   it('should allow adding custom html loaders', done => {
-    test({
+    mockBundleAndRun({
       entry: 'markdown.vue',
       vue: {
         loaders: {
@@ -136,7 +136,7 @@ describe('template block features', () => {
   })
 
   it('custom compiler modules', done => {
-    test({
+    mockBundleAndRun({
       entry: 'custom-module.vue',
       vue: {
         compilerModules: [
@@ -168,7 +168,7 @@ describe('template block features', () => {
   })
 
   it('custom compiler directives', done => {
-    test({
+    mockBundleAndRun({
       entry: 'custom-directive.vue',
       vue: {
         compilerDirectives: {
@@ -191,7 +191,7 @@ describe('template block features', () => {
   })
 
   it('functional component with styles', done => {
-    test({
+    mockBundleAndRun({
       entry: 'functional-style.vue'
     }, (window, module, rawModule) => {
       expect(module.functional).to.equal(true)
@@ -209,7 +209,7 @@ describe('template block features', () => {
   })
 
   it('functional template', done => {
-    test({
+    mockBundleAndRun({
       entry: 'functional-root.vue',
       vue: {
         preserveWhitespace: false

From bb660e17cdd1756678f01809edd22cc36b508378 Mon Sep 17 00:00:00 2001
From: Ross Esmond <ross.alexander.esmond@gmail.com>
Date: Fri, 23 Mar 2018 12:26:19 -0500
Subject: [PATCH 865/877] fix: added file property to the generated sourcemap
 (#1190)

---
 lib/parser.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/parser.js b/lib/parser.js
index 5eec24ae4..f6ba5542d 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -38,7 +38,10 @@ module.exports = (content, filename, needMap, sourceRoot, needCSSMap) => {
 }
 
 function generateSourceMap (filename, source, generated, sourceRoot) {
-  const map = new SourceMapGenerator({ sourceRoot })
+  const map = new SourceMapGenerator({
+    file: filename,
+    sourceRoot
+  })
   map.setSourceContent(filename, source)
   generated.split(splitRE).forEach((line, index) => {
     if (!emptyRE.test(line)) {

From c337dc0fbbd85e6fecc698acb4e1bcf8cf6748a9 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 23 Mar 2018 16:16:49 -0400
Subject: [PATCH 866/877] 14.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 97d8a555b..905032630 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.2.1",
+  "version": "14.2.2",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From 0c4489022a417b09cb859e83bf3a513f04f7d676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Sat, 24 Mar 2018 05:18:02 +0800
Subject: [PATCH 867/877] [docs][zh-cn] translated recent updates (#1193)

* [docs][zh-cn] translated recent updates

* [docs][zh-cn] updated SUMMARY

* [docs][zh-cn] typos

* [docs][zh-cn] typos
---
 docs/en/options.md    |   2 +-
 docs/zh-cn/SUMMARY.md |   4 ++
 docs/zh-cn/options.md | 118 ++++++++++++++++++++++++------------------
 3 files changed, 74 insertions(+), 50 deletions(-)

diff --git a/docs/en/options.md b/docs/en/options.md
index a1496b70f..76b74d8bb 100644
--- a/docs/en/options.md
+++ b/docs/en/options.md
@@ -331,6 +331,6 @@ module.exports = {
 - type: `boolean`
 - default: `false`
 
-  Setting this to true enables filesystem-based option caching so that the options for the main `vue-loader` can be properly shared with sub-loaders in other threads.
+  Setting this to `true` enables filesystem-based option caching so that the options for the main `vue-loader` can be properly shared with sub-loaders in other threads.
 
   Only needed when using together with HappyPack or `thread-loader`.
diff --git a/docs/zh-cn/SUMMARY.md b/docs/zh-cn/SUMMARY.md
index e1e35f348..2a7a460e2 100644
--- a/docs/zh-cn/SUMMARY.md
+++ b/docs/zh-cn/SUMMARY.md
@@ -24,6 +24,8 @@
   - [postLoaders](options.md#postloaders)
   - [postcss](options.md#postcss)
   - [postcss.config](options.md#postcssconfig)
+  - [postcss.useConfigFile](options.md#postcssuseconfigfile)
+  - [postcss.cascade](options.md#postcsscascade)
   - [cssSourceMap](options.md#csssourcemap)
   - [esModule](options.md#esmodule)
   - [preserveWhitespace](options.md#preservewhitespace)
@@ -33,3 +35,5 @@
   - [buble](options.md#buble)
   - [extractCSS](options.md#extractcss)
   - [optimizeSSR](options.md#optimizessr)
+  - [hotReload](options.md#hotreload)
+  - [threadMode](options.md#threadmode)
diff --git a/docs/zh-cn/options.md b/docs/zh-cn/options.md
index b94f98fe1..f600bb000 100644
--- a/docs/zh-cn/options.md
+++ b/docs/zh-cn/options.md
@@ -160,6 +160,15 @@ module.exports = {
 
   注意，这个值会在 webpack 配置中没有 `devtool` 的情况下自动设置为 `false`。
 
+### postcss.cascade
+
+> 14.2.0 新增
+
+- 类型：`boolean`
+- 默认值：`false`
+
+  设置为 `true` 的时候会开启层叠式加载 PostCSS 配置文件。比如，你可以在嵌套的源代码目录下放置额外的 `.postcssrc` 文件来为项目中不同的文件应用不同的 PostCSS 配置。
+
 ### esModule
 
 > 这个选项已经从 v14.0 中移除。在 v14.0 及以上版本中，`*.vue` 文件始终暴露为 ES 模块。
@@ -232,62 +241,62 @@ module.exports = {
 
 > 12.0.0 新增
 
-使用 `extract-text-webpack-plugin` 自动提取 CSS。适用于大多数预处理器，且也可在生产环境进行压缩。
+  使用 `extract-text-webpack-plugin` 自动提取 CSS。适用于大多数预处理器，且也可在生产环境进行压缩。
 
-传入的值可以是 `true`，也可以是插件的一个实例 (这样可以为多个提取的文件使用多个提取插件的实例)。
+  传入的值可以是 `true`，也可以是插件的一个实例 (这样可以为多个提取的文件使用多个提取插件的实例)。
 
-这应当只用于生产环境，以便可以在开发过程中使用热重载。
+  这应当只用于生产环境，以便可以在开发过程中使用热重载。
 
-示例：
+  示例：
 
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-
-module.exports = {
-  // other options...
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          extractCSS: true
+  ``` js
+  // webpack.config.js
+  var ExtractTextPlugin = require("extract-text-webpack-plugin")
+
+  module.exports = {
+    // 其它选项……
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader',
+          options: {
+            extractCSS: true
+          }
         }
-      }
+      ]
+    },
+    plugins: [
+      new ExtractTextPlugin("style.css")
     ]
-  },
-  plugins: [
-    new ExtractTextPlugin("style.css")
-  ]
-}
-```
+  }
+  ```
 
-或者传递插件的一个实例：
+  或者传递插件的一个实例：
 
-``` js
-// webpack.config.js
-var ExtractTextPlugin = require("extract-text-webpack-plugin")
-var plugin = new ExtractTextPlugin("style.css")
-
-module.exports = {
-  // other options...
-  module: {
-    rules: [
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: {
-          extractCSS: plugin
+  ``` js
+  // webpack.config.js
+  var ExtractTextPlugin = require("extract-text-webpack-plugin")
+  var plugin = new ExtractTextPlugin("style.css")
+
+  module.exports = {
+    // 其它选项……
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader',
+          options: {
+            extractCSS: plugin
+          }
         }
-      }
+      ]
+    },
+    plugins: [
+      plugin
     ]
-  },
-  plugins: [
-    plugin
-  ]
-}
-```
+  }
+  ```
 
 ### optimizeSSR
 
@@ -296,7 +305,7 @@ module.exports = {
 - 类型: `boolean`
 - 默认值: 当 webpack 配置中包含 `target: 'node'` 且 `vue-template-compiler` 版本号大于等于 2.4.0 时为 `true`。
 
-开启 Vue 2.4 服务端渲染的编译优化之后，渲染函数将会把返回的 vdom 树的一部分编译为字符串，以提升服务端渲染的性能。在一些情况下，你可能想要明确的将其关掉，因为该渲染函数只能用于服务端渲染，而不能用于客户端渲染或测试环境。
+  开启 Vue 2.4 服务端渲染的编译优化之后，渲染函数将会把返回的 vdom 树的一部分编译为字符串，以提升服务端渲染的性能。在一些情况下，你可能想要明确的将其关掉，因为该渲染函数只能用于服务端渲染，而不能用于客户端渲染或测试环境。
 
 ### hotReload
 
@@ -306,5 +315,16 @@ module.exports = {
 - 默认值: 在开发环境下是 `true`，在生产环境下或 webpack 配置中有 `target: 'node'` 的时候是 `false`。
 - 允许的值: `false` (`true` 会强制热重载，即便是生产环境或 `target: 'node'` 时)
 
-是否使用 webpack 的[模块热替换](https://webpack.js.org/concepts/hot-module-replacement/)在浏览器中应用变更而**不重载整个页面**。
-用这个选项 (值设为 `false`) 在开发环境下关闭热重载特性。
+  是否使用 webpack 的[模块热替换](https://webpack.js.org/concepts/hot-module-replacement/)在浏览器中应用变更而**不重载整个页面**。
+  用这个选项 (值设为 `false`) 在开发环境下关闭热重载特性。
+
+### threadMode
+
+> 14.2.0 新增
+
+- 类型：`boolean`
+- 默认值：`false`
+
+  设置为 `true` 的时候会开启基于文件系统的选项缓存，使得主 `vue-loader` 的选项可以分享给其它线程中的子 loader。
+
+  只在和 HappyPack 或 `thread-loader` 配合使用的时候才用得到。

From df147a7a77bd8ee2c0ffe5a1c34443ad3d464713 Mon Sep 17 00:00:00 2001
From: Kraig Hufstedler <kraigory@gmail.com>
Date: Fri, 23 Mar 2018 16:20:18 -0500
Subject: [PATCH 868/877] docs: added link to component options spec (#1192)

* Added link to component options spec

* Update spec.md
---
 docs/en/start/spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/start/spec.md b/docs/en/start/spec.md
index 0e2ee0bb7..0f2ec401d 100644
--- a/docs/en/start/spec.md
+++ b/docs/en/start/spec.md
@@ -58,7 +58,7 @@ More details can be found in [Using Pre-Processors](../configurations/pre-proces
 
 - The script is executed in a CommonJS like environment (just like a normal `.js` module bundled via webpack), which means you can `require()` other dependencies. And with ES2015 support, you can also use the `import` and `export` syntax.
 
-- The script must export a Vue.js component options object. Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
+- The script must export a Vue.js [component options object](https://vuejs.org/v2/api/#Options-Data). Exporting an extended constructor created by `Vue.extend()` is also supported, but a plain object is preferred.
 
 #### `<style>`
 

From dc6bc375f944e139304784ed9285c95b4ea15525 Mon Sep 17 00:00:00 2001
From: Munieru <mail@munieru.jp>
Date: Sun, 1 Apr 2018 09:12:13 +0900
Subject: [PATCH 869/877] docs: Update ja docs hot-reload.md (#1222)

---
 docs/ja/features/hot-reload.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ja/features/hot-reload.md b/docs/ja/features/hot-reload.md
index d9dad8bfc..ab723a36c 100644
--- a/docs/ja/features/hot-reload.md
+++ b/docs/ja/features/hot-reload.md
@@ -12,7 +12,7 @@
 
 - `<style>` ホットリロードは `vue-style-loader` を介して単独で動作するため、アプリケーションの状態に影響しません。
 
-## Usage
+## 使い方
 
 `vue-cli` を使ってプロジェクトをスキャホールドすると、ホットリロードはすぐに使えるようになります。
 

From ee1ace5ea007e41e1353e2c730aceb7f3c97ec35 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Apr 2018 12:29:29 -0400
Subject: [PATCH 870/877] docs: update CNAME

---
 docs/assets/CNAME | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/assets/CNAME b/docs/assets/CNAME
index 94a4a7ffa..2d200a772 100644
--- a/docs/assets/CNAME
+++ b/docs/assets/CNAME
@@ -1 +1 @@
-vue-loader.vuejs.org
+vue-loader-v14.vuejs.org

From 23d422a34e97666a434a6cc11df971f36546dbed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Mon, 7 May 2018 02:22:43 +0800
Subject: [PATCH 871/877] Update asset-url.md

---
 docs/zh-cn/configurations/asset-url.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/zh-cn/configurations/asset-url.md b/docs/zh-cn/configurations/asset-url.md
index 37f3f73a1..36fd0e094 100644
--- a/docs/zh-cn/configurations/asset-url.md
+++ b/docs/zh-cn/configurations/asset-url.md
@@ -2,7 +2,7 @@
 
 默认情况下，`vue-loader` 使用 [css-loader](https://github.com/webpack/css-loader) 和 Vue 模版编译器自动处理样式和模版文件。在编译过程中，所有的资源路径例如 `<img src="...">`、`background: url(...)` 和 `@import` **会作为模块依赖**。
 
-例如，`url(./image.png)` 会被转换为 `require('./image.png')`，而
+例如，`url(./image.png)` 会被转换为 `require('./image.png')`，而：
 
 ``` html
 <img src="../image.png">
@@ -36,6 +36,6 @@ createElement('img', { attrs: { src: require('../image.png') }})
 
 这样做的好处：
 
-1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理图片文件，可以使用相对路径而不用担心布署时URL问题**。使用正确的配置，webpack 将会在打包输出中自动重写文件路径为正确的URL。
+1. `file-loader` 可以指定要复制和放置资源文件的位置，以及如何使用版本哈希命名以获得更好的缓存。此外，这意味着 **你可以就近管理图片文件，可以使用相对路径而不用担心部署时 URL 的问题**。使用正确的配置，webpack 将会在打包输出中自动重写文件路径为正确的URL。
 
-2. `url-loader` 允许你有条件将文件转换为内联的 base-64 URL (当文件小于给定的阈值)，这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。
+2. `url-loader` 允许你有条件地将文件转换为内联的 base-64 URL (当文件小于给定的阈值)，这会减少小文件的 HTTP 请求。如果文件大于该阈值，会自动的交给 `file-loader` 处理。

From e82c1f6f9829dff88806af0b358ce0e74c43af21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=BE=E4=B8=89=E8=82=A1=E5=9B=9B?= <zhaojinjiang@me.com>
Date: Mon, 7 May 2018 02:25:24 +0800
Subject: [PATCH 872/877] Update hot-reload.md

---
 docs/zh-cn/features/hot-reload.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh-cn/features/hot-reload.md b/docs/zh-cn/features/hot-reload.md
index b0442ccd4..f6e583301 100644
--- a/docs/zh-cn/features/hot-reload.md
+++ b/docs/zh-cn/features/hot-reload.md
@@ -1,6 +1,6 @@
 # 热重载
 
-"热重载"不是当你修改文件的时候简单重新加载页面。启用热重载后，当你修改 `.vue` 文件时，所有该组件的实例会被替换，**并且不需要刷新页面**。它甚至保持应用程序和被替换组件的当前状态！当你调整模版或者修改样式时，这极大的提高了开发体验。
+"热重载"不是当你修改文件的时候简单重新加载页面。启用热重载后，当你修改 `.vue` 文件时，该组件的所有实例将在**不刷新页面**的情况下被替换。它甚至保持了应用程序和被替换组件的当前状态！当你调整模版或者修改样式时，这极大地提高了开发体验。
 
 ![hot-reload](http://blog.evanyou.me/images/vue-hot.gif)
 
@@ -28,7 +28,7 @@
  * webpack 会压缩代码
  * `process.env.NODE_ENV === 'production'`
 
-你可以设置 `hotReload: false` 选项来显式关闭热重载：
+你可以设置 `hotReload: false` 选项来显式地关闭热重载：
 
 ``` js
 module: {

From 2f7f4145edd4786a54e61be50030810371edcfd5 Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Mon, 28 May 2018 14:30:55 +0100
Subject: [PATCH 873/877] fix: Explicitly set the prettier parser to 'babylon'
 (#1323)

---
 lib/template-compiler/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 973ea5b4b..130faaf09 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -70,7 +70,7 @@ module.exports = function (html) {
 
     // prettify render fn
     if (!isProduction) {
-      code = prettier.format(code, { semi: false })
+      code = prettier.format(code, { semi: false, parser: 'babylon' })
     }
 
     // mark with stripped (this enables Vue to use correct runtime proxy detection)

From eb42810a27a85b6404ead468cdb68e5181c46af3 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 May 2018 09:32:55 -0400
Subject: [PATCH 874/877] chore: use cc cli

---
 package.json |   4 +-
 yarn.lock    | 135 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 82 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index 905032630..b782b08ff 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "test": "eslint lib && mocha --slow 5000 --timeout 10000",
     "docs": "cd docs && gitbook install && gitbook serve",
     "docs:deploy": "bash ./docs/deploy.sh",
-    "postpublish": "conventional-changelog -p angular -r 2 > RELEASE.md"
+    "prepublishOnly": "conventional-changelog -p angular -r 2 > RELEASE.md"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"
@@ -69,7 +69,7 @@
     "chai": "^4.1.0",
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.12.7",
-    "conventional-changelog": "^1.1.18",
+    "conventional-changelog-cli": "^1.3.22",
     "css-loader": "^0.28.4",
     "eslint": "^3.19.0",
     "eslint-plugin-vue-libs": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 5ac9be957..555a4a33c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -47,6 +47,10 @@ acorn@^5.0.0, acorn@^5.2.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 
+add-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+
 ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
@@ -1243,29 +1247,39 @@ conventional-changelog-angular@^1.6.6:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-atom@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz#4917759947f4db86073f9d3838a2d54302d5843d"
+conventional-changelog-atom@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-codemirror@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz#debc43991d487d7964e65087fbbe034044bd51fb"
+conventional-changelog-cli@^1.3.22:
+  version "1.3.22"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz#13570fe1728f56f013ff7a88878ff49d5162a405"
+  dependencies:
+    add-stream "^1.0.0"
+    conventional-changelog "^1.1.24"
+    lodash "^4.2.1"
+    meow "^4.0.0"
+    tempfile "^1.1.1"
+
+conventional-changelog-codemirror@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-core@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz#45b6347c4c6512e1f163f7ff55c9f5bcb88fd990"
+conventional-changelog-core@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
   dependencies:
-    conventional-changelog-writer "^3.0.4"
-    conventional-commits-parser "^2.1.5"
+    conventional-changelog-writer "^3.0.9"
+    conventional-commits-parser "^2.1.7"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.3.4"
+    git-raw-commits "^1.3.6"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.3.4"
+    git-semver-tags "^1.3.6"
     lodash "^4.2.1"
     normalize-package-data "^2.3.5"
     q "^1.5.1"
@@ -1273,21 +1287,21 @@ conventional-changelog-core@^2.0.5:
     read-pkg-up "^1.0.1"
     through2 "^2.0.0"
 
-conventional-changelog-ember@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz#f3825d7434168f3d9211b5532dc1d5769532b668"
+conventional-changelog-ember@^0.3.12:
+  version "0.3.12"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-eslint@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz#8bae05ebbf574e6506caf7b37dc51ca21b74d220"
+conventional-changelog-eslint@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
   dependencies:
     q "^1.5.1"
 
-conventional-changelog-express@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz#812a9cf778677e12f978ac9c40d85297c0bfcca9"
+conventional-changelog-express@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
   dependencies:
     q "^1.5.1"
 
@@ -1303,23 +1317,23 @@ conventional-changelog-jscs@^0.1.0:
   dependencies:
     q "^1.4.1"
 
-conventional-changelog-jshint@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz#b2de33cd0870d9af804ac6a4fded0ee25b69c9bb"
+conventional-changelog-jshint@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-preset-loader@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz#b29af6332f9313857be36427623c9016bfeeaf33"
+conventional-changelog-preset-loader@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
 
-conventional-changelog-writer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz#705b46a8b8277bd7fd79cad8032095b5d803864c"
+conventional-changelog-writer@^3.0.9:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^1.1.5"
+    conventional-commits-filter "^1.1.6"
     dateformat "^3.0.0"
     handlebars "^4.0.2"
     json-stringify-safe "^5.0.1"
@@ -1329,32 +1343,32 @@ conventional-changelog-writer@^3.0.4:
     split "^1.0.0"
     through2 "^2.0.0"
 
-conventional-changelog@^1.1.18:
-  version "1.1.18"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.18.tgz#ffe28798e4ddef5f6e2f74398e8248bcb233360b"
+conventional-changelog@^1.1.24:
+  version "1.1.24"
+  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
   dependencies:
     conventional-changelog-angular "^1.6.6"
-    conventional-changelog-atom "^0.2.4"
-    conventional-changelog-codemirror "^0.3.4"
-    conventional-changelog-core "^2.0.5"
-    conventional-changelog-ember "^0.3.6"
-    conventional-changelog-eslint "^1.0.5"
-    conventional-changelog-express "^0.3.4"
+    conventional-changelog-atom "^0.2.8"
+    conventional-changelog-codemirror "^0.3.8"
+    conventional-changelog-core "^2.0.11"
+    conventional-changelog-ember "^0.3.12"
+    conventional-changelog-eslint "^1.0.9"
+    conventional-changelog-express "^0.3.6"
     conventional-changelog-jquery "^0.1.0"
     conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.3.4"
-    conventional-changelog-preset-loader "^1.1.6"
+    conventional-changelog-jshint "^0.3.8"
+    conventional-changelog-preset-loader "^1.1.8"
 
-conventional-commits-filter@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65"
+conventional-commits-filter@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0"
+conventional-commits-parser@^2.1.7:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2249,9 +2263,9 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001"
+git-raw-commits@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -2266,9 +2280,9 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92"
+git-semver-tags@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -4990,6 +5004,13 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tempfile@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
+  dependencies:
+    os-tmpdir "^1.0.0"
+    uuid "^2.0.1"
+
 text-extensions@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
@@ -5151,6 +5172,10 @@ util@0.10.3, util@^0.10.3:
   dependencies:
     inherits "2.0.1"
 
+uuid@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+
 uuid@^3.0.0, uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"

From 6430bc0420d5880d78b7a6326c363f202df629e2 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 28 May 2018 09:33:01 -0400
Subject: [PATCH 875/877] 14.2.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b782b08ff..11a3d165e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-loader",
-  "version": "14.2.2",
+  "version": "14.2.3",
   "description": "Vue single-file component loader for Webpack",
   "main": "index.js",
   "repository": {

From d55e391bfba760162eb32b7bd23ea97ae8ecf767 Mon Sep 17 00:00:00 2001
From: Francisco Grau <grau.fran@gmail.com>
Date: Sun, 27 Jan 2019 20:55:44 +0100
Subject: [PATCH 876/877] chore: update prettier + replace deprecated option
 (#1480)

---
 lib/template-compiler/index.js | 2 +-
 package.json                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
index 130faaf09..d5589b707 100644
--- a/lib/template-compiler/index.js
+++ b/lib/template-compiler/index.js
@@ -70,7 +70,7 @@ module.exports = function (html) {
 
     // prettify render fn
     if (!isProduction) {
-      code = prettier.format(code, { semi: false, parser: 'babylon' })
+      code = prettier.format(code, { semi: false, parser: 'babel' })
     }
 
     // mark with stripped (this enables Vue to use correct runtime proxy detection)
diff --git a/package.json b/package.json
index 905032630..52ce64316 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "postcss": "^6.0.8",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
-    "prettier": "^1.7.0",
+    "prettier": "^1.16.0",
     "resolve": "^1.4.0",
     "source-map": "^0.6.1",
     "vue-hot-reload-api": "^2.2.0",

From 9d62d503d5f61dee998c6940f8c6f9f895f2dc9d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 21 Feb 2019 21:57:47 -0500
Subject: [PATCH 877/877] bump deps

---
 yarn.lock | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 555a4a33c..3b5b90fec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4079,9 +4079,10 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.7.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
+prettier@^1.16.0:
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
 
 pretty-format@^21.2.1:
   version "21.2.1"
@@ -5241,8 +5242,9 @@ vue-template-compiler@^2.5.0:
     he "^1.1.0"
 
 vue-template-es2015-compiler@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
+  integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
 vue@^2.5.0:
   version "2.5.13"