From 7b691343469ff7e6a0b448f18aecf1267220e5d8 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 8 Nov 2016 13:42:35 -0500
Subject: [PATCH] bump deps and fix config

---
 package.json                    | 21 +++++++++++----------
 shells/chrome/webpack.config.js | 10 +++++++++-
 shells/dev/webpack.config.js    | 11 ++++++++++-
 test/assertions/elementCount.js | 18 ------------------
 4 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 test/assertions/elementCount.js

diff --git a/package.json b/package.json
index 7bdef86c0..286f7d762 100644
--- a/package.json
+++ b/package.json
@@ -27,13 +27,13 @@
   "homepage": "https://github.com/vuejs/vue-devtools#readme",
   "devDependencies": {
     "buble": "^0.14.0",
-    "buble-loader": "github:yyx990803/buble-loader",
-    "chromedriver": "^2.21.2",
-    "cross-env": "^1.0.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-vue": "^1.0.0",
-    "eslint-plugin-html": "^1.5.1",
+    "buble-loader": "^0.3.2",
+    "chromedriver": "^2.25.1",
+    "cross-env": "^3.1.3",
+    "css-loader": "^0.25.0",
+    "eslint": "^3.9.1",
+    "eslint-config-vue": "^2.0.0",
+    "eslint-plugin-vue": "^1.0.0",
     "file-loader": "^0.9.0",
     "nightwatch": "^0.9.4",
     "nightwatch-helpers": "^1.2.0",
@@ -41,14 +41,15 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.1.1",
     "url-loader": "^0.5.6",
-    "vue-loader": "^9.7.0",
+    "vue-loader": "^9.8.1",
     "webpack": "^2.1.0-beta.25",
     "webpack-dev-server": "^2.1.0-beta.0"
   },
   "dependencies": {
     "circular-json-es6": "^2.0.0",
     "lodash.debounce": "^4.0.6",
-    "vue": "^2.0.0-rc.3",
-    "vuex": "^2.0.0-rc.4"
+    "nightwatch-helpers": "^1.2.0",
+    "vue": "^2.0.0",
+    "vuex": "^2.0.0"
   }
 }
diff --git a/shells/chrome/webpack.config.js b/shells/chrome/webpack.config.js
index 5753ab125..81bbd68c5 100644
--- a/shells/chrome/webpack.config.js
+++ b/shells/chrome/webpack.config.js
@@ -1,6 +1,10 @@
 var path = require('path')
 var webpack = require('webpack')
 
+var bubleOptions = {
+  objectAssign: 'Object.assign'
+}
+
 module.exports = {
   entry: {
     hook: './src/hook.js',
@@ -25,10 +29,14 @@ module.exports = {
         test: /\.js$/,
         loader:  'buble',
         exclude: /node_modules|vue\/dist|vuex\/dist/,
+        options: bubleOptions
       },
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue',
+        options: {
+          buble: bubleOptions
+        }
       },
       {
         test: /\.(png|woff2)$/,
diff --git a/shells/dev/webpack.config.js b/shells/dev/webpack.config.js
index 088e3ac1b..38fccf4c7 100644
--- a/shells/dev/webpack.config.js
+++ b/shells/dev/webpack.config.js
@@ -1,5 +1,9 @@
 var path = require('path')
 
+var bubleOptions = {
+  objectAssign: 'Object.assign'
+}
+
 module.exports = {
   entry: {
     devtools: './src/devtools.js',
@@ -14,6 +18,7 @@ module.exports = {
   },
   resolve: {
     alias: {
+      vue$: 'vue/dist/vue.js',
       src: path.resolve(__dirname, '../../src')
     }
   },
@@ -23,10 +28,14 @@ module.exports = {
         test: /\.js$/,
         loader:  'buble',
         exclude: /node_modules|vue\/dist|vuex\/dist/,
+        options: bubleOptions
       },
       {
         test: /\.vue$/,
-        loader: 'vue'
+        loader: 'vue',
+        options: {
+          buble: bubleOptions
+        }
       },
       {
         test: /\.(png|woff2)$/,
diff --git a/test/assertions/elementCount.js b/test/assertions/elementCount.js
deleted file mode 100644
index 510d6f0f4..000000000
--- a/test/assertions/elementCount.js
+++ /dev/null
@@ -1,18 +0,0 @@
-exports.assertion = function (selector, count) {
-  this.message = 'Testing if element <' + selector + '> has count: ' + count
-  this.expected = count
-  this.pass = function (val) {
-    return val === this.expected
-  }
-  this.value = function (res) {
-    return res.value
-  }
-  this.command = function (cb) {
-    var self = this
-    return this.api.execute(function (selector) {
-      return document.querySelectorAll(selector).length
-    }, [selector], function (res) {
-      cb.call(self, res)
-    })
-  }
-}