feat: SSR updates on Quasar plugins

angelomedeiros · Jun 14, 2018 · 340fcb7 · 340fcb7
1 parent fca914a
commit 340fcb7
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 49 deletions.
diff --git a/src/ie-compat/ie.js b/src/ie-compat/ie.js
@@ -1,8 +1,6 @@
 /* eslint-disable no-extend-native */
 
-(function (window) {
-  if (window === void 0) { return }
-
+typeof window !== 'undefined' && (function (window) {
   try {
     new MouseEvent('test') // eslint-disable-line no-new, no-use-before-define
     return

diff --git a/src/install.js b/src/install.js
@@ -60,7 +60,7 @@ export default function (_Vue, opts = {}) {
   if (opts.plugins) {
     Object.keys(opts.plugins).forEach(key => {
       const p = opts.plugins[key]
-      if (typeof p.install === 'function') {
+      if (typeof p.install === 'function' && p !== Platform) {
         p.install({ $q, Vue: _Vue, cfg })
       }
     })

diff --git a/src/plugins/action-sheet.js b/src/plugins/action-sheet.js
@@ -3,9 +3,6 @@ import modalFn from '../utils/modal-fn'
 
 export default {
   install ({ $q, Vue }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     this.create = $q.actionSheet = modalFn(QActionSheet, Vue)
   }
 }
diff --git a/src/plugins/addressbar-color.js b/src/plugins/addressbar-color.js
@@ -47,10 +47,7 @@ function setColor (hexColor) {
 
 export default {
   install ({ $q, Vue }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
-    this.set = Platform.is.mobile && !isSSR && (
+    this.set = !isSSR && Platform.is.mobile && (
       Platform.is.cordova ||
       Platform.is.winphone || Platform.is.safari ||
       Platform.is.webkit || Platform.is.vivaldi
@@ -59,8 +56,8 @@ export default {
         ready(() => {
           const val = hexColor || getBrand('primary')
 
-          if (Platform.is.cordova) {
-            window.StatusBar && window.StatusBar.backgroundColorByHexString(val)
+          if (Platform.is.cordova && window.StatusBar) {
+            window.StatusBar.backgroundColorByHexString(val)
           }
           else {
             setColor(val)

diff --git a/src/plugins/app-fullscreen.js b/src/plugins/app-fullscreen.js
@@ -27,9 +27,6 @@ export default {
   },
 
   install ({ $q, Vue }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     $q.fullscreen = this
 
     if (isSSR) { return }

diff --git a/src/plugins/app-visibility.js b/src/plugins/app-visibility.js
@@ -4,9 +4,6 @@ export default {
   appVisible: false,
 
   install ({ $q, Vue }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     if (isSSR) {
       this.appVisible = $q.appVisible = true
       return

diff --git a/src/plugins/cookies.js b/src/plugins/cookies.js
@@ -125,10 +125,7 @@ export default {
   remove,
   all: () => get(),
 
-  install ({ $q, cfg }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
+  install ({ $q }) {
     if (!isSSR) {
       $q.cookies = this
     }

diff --git a/src/plugins/dialog.js b/src/plugins/dialog.js
@@ -3,9 +3,6 @@ import modalFn from '../utils/modal-fn'
 
 export default {
   install ({ $q, Vue }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     this.create = $q.dialog = modalFn(QDialog, Vue)
   }
 }
diff --git a/src/plugins/loading.js b/src/plugins/loading.js
@@ -94,9 +94,6 @@ export default {
 
   __Vue: null,
   install ({ $q, Vue, cfg: { loading } }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     loading && this.setDefaults(loading)
 
     $q.loading = this

diff --git a/src/plugins/notify.js b/src/plugins/notify.js
@@ -193,13 +193,14 @@ export default {
   },
 
   install (args) {
-    if (this.__installed) { return }
-    this.__installed = true
-
-    if (!isSSR) {
-      init.call(this, args)
+    if (isSSR) {
+      args.$q.notify = () => {}
+      args.$q.notify.setDefaults = () => {}
+      return
     }
 
+    init.call(this, args)
+
     args.cfg.notify && this.setDefaults(args.cfg.notify)
 
     args.$q.notify = this.create.bind(this)

diff --git a/src/plugins/platform.js b/src/plugins/platform.js
@@ -184,9 +184,6 @@ export function ssrGetPlatform (ssr) {
 
 const Platform = {
   install ({ $q, cfg }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     if (isSSR) {
       Platform.is = Platform.has = Platform.within = {}
       return
@@ -205,12 +202,12 @@ const Platform = {
       webStorage = false
     }
 
-    Platform.is = getPlatform()
-    Platform.has = {
+    this.is = getPlatform()
+    this.has = {
       touch: (() => !!('ontouchstart' in document.documentElement) || window.navigator.msMaxTouchPoints > 0)(),
       webStorage
     }
-    Platform.within = {
+    this.within = {
       iframe: window.self !== window.top
     }
   }

diff --git a/src/plugins/screen.js b/src/plugins/screen.js
@@ -23,9 +23,6 @@ export default {
   lg: true,
 
   install ({ $q, Vue }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     if (isSSR) {
       $q.screen = this
       this.setSizes = this.setDebounce = () => {}

diff --git a/src/plugins/web-storage.js b/src/plugins/web-storage.js
@@ -125,9 +125,6 @@ function getStorage (type) {
 
 export const LocalStorage = {
   install ({ $q }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     if (!isSSR && $q.platform.has.webStorage) {
       const storage = getStorage('local')
       $q.localStorage = storage
@@ -141,9 +138,6 @@ export const LocalStorage = {
 
 export const SessionStorage = {
   install ({ $q }) {
-    if (this.__installed) { return }
-    this.__installed = true
-
     if (!isSSR && $q.platform.has.webStorage) {
       const storage = getStorage('session')
       $q.sessionStorage = storage