Skip to content

Commit e3cd201

Browse files
committed
feat: SSR support update for Screen plugin
1 parent 11dde6f commit e3cd201

File tree

16 files changed

+100
-61
lines changed

16 files changed

+100
-61
lines changed

src/body.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ready } from './utils/dom'
22
import { setBrand } from './utils/colors'
33
import { isSSR } from './plugins/platform'
4+
import { $q, queues } from './install'
45

56
function getBodyClasses ({ is, has, within }, cfg) {
67
const cls = [
@@ -53,7 +54,7 @@ function setColors (brand) {
5354
}
5455

5556
export default {
56-
install ({ $q, cfg, queues }) {
57+
install ({ cfg }) {
5758
if (isSSR) {
5859
queues.server.push((q, ctx) => {
5960
const update = ctx.ssr.setBodyClasses

src/history.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { isSSR } from './plugins/platform'
2+
import { $q } from './install'
23

34
export default {
45
__history: [],
56
add: () => {},
67
remove: () => {},
78

8-
install ({ $q, cfg }) {
9+
install ({ cfg }) {
910
if (isSSR || !$q.platform.is.cordova) {
1011
return
1112
}

src/i18n.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import langEn from '../i18n/en-us'
22
import { isSSR } from './plugins/platform'
33
import { ready } from './utils/dom'
4+
import { $q, queues } from './install'
45

56
export default {
6-
install ({ $q, Vue, queues, lang }) {
7+
install ({ Vue, lang }) {
78
if (isSSR) {
89
queues.server.push((q, ctx) => {
910
const fn = ctx.ssr.setHtmlAttrs

src/icons.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { isSSR } from './plugins/platform'
2+
import { $q } from './install'
23
import materialIcons from '../icons/material-icons'
34

45
export default {
56
__installed: false,
6-
install ({ $q, Vue, iconSet }) {
7+
install ({ Vue, iconSet }) {
78
this.set = (iconDef = materialIcons) => {
89
iconDef.set = this.set
910

src/install.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ export default function (Vue, opts = {}) {
2323
const cfg = opts.config || {}
2424

2525
// required plugins
26-
Platform.install({ $q, Vue, queues })
27-
Body.install({ $q, queues, cfg })
28-
History.install({ $q, cfg })
29-
I18n.install({ $q, Vue, queues, cfg, lang: opts.i18n })
30-
Icons.install({ $q, Vue, queues, iconSet: opts.iconSet })
26+
Platform.install({ Vue })
27+
Body.install({ cfg })
28+
History.install({ cfg })
29+
I18n.install({ Vue, cfg, lang: opts.i18n })
30+
Icons.install({ Vue, iconSet: opts.iconSet })
3131

3232
if (isSSR) {
3333
Vue.mixin({
@@ -59,10 +59,11 @@ export default function (Vue, opts = {}) {
5959
}
6060

6161
if (opts.plugins) {
62+
const param = { Vue, cfg }
6263
Object.keys(opts.plugins).forEach(key => {
6364
const p = opts.plugins[key]
6465
if (typeof p.install === 'function' && p !== Platform) {
65-
p.install({ $q, Vue, queues, cfg })
66+
p.install(param)
6667
}
6768
})
6869
}

src/plugins/action-sheet.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { QActionSheet } from '../components/action-sheet'
22
import modalFn from '../utils/modal-fn'
3+
import { $q } from '../install'
34

45
export default {
5-
install ({ $q, Vue }) {
6+
install ({ Vue }) {
67
this.create = $q.actionSheet = modalFn(QActionSheet, Vue)
78
}
89
}

src/plugins/addressbar-color.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Platform, { isSSR } from './platform'
22
import { ready } from '../utils/dom'
33
import { getBrand } from '../utils/colors'
4+
import { $q } from '../install'
45

56
let metaValue
67

@@ -46,7 +47,7 @@ function setColor (hexColor) {
4647
}
4748

4849
export default {
49-
install ({ $q, Vue }) {
50+
install ({ Vue }) {
5051
this.set = !isSSR && Platform.is.mobile && (
5152
Platform.is.cordova ||
5253
Platform.is.winphone || Platform.is.safari ||

src/plugins/app-fullscreen.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { isSSR } from './platform'
2+
import { $q } from '../install'
23

34
const prefixes = {}
45

@@ -26,7 +27,7 @@ export default {
2627
}
2728
},
2829

29-
install ({ $q, Vue }) {
30+
install ({ Vue }) {
3031
$q.fullscreen = this
3132

3233
if (isSSR) { return }

src/plugins/app-visibility.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { isSSR } from './platform'
2+
import { $q } from '../install'
23

34
export default {
45
appVisible: false,
56

6-
install ({ $q, Vue }) {
7+
install ({ Vue }) {
78
if (isSSR) {
89
this.appVisible = $q.appVisible = true
910
return

src/plugins/cookies.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { isSSR } from './platform'
2+
import { $q, queues } from '../install'
23

34
function encode (string) {
45
return encodeURIComponent(string)
@@ -139,7 +140,7 @@ export function getObject (ctx = {}) {
139140
}
140141

141142
export default {
142-
install ({ $q, queues }) {
143+
install () {
143144
if (isSSR) {
144145
queues.server.push((q, ctx) => {
145146
q.cookies = getObject(ctx)

0 commit comments

Comments
 (0)