Partial rewrite for Vue 2.0 compatibility

Author: foxbenjaminfox

CHANGELOG.md

@@ -2,13 +2,18 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Changelog
 
+- [2.0.0-rc1](#200-rc1)
 - [v1.4.0](#v140)
 - [v1.2.0](#v120)
 - [v1.1.0](#v110)
 - [v1.0.0](#v100)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+### 2.0.0-rc1
+  * Supports the Vue 2.0 release candidate.
+  * Note that this itself is an alpha version, which might not work if Vue's internals change again before the final release of Vue 2.0. Use with caution.
+
 ### v1.4.0
   * Add CommonJS support
 

package.json

@@ -43,6 +43,9 @@
     "url": "https://github.com/foxbenjaminfox/vue-async-computed/issues"
   },
   "homepage": "https://github.com/foxbenjaminfox/vue-async-computed#readme",
+  "peerDependencies": {
+    "vue": "^2.0.0-rc.4"
+  },
   "devDependencies": {
     "babel-cli": "^6.6.5",
     "babel-core": "^6.7.7",
@@ -61,7 +64,7 @@
     "rimraf": "^2.5.2",
     "tap-spec": "^4.1.1",
     "tape": "^4.5.1",
-    "vue": "^1.0.20",
+    "vue": "^2.0.0-rc.4",
     "watch": "^0.17.1"
   }
 }

src/index.js

@@ -9,16 +9,29 @@ export default {
       .asyncComputed = Vue.config.optionMergeStrategies.computed
 
     Vue.mixin({
-      created () {
+      beforeCreate () {
+        const optionData = this.$options.data
+        const newData = {}
+
+        if (!this.$options.computed) this.$options.computed = {}
+
         Object.keys(this.$options.asyncComputed || {}).forEach(key => {
           const fn = this.$options.asyncComputed[key]
-          if (!this.$options.computed) this.$options.computed = {}
-          Vue.set(this.$options.computed, prefix + key, fn)
-          Vue.set(this, key, null)
+          this.$options.computed[prefix + key] = fn
+          newData[key] = null
         })
 
-        this._initComputed()
-
+        this.$options.data = function vueAsyncComputedInjectedDataFn () {
+          const data = (
+              (typeof optionData === 'function')
+                ? optionData.call(this)
+                : optionData
+             ) || {}
+          Object.keys(newData).forEach(key => { data[key] = newData[key] })
+          return data
+        }
+      },
+      created () {
         Object.keys(this.$options.asyncComputed || {}).forEach(key => {
           let promiseId = 0
           this.$watch(prefix + key, newPromise => {