quasar 2.5.3 → 2.6.0

package/src/plugins/Notify.json

@@ -43,6 +43,16 @@
         "extends": "icon"
       },
 
+      "iconColor": {
+        "extends": "color",
+        "addedIn": "v2.5.5"
+      },
+
+      "iconSize": {
+        "extends": "size",
+        "addedIn": "v2.5.5"
+      },
+
       "avatar": {
         "type": "String",
         "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -58,6 +68,16 @@
         "desc": "Useful for notifications that are updated; Displays the default Quasar spinner instead of an avatar or icon"
       },
 
+      "spinnerColor": {
+        "extends": "color",
+        "addedIn": "v2.5.5"
+      },
+
+      "spinnerSize": {
+        "extends": "size",
+        "addedIn": "v2.5.5"
+      },
+
       "position": {
         "type": "String",
         "desc": "Window side/corner to stick to",
@@ -202,6 +222,16 @@
               "extends": "icon"
             },
 
+            "iconColor": {
+              "extends": "color",
+              "addedIn": "v2.5.5"
+            },
+
+            "iconSize": {
+              "extends": "size",
+              "addedIn": "v2.5.5"
+            },
+
             "avatar": {
               "type": "String",
               "desc": "URL to an avatar/image; Suggestion: public folder",
@@ -218,6 +248,16 @@
               "examples": [ true, "QSpinnerBars" ]
             },
 
+            "spinnerColor": {
+              "extends": "color",
+              "addedIn": "v2.5.5"
+            },
+
+            "spinnerSize": {
+              "extends": "size",
+              "addedIn": "v2.5.5"
+            },
+
             "position": {
               "type": "String",
               "desc": "Window side/corner to stick to",
@@ -388,6 +428,16 @@
                 "extends": "icon"
               },
 
+              "iconColor": {
+                "extends": "color",
+                "addedIn": "v2.5.5"
+              },
+
+              "iconSize": {
+                "extends": "size",
+                "addedIn": "v2.5.5"
+              },
+
               "avatar": {
                 "type": "String",
                 "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -404,6 +454,16 @@
                 "__exemption": [ "examples" ]
               },
 
+              "spinnerColor": {
+                "extends": "color",
+                "addedIn": "v2.5.5"
+              },
+
+              "spinnerSize": {
+                "extends": "size",
+                "addedIn": "v2.5.5"
+              },
+
               "progress": {
                 "type": "Boolean",
                 "desc": "Show progress bar to detail when notification will disappear automatically (unless timeout is 0)"
@@ -523,6 +583,16 @@
               "extends": "icon"
             },
 
+            "iconColor": {
+              "extends": "color",
+              "addedIn": "v2.5.5"
+            },
+
+            "iconSize": {
+              "extends": "size",
+              "addedIn": "v2.5.5"
+            },
+
             "avatar": {
               "type": "String",
               "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -531,7 +601,7 @@
                 "(relative path format) require('./my_img.jpg')",
                 "(URL) https://some-site.net/some-img.gif"
               ]
-          },
+            },
 
             "spinner": {
               "type": [ "Boolean", "Component" ],
@@ -539,6 +609,16 @@
               "__exemption": [ "examples" ]
             },
 
+            "spinnerColor": {
+              "extends": "color",
+              "addedIn": "v2.5.5"
+            },
+
+            "spinnerSize": {
+              "extends": "size",
+              "addedIn": "v2.5.5"
+            },
+
             "position": {
               "type": "String",
               "desc": "Window side/corner to stick to",
@@ -706,6 +786,16 @@
               "extends": "icon"
             },
 
+            "iconColor": {
+              "extends": "color",
+              "addedIn": "v2.5.5"
+            },
+
+            "iconSize": {
+              "extends": "size",
+              "addedIn": "v2.5.5"
+            },
+
             "avatar": {
               "type": "String",
               "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -714,7 +804,7 @@
                 "(relative path format) require('./my_img.jpg')",
                 "(URL) https://some-site.net/some-img.gif"
               ]
-          },
+            },
 
             "spinner": {
               "type": [ "Boolean", "Component" ],
@@ -722,6 +812,16 @@
               "__exemption": [ "examples" ]
             },
 
