Merge branch 'master' into rc

Author: antfu

.github/workflows/nodejs.yml

@@ -1,12 +1,6 @@
 name: Build & Test
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   build:
@@ -31,4 +25,3 @@ jobs:
         run: yarn test-unit
         env:
           CI: true
-      

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="0.6.6"></a>
+## [0.6.6](https://github.com/vuejs/composition-api/compare/v0.6.5...v0.6.6) (2020-06-21)
+
+
+### Reverts
+
+* [#387](https://github.com/vuejs/composition-api/issues/387) ([#395](https://github.com/vuejs/composition-api/issues/395)) ([b9fab71](https://github.com/vuejs/composition-api/commit/b9fab71))
+
+
+
 <a name="0.6.5"></a>
 ## [0.6.5](https://github.com/vuejs/composition-api/compare/v0.6.4...v0.6.5) (2020-06-19)
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019-present, liximomo(X.L)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -294,6 +294,21 @@ declare module '@vue/composition-api' {
 </details>
 
 
+### :x: Reactive APIs in `data()`
+
+Passing `ref`, `reactive` or other reactive apis to `data()` would not work.
+
+```jsx
+export default {
+  data() {
+    return {
+      // will result { a: { value: 1 } } in template
+      a: ref(1) 
+    }
+  },
+};
+```
+
 ## SSR
 
 Even if there is no definitive Vue 3 API for SSR yet, this plugin implements the `onServerPrefetch` lifecycle hook that allows you to use the `serverPrefetch` hook found in the classic API.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/composition-api",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "Provide logic composition capabilities for Vue.",
   "keywords": [
     "vue",

src/setup.ts

@@ -154,22 +154,6 @@ export function mixin(Vue: VueConstructor) {
       }
     }
 
-    const { data } = $options
-    // wrapper the data option, so we can invoke setup before data get resolved
-    $options.data = function wrappedData() {
-      if (setup) {
-        initSetup(vm, vm.$props)
-      }
-      const dataValue =
-        typeof data === 'function'
-          ? (data as (
-              this: ComponentInstance,
-              x: ComponentInstance
-            ) => object).call(vm, vm)
-          : data || {}
-      return unwrapRefProxy(dataValue)
-    }
-
     if (!setup) {
       return
     }
@@ -182,6 +166,18 @@ export function mixin(Vue: VueConstructor) {
       }
       return
     }
+
+    const { data } = $options
+    // wrapper the data option, so we can invoke setup before data get resolved
+    $options.data = function wrappedData() {
+      initSetup(vm, vm.$props)
+      return typeof data === 'function'
+        ? (data as (
+            this: ComponentInstance,
+            x: ComponentInstance
+          ) => object).call(vm, vm)
+        : data || {}
+    }
   }
 
   function initSetup(vm: ComponentInstance, props: Record<any, any> = {}) {

test/setup.spec.js

@@ -84,19 +84,6 @@ describe('setup', () => {
     expect(vm.b).toBe(1)
   })
 
-  // #385
-  it('should unwrapRef on data', () => {
-    const vm = new Vue({
-      data() {
-        return {
-          a: ref(1),
-        }
-      },
-      setup() {},
-    }).$mount()
-    expect(vm.a).toBe(1)
-  })
-
   it('should work with `methods` and `data` options', (done) => {
     let calls = 0
     const vm = new Vue({
@@ -769,37 +756,4 @@ describe('setup', () => {
     const vm = new Vue(Constructor).$mount()
     expect(vm.$el.textContent).toBe('Composition-api')
   })
-
-  it('should keep data reactive', async () => {
-    const vm = new Vue({
-      template: `<div>
-        <button id="a" @click="a++">{{a}}</button>
-        <button id="b" @click="b++">{{b}}</button>
-      </div>`,
-      data() {
-        return {
-          a: 1,
-          b: ref(1),
-        }
-      },
-    }).$mount()
-
-    const a = vm.$el.querySelector('#a')
-    const b = vm.$el.querySelector('#b')
-
-    expect(a.textContent).toBe('1')
-    expect(b.textContent).toBe('1')
-
-    a.click()
-    await Vue.nextTick()
-
-    expect(a.textContent).toBe('2')
-    expect(b.textContent).toBe('1')
-
-    b.click()
-    await Vue.nextTick()
-
-    expect(a.textContent).toBe('2')
-    expect(b.textContent).toBe('2')
-  })
 })