Merge branch 'master' into dev

Guillaume Chau · Guillaume Chau · commit fee31d70336d · 2018-08-09T17:45:14.000+02:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-devtools",
-  "version": "4.1.5-beta.2",
+  "version": "4.1.5",
   "description": "devtools for Vue.js!",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "zip": "npm run zip:chrome && npm run zip:firefox",
     "zip:chrome": "cd shells && zip -r -FS ../dist/chrome.zip chrome -x *src/* -x *webpack.config.js",
     "zip:firefox": "web-ext build -s shells/chrome -a dist -i src --overwrite-dest",
-    "sign:firefox": "web-ext sign -s shells/chrome -a dist -i src --id {f0beaa66-17d0-42e9-b1c9-c52da6252db8}",
+    "sign:firefox": "cross-env WEB_EXT_API_KEY=VUE_DEVTOOLS_AMO_KEY WEB_EXT_API_SECRET=VUE_DEVTOOLS_AMO_SECRET web-ext sign -s shells/chrome -a dist -i src --id {f0beaa66-17d0-42e9-b1c9-c52da6252db8}",
     "release": "node release.js && npm run test && npm run build && npm run zip",
     "release:beta": "cross-env RELEASE_CHANNEL=beta npm run release && npm run sign:firefox",
     "test": "npm run lint && npm run test:e2e",
diff --git a/shells/chrome/manifest.json b/shells/chrome/manifest.json
@@ -1,13 +1,13 @@
 {
   "name": "Vue.js devtools",
-  "version": "4.1.5.2",
-  "version_name": "4.1.5 beta",
+  "version": "4.1.5",
+  "version_name": "4.1.5",
   "description": "Chrome and Firefox DevTools extension for debugging Vue.js applications.",
   "manifest_version": 2,
   "icons": {
-    "16": "icons/16-beta.png",
-    "48": "icons/48-beta.png",
-    "128": "icons/128-beta.png"
+    "16": "icons/16.png",
+    "48": "icons/48.png",
+    "128": "icons/128.png"
   },
   "browser_action": {
     "default_icon": {
diff --git a/shells/electron/package.json b/shells/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/devtools",
-  "version": "1.1.0",
+  "version": "4.1.5",
   "description": "StandAlone vue-devtools",
   "repository": {
     "url": "https://github.com/vuejs/vue-devtools.git",
diff --git a/src/.eslintrc.js b/src/.eslintrc.js
@@ -0,0 +1,11 @@
+module.exports = {
+  rules: {
+    'no-restricted-syntax': [
+      'error',
+      {
+        selector: 'ForOfStatement',
+        message: 'Not supported by bublé'
+      }
+    ]
+  }
+}
diff --git a/src/devtools/.eslintrc.js b/src/devtools/.eslintrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  rules: {
+    'no-restricted-syntax': 'off'
+  }
+}
diff --git a/src/shared-data.js b/src/shared-data.js
@@ -89,17 +89,16 @@ export function watch (...args) {
   vm.$watch(...args)
 }
 
-// Proxy traps
-const traps = {
-  get (target, key) {
-    return vm && vm.$data[key]
-  },
-  set (target, key, value) {
-    sendValue(key, value)
-    return setValue(key, value)
-  }
-}
-
-const SharedDataProxy = new Proxy({}, traps)
+const proxy = {}
+Object.keys(internalSharedData).forEach(key => {
+  Object.defineProperty(proxy, key, {
+    configurable: false,
+    get: () => vm && vm.$data[key],
+    set: (value) => {
+      sendValue(key, value)
+      setValue(key, value)
+    }
+  })
+})
 
-export default SharedDataProxy
+export default proxy
diff --git a/src/util.js b/src/util.js
@@ -480,8 +480,8 @@ export function set (object, path, value, cb = null) {
 
 export function get (object, path) {
   const sections = path.split('.')
-  for (const section of sections) {
-    object = object[section]
+  for (let i = 0; i < sections.length; i++) {
+    object = object[sections[i]]
     if (!object) {
       return undefined
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vue/devtools",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "4.1.5",`
`4`	`4`	`"description": "StandAlone vue-devtools",`
`5`	`5`	`"repository": {`
`6`	`6`	`"url": "https://github.com/vuejs/vue-devtools.git",`