mirrors/vue-meta
2
0
Fork 0
mirror of https://github.com/tenrok/vue-meta.git synced 2026-06-23 23:00:35 +03:00
Code Activity

Revert "fix: set ssr appId in mounted hook"

Browse Source 
This reverts commit 2dd1697ead.
This commit is contained in:
pimlie
2019-06-09 13:54:15 +02:00
parent 2dd1697ead
commit b2a7a8449b
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/mixin.js
+4 -2
View File
@@ -75,14 +75,16 @@ export default function createMixin(Vue, options) {
this.$root._vueMeta.initialized = this.$isServer this.$root._vueMeta.initialized = this.$isServer
if (!this.$root._vueMeta.initialized) { if (!this.$root._vueMeta.initialized) {
// we use the mounted hook here as on page load ensuredPush(this.$options, 'beforeMount', () => {
ensuredPush(this.$options, 'mounted', () => {
// if this Vue-app was server rendered, set the appId to 'ssr' // if this Vue-app was server rendered, set the appId to 'ssr'
// only one SSR app per page is supported // only one SSR app per page is supported
if (this.$root.$el && this.$root.$el.hasAttribute('data-server-rendered')) { if (this.$root.$el && this.$root.$el.hasAttribute('data-server-rendered')) {
this.$root._vueMeta.appId = 'ssr' this.$root._vueMeta.appId = 'ssr'
} }
})
// we use the mounted hook here as on page load
ensuredPush(this.$options, 'mounted', () => {
if (!this.$root._vueMeta.initialized) { if (!this.$root._vueMeta.initialized) {
// used in triggerUpdate to check if a change was triggered // used in triggerUpdate to check if a change was triggered
// during initialization // during initialization
test/unit/components.test.js
+5 -13
View File
@@ -102,15 +102,12 @@ describe('client', () => {
test('doesnt update when ssr attribute is set', () => { test('doesnt update when ssr attribute is set', () => {
html.setAttribute(defaultOptions.ssrAttribute, 'true') html.setAttribute(defaultOptions.ssrAttribute, 'true')
const wrapper = mount(HelloWorld, { const wrapper = mount(HelloWorld, { localVue: Vue })
localVue: Vue,
attrs: {
'data-server-rendered': true
}
})
const { tags } = wrapper.vm.$meta().refresh() const { tags } = wrapper.vm.$meta().refresh()
expect(tags).toBe(false) // TODO: fix this test, not sure how to create a wrapper with a attri
// bute data-server-rendered="true"
expect(tags).not.toBe(false)
}) })
test('changed function is called', async () => { test('changed function is called', async () => {
@@ -232,12 +229,7 @@ describe('client', () => {
} }
}) })
const wrapper = mount(component, { const wrapper = mount(component, { localVue: Vue })
localVue: Vue,
attrs: {
'data-server-rendered': true
}
})
expect(html.getAttribute('theme')).not.toBe('dark') expect(html.getAttribute('theme')).not.toBe('dark')
await vmTick(wrapper.vm) await vmTick(wrapper.vm)