Merge branch 'release/0.7.1'

pagekit · May 26, 2016 · 2cc38d6 · 2cc38d6
2 parents 910ad58 + 264ae11
commit 2cc38d6
Show file tree

Hide file tree

Showing 10 changed files with 209 additions and 198 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
   "description": "A web request service for Vue.js",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",
   "ignore": [

diff --git a/build/webpack.build.config.js b/build/webpack.build.config.js
@@ -17,6 +17,11 @@ module.exports = [
             library: "VueResource",
             libraryTarget: "umd"
         },
+        module: {
+            loaders: [
+                {test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015-without-strict']}}
+            ]
+        },
         plugins: [
             new webpack.BannerPlugin(banner, {raw: true})
         ]
@@ -30,6 +35,11 @@ module.exports = [
             library: "VueResource",
             libraryTarget: "umd"
         },
+        module: {
+            loaders: [
+                {test: /.js/, exclude: /node_modules/, loader: 'babel', query: {presets: ['es2015-without-strict']}}
+            ]
+        },
         plugins: [
             new webpack.optimize.UglifyJsPlugin,
             new webpack.BannerPlugin(banner, {raw: true})