Skip to content

Commit 4f738f7

Browse files
committed
chore: update deps, close #731
1 parent debd37d commit 4f738f7

File tree

5 files changed

+261
-529
lines changed

5 files changed

+261
-529
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,34 @@
4444
},
4545
"homepage": "https://github.com/vuejs/composition-api#readme",
4646
"devDependencies": {
47-
"@rollup/plugin-node-resolve": "^11.2.1",
47+
"@rollup/plugin-node-resolve": "^13.0.0",
4848
"@rollup/plugin-replace": "^2.4.2",
49-
"@types/jest": "^26.0.22",
50-
"@types/node": "^14.14.41",
51-
"concurrently": "^5.3.0",
49+
"@types/jest": "^26.0.23",
50+
"@types/node": "^15.14.0",
51+
"concurrently": "^6.2.0",
5252
"conventional-changelog-cli": "^2.1.1",
5353
"conventional-github-releaser": "^3.1.5",
5454
"cross-env": "^7.0.3",
5555
"husky": "^4.3.8",
5656
"jest": "^26.6.3",
57-
"lint-staged": "^10.5.4",
58-
"prettier": "^2.2.1",
57+
"lint-staged": "^11.0.0",
58+
"prettier": "^2.3.2",
5959
"rimraf": "^3.0.2",
60-
"rollup": "^2.45.2",
61-
"rollup-plugin-dts": "^3.0.1",
60+
"rollup": "^2.52.7",
61+
"rollup-plugin-dts": "^3.0.2",
6262
"rollup-plugin-terser": "^7.0.2",
6363
"rollup-plugin-typescript2": "^0.30.0",
6464
"ts-jest": "^26.5.5",
65-
"typescript": "^4.2.4",
66-
"vue": "^2.6.12",
67-
"vue-router": "^3.5.1",
68-
"vue-server-renderer": "^2.6.12"
65+
"typescript": "^4.3.5",
66+
"vue": "^2.6.14",
67+
"vue-router": "^3.5.2",
68+
"vue-server-renderer": "^2.6.14"
6969
},
7070
"peerDependencies": {
7171
"vue": ">= 2.5 < 3"
7272
},
7373
"dependencies": {
74-
"tslib": "^2.2.0"
74+
"tslib": "^2.3.0"
7575
},
7676
"husky": {
7777
"hooks": {

src/mixin.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ export function mixin(Vue: VueConstructor) {
7272
$options.data = function wrappedData() {
7373
initSetup(vm, vm.$props)
7474
return typeof data === 'function'
75-
? (data as (
76-
this: ComponentInstance,
77-
x: ComponentInstance
78-
) => object).call(vm, vm)
75+
? (
76+
data as (this: ComponentInstance, x: ComponentInstance) => object
77+
).call(vm, vm)
7978
: data || {}
8079
}
8180
}
@@ -159,6 +158,7 @@ export function mixin(Vue: VueConstructor) {
159158
)
160159
return
161160
const Vue = getVueConstructor()
161+
// @ts-expect-error https://github.com/vuejs/vue/pull/12132
162162
const defineReactive = Vue.util.defineReactive
163163

164164
Object.keys(target).forEach((k) => {

src/reactivity/set.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { defineAccessControl } from './reactive'
1010
*/
1111
export function set<T>(target: AnyObject, key: any, val: T): T {
1212
const Vue = getVueConstructor()
13+
// @ts-expect-error https://github.com/vuejs/vue/pull/12132
1314
const { warn, defineReactive } = Vue.util
1415
if (__DEV__ && (isUndef(target) || isPrimitive(target))) {
1516
warn(

src/utils/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export function isUndef(v: any): boolean {
9898
return v === undefined || v === null
9999
}
100100

101-
export function warn(msg: string, vm?: Vue | null) {
101+
export function warn(msg: string, vm?: Vue) {
102102
Vue.util.warn(msg, vm)
103103
}
104104

0 commit comments

Comments
 (0)