feat: Web Storage work for compliancy with latest specs

angelomedeiros · Jul 5, 2018 · af65187 · af65187
1 parent 0ac2e63
commit af65187
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 48 deletions.
diff --git a/build/build.transforms.js b/build/build.transforms.js
@@ -1,14 +1,4 @@
-// === work in progress ===
-// To be used with babel-plugin-transform-imports
-/*
-[
-  "transform-imports", {
-    "quasar": {
-      "transform": "../../transforms.js"
-    }
-  }
-]
-*/
+// Used with babel-plugin-transform-imports
 
 const
   glob = require('glob'),
@@ -34,7 +24,7 @@ function camelCase (name) {
 }
 
 function isExternalUtil (name) {
-  return !['escape-key', 'modal-fn', 'popup', 'sort', 'router-link', 'is', 'noop'].includes(name)
+  return !['escape-key', 'modal-fn', 'popup', 'sort', 'router-link', 'is', 'noop', 'web-storage'].includes(name)
 }
 
 function addComponents (map, theme) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quasar-framework",
-  "version": "0.17.0-beta.7",
+  "version": "0.17.0-beta.8",
   "description": "Build responsive websites, PWAs, hybrid mobile apps and Electron apps, all simultaneously using same codebase",
   "module": "src/index.esm.js",
   "files": [

diff --git a/src/plugins.js b/src/plugins.js
@@ -8,7 +8,8 @@ import Loading from './plugins/loading.js'
 import Notify from './plugins/notify.js'
 import Platform from './plugins/platform.js'
 import Screen from './plugins/screen.js'
-import { LocalStorage, SessionStorage } from './plugins/web-storage.js'
+import LocalStorage from './plugins/local-storage.js'
+import SessionStorage from './plugins/session-storage.js'
 
 export {
   ActionSheet,

diff --git a/src/plugins/local-storage.js b/src/plugins/local-storage.js
@@ -0,0 +1,17 @@
+import { onSSR, hasWebStorage } from './platform.js'
+import { getEmptyStorage, getStorage } from '../utils/web-storage.js'
+
+export default {
+  install ({ $q }) {
+    if (onSSR) {
+      $q.localStorage = getEmptyStorage()
+      return
+    }
+
+    if (hasWebStorage()) {
+      const storage = getStorage('local')
+      $q.localStorage = storage
+      Object.assign(this, storage)
+    }
+  }
+}
diff --git a/src/plugins/session-storage.js b/src/plugins/session-storage.js
@@ -0,0 +1,17 @@
+import { onSSR, hasWebStorage } from './platform.js'
+import { getEmptyStorage, getStorage } from '../utils/web-storage.js'
+
+export default {
+  install ({ $q }) {
+    if (onSSR) {
+      $q.sessionStorage = getEmptyStorage()
+      return
+    }
+
+    if (hasWebStorage()) {
+      const storage = getStorage('session')
+      $q.sessionStorage = storage
+      Object.assign(this, storage)
+    }
+  }
+}
diff --git a/src/plugins/web-storage.js → src/utils/web-storage.js b/src/plugins/web-storage.js → src/utils/web-storage.js
@@ -1,5 +1,3 @@
-import { onSSR, hasWebStorage } from './platform.js'
-
 function encode (value) {
   if (Object.prototype.toString.call(value) === '[object Date]') {
     return '__q_date|' + value.toUTCString()
@@ -67,7 +65,7 @@ function decode (value) {
   }
 }
 
-function getEmptyStorage () {
+export function getEmptyStorage () {
   const fn = () => {}
 
   return {
@@ -85,7 +83,7 @@ function getEmptyStorage () {
   }
 }
 
-function getStorage (type) {
+export function getStorage (type) {
   const
     webStorage = window[type + 'Storage'],
     get = key => {
@@ -122,33 +120,3 @@ function getStorage (type) {
     isEmpty: () => webStorage.length === 0
   }
 }
-
-export const LocalStorage = {
-  install ({ $q }) {
-    if (onSSR) {
-      $q.localStorage = getEmptyStorage()
-      return
-    }
-
-    if (hasWebStorage()) {
-      const storage = getStorage('local')
-      $q.localStorage = storage
-      Object.assign(this, storage)
-    }
-  }
-}
-
-export const SessionStorage = {
-  install ({ $q }) {
-    if (onSSR) {
-      $q.sessionStorage = getEmptyStorage()
-      return
-    }
-
-    if (hasWebStorage()) {
-      const storage = getStorage('session')
-      $q.sessionStorage = storage
-      Object.assign(this, storage)
-    }
-  }
-}