Skip to content

Commit

Permalink
fix: use Vue async option for sync mode (#1062)
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyerburgh authored Feb 2, 2019
1 parent 32ce160 commit 4c65dbd
Show file tree
Hide file tree
Showing 21 changed files with 2,380 additions and 1,305 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ restore_node_modules: &restore_node_modules
name: Restore node_modules cache
keys:
- v1-dependencies-{{ .Branch }}-{{ checksum "yarn.lock" }}
- v1-dependencies-{{ .Branch }}-
- v1-dependencies-
jobs:
install:
<<: *defaults
Expand Down
1 change: 0 additions & 1 deletion flow/config.flow.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ declare type Config = {
mocks?: Object,
methods?: { [name: string]: Function },
provide?: Object,
logModifiedComponents?: boolean,
silent?: boolean
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@
"sinon-chai": "^2.10.0",
"typescript": "^3.0.1",
"vee-validate": "^2.1.3",
"vue": "2.5.16",
"vue": "2.5.21",
"vue-class-component": "^6.1.2",
"vue-loader": "^13.6.2",
"vue-router": "^3.0.1",
"vue-server-renderer": "2.5.16",
"vue-template-compiler": "2.5.16",
"vue-server-renderer": "2.5.21",
"vue-template-compiler": "2.5.21",
"vuepress": "^0.14.2",
"vuepress-theme-vue": "^1.0.3",
"vuex": "^3.0.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/create-instance/create-instance.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ export default function createInstance(
componentOptions.$_vueTestUtils_original = component

// make sure all extends are based on this instance
componentOptions._base = _Vue

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

Constructor.options._base = _Vue

const scopedSlots = createScopedSlots(options.scopedSlots, _Vue)

const parentComponentOptions = options.parentComponent || {}
Expand Down
1 change: 0 additions & 1 deletion packages/create-instance/extract-instance-options.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const MOUNTING_OPTIONS = [
'attrs',
'listeners',
'propsData',
'logModifiedComponents',
'sync',
'shouldProxy'
]
Expand Down
Loading

0 comments on commit 4c65dbd

Please sign in to comment.