merge buble/templateBuble options

Author: yyx990803

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
 

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
           }
         }
       }

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 &&