Skip to content

Commit 6f73fac

Browse files
committed
feat: Detect if coming from SSR
1 parent 96041f1 commit 6f73fac

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/mixins/can-render.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
export default {
44
data () {
5-
const is = this.$q.platform.is
65
return {
7-
canRender: is.cordova || is.electron
6+
canRender: !this.$q.platform.is.fromSSR
87
}
98
},
109
mounted () {

src/plugins/platform.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ function getPlatform (userAgent) {
156156
else if (window._cordovaNative || window.cordova) {
157157
browser.cordova = true
158158
}
159+
160+
browser.fromSSR = browser.cordova === void 0 &&
161+
browser.electron === void 0 &&
162+
!!document.querySelector('[data-server-rendered]')
159163
}
160164

161165
return browser

src/utils/modal-fn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function (Component, Vue) {
77

88
const node = document.createElement('div')
99
document.body.appendChild(node)
10-
10+
1111
const
1212
ok = data => {
1313
resolve(data)

0 commit comments

Comments
 (0)