+            "spinnerColor": {
+              "extends": "color",
+              "addedIn": "v2.5.5"
+            },
+
+            "spinnerSize": {
+              "extends": "size",
+              "addedIn": "v2.5.5"
+            },
+
             "position": {
               "type": "String",
               "desc": "Window side/corner to stick to",

package/src/utils/create-meta-mixin.js

@@ -5,10 +5,10 @@ export default metaOptions => {
     return {
       created: typeof metaOptions === 'function'
         ? function () {
-            this.ssrContext.__qMetaList.push(
-              metaOptions.call(this) || {}
-            )
-          }
+          this.ssrContext.__qMetaList.push(
+            metaOptions.call(this) || {}
+          )
+        }
         : function () {
           this.ssrContext.__qMetaList.push(metaOptions)
         }

package/src/utils/create-uploader-component.js

@@ -2,6 +2,7 @@ import { coreProps, coreEmits, getRenderer } from '../components/uploader/upload
 
 import { createComponent } from './private/create.js'
 import getEmitsObject from './private/get-emits-object.js'
+import { isObject } from './private/is.js'
 
 const coreEmitsObject = getEmitsObject(coreEmits)
 
@@ -13,7 +14,7 @@ export default ({ name, props, emits, injectPlugin }) => createComponent({
     ...props
   },
 
-  emits: Object(emits) === emits
+  emits: isObject(emits) === true
     ? { ...coreEmitsObject, ...emits }
     : [ ...coreEmits, ...emits ],
 

package/src/utils/event.js

@@ -117,9 +117,9 @@ export function preventDraggable (el, status) {
 
   const fn = status === true
     ? el => {
-        el.__dragPrevented = true
-        el.addEventListener('dragstart', prevent, listenOpts.notPassiveCapture)
-      }
+      el.__dragPrevented = true
+      el.addEventListener('dragstart', prevent, listenOpts.notPassiveCapture)
+    }
     : el => {
       delete el.__dragPrevented
       el.removeEventListener('dragstart', prevent, listenOpts.notPassiveCapture)

package/src/utils/extend.js

@@ -1,32 +1,4 @@
-const
-  toString = Object.prototype.toString,
-  hasOwn = Object.prototype.hasOwnProperty,
-  class2type = {}
-
-'Boolean Number String Function Array Date RegExp Object'.split(' ').forEach(name => {
-  class2type[ '[object ' + name + ']' ] = name.toLowerCase()
-})
-
-function type (obj) {
-  return obj === null ? String(obj) : class2type[ toString.call(obj) ] || 'object'
-}
-
-function isPlainObject (obj) {
-  if (!obj || type(obj) !== 'object') {
-    return false
-  }
-
-  if (obj.constructor
-    && !hasOwn.call(obj, 'constructor')
-    && !hasOwn.call(obj.constructor.prototype, 'isPrototypeOf')) {
-    return false
-  }
-
-  let key
-  for (key in obj) {} // eslint-disable-line
-
-  return key === undefined || hasOwn.call(obj, key)
-}
+import { isObject } from './private/is'
 
 export default function extend () {
   let
@@ -42,7 +14,7 @@ export default function extend () {
     i = 2
   }
 
-  if (Object(target) !== target && type(target) !== 'function') {
+  if (Object(target) !== target && typeof target !== 'function') {
     target = {}
   }
 
@@ -61,18 +33,18 @@ export default function extend () {
           continue
         }
 
-        if (deep && copy && (isPlainObject(copy) || (copyIsArray = type(copy) === 'array'))) {
+        if (deep && copy && (isObject(copy) === true || (copyIsArray = Array.isArray(copy) === true))) {
           if (copyIsArray) {
             copyIsArray = false
-            clone = src && type(src) === 'array' ? src : []
+            clone = src && Array.isArray(src) === true ? src : []
           }
           else {
-            clone = src && isPlainObject(src) ? src : {}
+            clone = src && isObject(src) === true ? src : {}
           }
 
           target[ name ] = extend(deep, clone, copy)
         }
-        else if (copy !== undefined) {
+        else if (copy !== void 0) {
           target[ name ] = copy
         }
       }

package/src/utils/morph.js

@@ -1,3 +1,5 @@
+import { isObject } from './private/is'
+
 let id = 0
 let offsetBase = void 0
 
@@ -443,7 +445,7 @@ export default function morph (_options) {
       if (typeof options.style === 'string') {
         elTo.style.cssText += ' ' + options.style
       }
-      else if (options.style === Object(options.style)) {
+      else if (isObject(options.style) === true) {
         for (const prop in options.style) {
           elTo.style[ prop ] = options.style[ prop ]
         }
@@ -880,8 +882,8 @@ export default function morph (_options) {
         elToClone.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }-to`
         elTo.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }`
 
-        const cleanup = ev => {
-          if (ev === Object(ev) && ev.animationName !== qAnimId) {
+        const cleanup = evt => {
+          if (evt === Object(evt) && evt.animationName !== qAnimId) {
             return
           }
 
@@ -944,24 +946,24 @@ export default function morph (_options) {
         : (
             options.waitFor === 'transitionend'
               ? new Promise(resolve => {
-                  const timer = setTimeout(() => {
-                    endFn()
-                  }, 400)
-
-                  const endFn = ev => {
-                    clearTimeout(timer)
+                const timer = setTimeout(() => {
+                  endFn()
+                }, 400)
 
-                    if (elTo) {
-                      elTo.removeEventListener('transitionend', endFn)
-                      elTo.removeEventListener('transitioncancel', endFn)
-                    }
+                const endFn = ev => {
+                  clearTimeout(timer)
 
-                    resolve()
+                  if (elTo) {
+                    elTo.removeEventListener('transitionend', endFn)
+                    elTo.removeEventListener('transitioncancel', endFn)
                   }
 
-                  elTo.addEventListener('transitionend', endFn)
-                  elTo.addEventListener('transitioncancel', endFn)
-                })
+                  resolve()
+                }
+
+                elTo.addEventListener('transitionend', endFn)
+                elTo.addEventListener('transitioncancel', endFn)
+              })
               : options.waitFor
           )
 

package/src/utils/private/is.js

@@ -120,17 +120,10 @@ export function isDeepEqual (a, b) {
   return a !== a && b !== b // eslint-disable-line no-self-compare
 }
 
-export function isPrintableChar (v) {
-  return (v > 47 && v < 58) // number keys
-    || v === 32 || v === 13 // spacebar & return key(s) (if you want to allow carriage returns)
-    || (v > 64 && v < 91) // letter keys
-    || (v > 95 && v < 112) // numpad keys
-    || (v > 185 && v < 193) // ;=,-./` (in order)
-    || (v > 218 && v < 223)
-}
-
+// not perfect, but what we ARE interested is for Arrays not to slip in
+// as spread operator will mess things up in various areas
 export function isObject (v) {
-  return Object(v) === v
+  return v !== null && typeof v === 'object' && Array.isArray(v) !== true
 }
 
 export function isDate (v) {
@@ -144,7 +137,3 @@ export function isRegexp (v) {
 export function isNumber (v) {
   return typeof v === 'number' && isFinite(v)
 }
-
-export function isString (v) {
-  return typeof v === 'string'
-}

package/src/utils/private/noop-ssr-directive-transform.js

@@ -1 +1 @@
-export default () => ({ props: [] })
+export default () => ({})

package/src/utils/private/web-storage.js

@@ -1,10 +1,11 @@
 import { noop } from '../event.js'
+import { isDate, isRegexp } from './is.js'
 
 function encode (value) {
-  if (Object.prototype.toString.call(value) === '[object Date]') {
+  if (isDate(value) === true) {
     return '__q_date|' + value.toUTCString()
   }
-  if (Object.prototype.toString.call(value) === '[object RegExp]') {
+  if (isRegexp(value) === true) {
     return '__q_expr|' + value.source
   }
   if (typeof value === 'number') {

package/wrappers/index.js

@@ -4,7 +4,7 @@
 //  parameters and return value when using Quasar with TypeScript
 // We need these in `ui` folder to make `quasar/wrapper` import work,
 //  but they are useful only for Quasar CLI projects
-// They are typed via module augmentation by `@quasar/app`
+// They are typed via module augmentation by `@quasar/app-webpack` / `@quasar/app-vite`
 
 module.exports.boot = function (callback) {
   return callback
@@ -14,10 +14,6 @@ module.exports.ssrMiddleware = function (callback) {
   return callback
 }
 
-module.exports.ssrProductionExport = function (callback) {
-  return callback
-}
-
 module.exports.configure = function (callback) {
   return callback
 }
@@ -33,3 +29,35 @@ module.exports.route = function (callback) {
 module.exports.store = function (callback) {
   return callback
 }
+
+/**
+ * Below only for @quasar/app-webpack
+ */
+
+module.exports.ssrProductionExport = function (callback) {
+  return callback
+}
+
+/**
+ * Below only for @quasar/app-vite
+ */
+
+module.exports.ssrCreate = function (callback) {
+  return callback
+}
+
+module.exports.ssrListen = function (callback) {
+  return callback
+}
+
+module.exports.ssrClose = function (callback) {
+  return callback
+}
+
+module.exports.ssrServeStaticContent = function (callback) {
+  return callback
+}
+
+module.exports.ssrRenderPreloadTag = function (callback) {
+  return callback
+}

package/wrappers/index.mjs

@@ -0,0 +1,63 @@
+// Functions in this file are no-op,
+//  they just take a callback function and return it
+// They're used to apply typings to the callback
+//  parameters and return value when using Quasar with TypeScript
+// We need these in `ui` folder to make `quasar/wrapper` import work,
+//  but they are useful only for Quasar CLI projects
+// They are typed via module augmentation by `@quasar/app-webpack` / `@quasar/app-vite`
+
+export function boot (callback) {
+  return callback
+}
+
+export function configure (callback) {
+  return callback
+}
+
+export function preFetch (callback) {
+  return callback
+}
+
+export function route (callback) {
+  return callback
+}
+
+export function store (callback) {
+  return callback
+}
+
+export function ssrMiddleware (callback) {
+  return callback
+}
+
+/**
+ * Below only for @quasar/app-webpack
+ */
+
+export function ssrProductionExport (callback) {
+  return callback
+}
+
+/**
+ * Below only for @quasar/app-vite
+ */
+
+export function ssrCreate (callback) {
+  return callback
+}
+
+export function ssrListen (callback) {
+  return callback
+}
+
+export function ssrClose (callback) {
+  return callback
+}
+
+export function ssrServeStaticContent (callback) {
+  return callback
+}
+
+export function ssrRenderPreloadTag (callback) {
+  return callback
+}

package/dist/ssr-directives/Morph.js

@@ -1,55 +0,0 @@
-/*!
- * Quasar Framework v2.5.3
- * (c) 2015-present Razvan Stoenescu
- * Released under the MIT License.
- */
-
-'use strict';
-
-// import { createObjectProperty } from '@vue/compiler-dom'
-
-// export default (dir) => {
-//   const name = dir.arg
-//     ? '\'' + dir.arg.content.split(':')[ 0 ] + '\''
-//     : false
-
-//   return {
-//     props: [
-//       createObjectProperty(
-//         'class',
-//         `${ dir.exp.content } && ${dir.exp.content}.model === ${ name } ? '' : 'q-morph--invisible'`
-//       )
-//     ]
-//   }
-// }
-
-// temporarily avoid importing from @vue/compiler-dom
-
-var Morph_ssr = (dir) => {
-  const name = dir.arg
-    ? '\'' + dir.arg.content.split(':')[ 0 ] + '\''
-    : false;
-
-  return {
-    props: [
-      {
-        type: 16,
-        loc: {
-          source: '',
-          start: { line: 1, column: 1, offset: 0 },
-          end: { line: 1, column: 1, offset: 0 }
-        },
-        key: {
-          type: 4,
-          loc: { source: '', start: { line: 1, column: 1, offset: 0 }, end: { line: 1, column: 1, offset: 0 } },
-          content: 'class',
-          isStatic: true,
-          constType: 3
-        },
-        value: `${ dir.exp.content } && ${ dir.exp.content }.model === ${ name } ? '' : 'q-morph--invisible'`
-      }
-    ]
-  }
-};
-
-module.exports = Morph_ssr;

package/dist/ssr-directives/index.js

@@ -1,14 +0,0 @@
-const noopTransform = () => ({ props: [] })
-module.exports = {
-  'close-popup': noopTransform,
-  'intersection': noopTransform,
-  'morph': require('./Morph.js'),
-  'mutation': noopTransform,
-  'ripple': noopTransform,
-  'scroll': noopTransform,
-  'scroll-fire': noopTransform,
-  'touch-hold': noopTransform,
-  'touch-pan': noopTransform,
-  'touch-repeat': noopTransform,
-  'touch-swipe': noopTransform
-}

package/src/directives/Morph.ssr.js

@@ -1,45 +0,0 @@
-// import { createObjectProperty } from '@vue/compiler-dom'
-
-// export default (dir) => {
-//   const name = dir.arg
-//     ? '\'' + dir.arg.content.split(':')[ 0 ] + '\''
-//     : false
-
-//   return {
-//     props: [
-//       createObjectProperty(
-//         'class',
-//         `${ dir.exp.content } && ${dir.exp.content}.model === ${ name } ? '' : 'q-morph--invisible'`
-//       )
-//     ]
-//   }
-// }
-
-// temporarily avoid importing from @vue/compiler-dom
-
-export default (dir) => {
-  const name = dir.arg
-    ? '\'' + dir.arg.content.split(':')[ 0 ] + '\''
-    : false
-
-  return {
-    props: [
-      {
-        type: 16,
-        loc: {
-          source: '',
-          start: { line: 1, column: 1, offset: 0 },
-          end: { line: 1, column: 1, offset: 0 }
-        },
-        key: {
-          type: 4,
-          loc: { source: '', start: { line: 1, column: 1, offset: 0 }, end: { line: 1, column: 1, offset: 0 } },
-          content: 'class',
-          isStatic: true,
-          constType: 3
-        },
-        value: `${ dir.exp.content } && ${ dir.exp.content }.model === ${ name } ? '' : 'q-morph--invisible'`
-      }
-    ]
-  }
-}