Merge branch 'master' into filter-state

Author: posva

.eslintrc

@@ -1,5 +1,8 @@
 {
   "root": true,
+  "env": {
+    "browser": true
+  },
   "extends": [
     "plugin:vue-libs/recommended"
   ],

docs/workaround-for-safari.md

@@ -7,4 +7,6 @@
 5. Open Develop -> Show Extension Builder
 6. Click the plus button in the bottom left and select Add Extension...
 7. Select shells/safari/Vue.js devtools.safariextension
-8. Click Install in the top right
+8. Select _All_ in Website Access -> Access Level
+9. Check _Include Secure Webpages_
+10. Click Install in the top right

package.json

@@ -32,31 +32,31 @@
   },
   "homepage": "https://github.com/vuejs/vue-devtools#readme",
   "devDependencies": {
-    "buble": "^0.15.1",
+    "buble": "^0.16.0",
     "buble-loader": "^0.4.0",
     "chromedriver": "^2.25.1",
-    "cross-env": "^3.1.3",
-    "css-loader": "^0.26.1",
-    "eslint": "^3.9.1",
+    "cross-env": "^5.0.5",
+    "css-loader": "^0.28.1",
+    "eslint": "^3.19.0",
     "eslint-plugin-vue-libs": "^1.2.0",
-    "file-loader": "^0.9.0",
+    "file-loader": "^1.1.5",
     "friendly-errors-webpack-plugin": "^1.1.2",
     "nightwatch": "^0.9.4",
     "nightwatch-helpers": "^1.2.0",
     "selenium-server": "2.52.0",
     "stylus": "^0.54.5",
-    "stylus-loader": "^2.1.1",
-    "url-loader": "^0.5.6",
-    "vue-loader": "^12.2.0",
+    "stylus-loader": "^3.0.1",
+    "url-loader": "^0.6.2",
+    "vue-loader": "^13.3.0",
     "vue-template-compiler": "^2.0.0",
-    "webpack": "^2.2.0",
-    "webpack-dev-server": "^2.2.0"
+    "webpack": "^3.7.0",
+    "webpack-dev-server": "^2.9.1"
   },
   "dependencies": {
     "circular-json-es6": "^2.0.0",
     "lodash.debounce": "^4.0.6",
     "lodash.groupby": "^4.6.0",
     "vue": "^2.0.0",
-    "vuex": "^2.0.0"
+    "vuex": "^3.0.0"
   }
 }

src/backend/index.js

@@ -94,7 +94,12 @@ function connect () {
 
   bridge.log('backend ready.')
   bridge.send('ready', hook.Vue.version)
-  console.log('[vue-devtools] Ready. Detected Vue v' + hook.Vue.version)
+  console.log(
+    `%c vue-devtools %c Detected Vue v${hook.Vue.version} %c`,
+    'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff',
+    'background:#41b883 ; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff',
+    'background:transparent'
+  )
   scan()
 }
 

src/devtools/views/components/ComponentInstance.vue

@@ -6,6 +6,7 @@
     }">
     <div class="self"
       @click.stop="select"
+      @dblclick.stop="toggle"
       @mouseenter="enter"
       @mouseleave="leave"
       :class="{ selected: selected }"

src/util.js

@@ -162,5 +162,4 @@ export function sortByKey (state) {
     if (a.key > b.key) return 1
     return 0
   })
-}
-
+}