Skip to content

Commit 4c65dbd

Browse files
authored
fix: use Vue async option for sync mode (#1062)
1 parent 32ce160 commit 4c65dbd

21 files changed

+2380
-1305
lines changed

Diff for: .circleci/config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ restore_node_modules: &restore_node_modules
99
name: Restore node_modules cache
1010
keys:
1111
- v1-dependencies-{{ .Branch }}-{{ checksum "yarn.lock" }}
12-
- v1-dependencies-{{ .Branch }}-
13-
- v1-dependencies-
1412
jobs:
1513
install:
1614
<<: *defaults

Diff for: flow/config.flow.js

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ declare type Config = {
33
mocks?: Object,
44
methods?: { [name: string]: Function },
55
provide?: Object,
6-
logModifiedComponents?: boolean,
76
silent?: boolean
87
}

Diff for: package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
"sinon-chai": "^2.10.0",
6969
"typescript": "^3.0.1",
7070
"vee-validate": "^2.1.3",
71-
"vue": "2.5.16",
71+
"vue": "2.5.21",
7272
"vue-class-component": "^6.1.2",
7373
"vue-loader": "^13.6.2",
7474
"vue-router": "^3.0.1",
75-
"vue-server-renderer": "2.5.16",
76-
"vue-template-compiler": "2.5.16",
75+
"vue-server-renderer": "2.5.21",
76+
"vue-template-compiler": "2.5.21",
7777
"vuepress": "^0.14.2",
7878
"vuepress-theme-vue": "^1.0.3",
7979
"vuex": "^3.0.1",

Diff for: packages/create-instance/create-instance.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ export default function createInstance(
7272
componentOptions.$_vueTestUtils_original = component
7373

7474
// make sure all extends are based on this instance
75-
componentOptions._base = _Vue
7675

7776
const Constructor = _Vue.extend(componentOptions).extend(instanceOptions)
7877

78+
Constructor.options._base = _Vue
79+
7980
const scopedSlots = createScopedSlots(options.scopedSlots, _Vue)
8081

8182
const parentComponentOptions = options.parentComponent || {}

Diff for: packages/create-instance/extract-instance-options.js

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ const MOUNTING_OPTIONS = [
1111
'attrs',
1212
'listeners',
1313
'propsData',
14-
'logModifiedComponents',
1514
'sync',
1615
'shouldProxy'
1716
]

0 commit comments

Comments
 (0)