Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use Vue async option for sync mode #1062

Merged
merged 12 commits into from
Feb 2, 2019
Merged

fix: use Vue async option for sync mode #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c296d5
fix: use Vue async option for sync mode
eddyerburgh Dec 10, 2018
0b516fe
fix: handle scoped slots
eddyerburgh Dec 11, 2018
c8ff961
test: only run in Vue 2.5
eddyerburgh Dec 11, 2018
be4b6e0
docs: fix wording in warning
Jan 15, 2019
87de099
chore: merge
eddyerburgh Feb 2, 2019
d4fbc99
test: update test
eddyerburgh Feb 2, 2019
01a88f7
chore: merge
eddyerburgh Feb 2, 2019
fa9e058
fix: remove logModfiedComponents option
eddyerburgh Feb 2, 2019
ac452a2
Use latest Vue version
eddyerburgh Feb 2, 2019
6669d9e
chore: use yarn.lock checksum to restore cache
eddyerburgh Feb 2, 2019
a14365a
refactor: use Vue 2.5.21
eddyerburgh Feb 2, 2019
324e2de
refactor: use semver.lt function
eddyerburgh Feb 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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