quasar 2.5.5 → 2.6.0

package/src/install-quasar.js

@@ -10,7 +10,7 @@ import IconSet from './icon-set.js'
 
 import { quasarKey } from './utils/private/symbols.js'
 import { globalConfig, globalConfigIsFrozen, freezeGlobalConfig } from './utils/private/global-config.js'
-import { isPlainObject } from './utils/private/is.js'
+import { isObject } from './utils/private/is.js'
 
 const autoInstalledPlugins = [
   Platform,
@@ -47,13 +47,13 @@ function prepareApp (app, uiOpts, pluginOpts) {
   installPlugins(pluginOpts, autoInstalledPlugins)
 
   uiOpts.components !== void 0 && Object.values(uiOpts.components).forEach(c => {
-    if (isPlainObject(c) === true && c.name !== void 0) {
+    if (isObject(c) === true && c.name !== void 0) {
       app.component(c.name, c)
     }
   })
 
   uiOpts.directives !== void 0 && Object.values(uiOpts.directives).forEach(d => {
-    if (isPlainObject(d) === true && d.name !== void 0) {
+    if (isObject(d) === true && d.name !== void 0) {
       app.directive(d.name, d)
     }
   })

package/src/plugins/AddressbarColor.js

@@ -51,15 +51,15 @@ export default {
     || client.is.webkit === true || client.is.vivaldi === true
   )
     ? hexColor => {
-        const val = hexColor || getCssVar('primary')
+      const val = hexColor || getCssVar('primary')
 
-        if (client.is.nativeMobile === true && window.StatusBar) {
-          window.StatusBar.backgroundColorByHexString(val)
-        }
-        else {
-          setColor(val)
-        }
+      if (client.is.nativeMobile === true && window.StatusBar) {
+        window.StatusBar.backgroundColorByHexString(val)
       }
+      else {
+        setColor(val)
+      }
+    }
     : noop,
 
   install ({ $q }) {

package/src/plugins/Cookies.js

@@ -26,7 +26,11 @@ function read (string) {
   string = decode(string.replace(/\+/g, ' '))
 
   try {
-    string = JSON.parse(string)
+    const parsed = JSON.parse(string)
+
+    if (parsed === Object(parsed) || Array.isArray(parsed) === true) {
+      string = parsed
+    }
   }
   catch (e) {}
 

package/src/plugins/Dialog.json

@@ -307,8 +307,9 @@
             },
 
             "component": {
-              "type": "Component",
-              "desc": "Use custom dialog component; use along with 'componentProps' prop where possible"
+              "type": [ "Component", "String" ],
+              "desc": "Use custom dialog component; use along with 'componentProps' prop where possible",
+              "examples": [ "CustomComponent", "'custom-component'" ]
             },
 
             "componentProps": {

package/src/plugins/Loading.js

@@ -5,7 +5,7 @@ import QSpinner from '../components/spinner/QSpinner.js'
 import defineReactivePlugin from '../utils/private/define-reactive-plugin.js'
 import { createGlobalNode, removeGlobalNode } from '../utils/private/global-nodes.js'
 import preventScroll from '../utils/prevent-scroll.js'
-import { isPlainObject } from '../utils/private/is.js'
+import { isObject } from '../utils/private/is.js'
 
 let
   app,
@@ -35,7 +35,7 @@ const Plugin = defineReactivePlugin({
   show (opts) {
     if (__QUASAR_SSR_SERVER__) { return }
 
-    props = isPlainObject(opts) === true && opts.ignoreDefaults === true
+    props = isObject(opts) === true && opts.ignoreDefaults === true
       ? { ...originalDefaults, ...opts }
       : { ...defaults, ...opts }
 
@@ -136,7 +136,7 @@ const Plugin = defineReactivePlugin({
 
   setDefaults (opts) {
     if (__QUASAR_SSR_SERVER__ !== true) {
-      isPlainObject(opts) === true && Object.assign(defaults, opts)
+      isObject(opts) === true && Object.assign(defaults, opts)
     }
   },
 

package/src/plugins/LoadingBar.js

@@ -6,7 +6,7 @@ import { createGlobalNode } from '../utils/private/global-nodes.js'
 import { createChildApp } from '../install-quasar.js'
 
 import QAjaxBar from '../components/ajax-bar/QAjaxBar.js'
-import { isPlainObject } from '../utils/private/is.js'
+import { isObject } from '../utils/private/is.js'
 
 const barRef = ref(null)
 
@@ -36,6 +36,14 @@ const Plugin = defineReactivePlugin({
         : {}
     )
 
+    function onStart () {
+      Plugin.isActive = true
+    }
+
+    function onStop () {
+      Plugin.isActive = false
+    }
+
     const el = createGlobalNode('q-loading-bar')
 
     createChildApp({
@@ -44,23 +52,21 @@ const Plugin = defineReactivePlugin({
       // hide App from Vue devtools
       devtools: { hide: true },
 
-      setup: () => () => h(QAjaxBar, { ...props.value, ref: barRef })
+      setup: () => () => h(QAjaxBar, { ...props.value, onStart, onStop, ref: barRef })
     }, parentApp).mount(el)
 
     Object.assign(this, {
       start (speed) {
         barRef.value.start(speed)
-        Plugin.isActive = true
       },
       stop () {
-        const sessions = barRef.value.stop()
-        Plugin.isActive = sessions > 0
+        barRef.value.stop()
       },
       increment () {
         barRef.value.increment.apply(null, arguments)
       },
       setDefaults (opts) {
-        if (isPlainObject(opts) === true) {
+        if (isObject(opts) === true) {
           Object.assign(props.value, opts)
         }
       }

package/src/plugins/Notify.js

@@ -9,7 +9,7 @@ import { createComponent } from '../utils/private/create.js'
 import { noop } from '../utils/event.js'
 import { createGlobalNode } from '../utils/private/global-nodes.js'
 import { createChildApp } from '../install-quasar.js'
-import { isPlainObject } from '../utils/private/is.js'
+import { isObject } from '../utils/private/is.js'
 
 let uid = 0
 
@@ -73,7 +73,7 @@ function addNotification (config, $q, originalApi) {
     Object.assign(notif, defaults)
   }
 
-  if (isPlainObject(config) === false) {
+  if (isObject(config) === false) {
     if (notif.type) {
       Object.assign(notif, notifTypes[ notif.type ])
     }
@@ -491,12 +491,12 @@ function getComponent () {
 export default {
   setDefaults (opts) {
     if (__QUASAR_SSR_SERVER__ !== true) {
-      isPlainObject(opts) === true && Object.assign(defaults, opts)
+      isObject(opts) === true && Object.assign(defaults, opts)
     }
   },
 
   registerType (typeName, typeOpts) {
-    if (__QUASAR_SSR_SERVER__ !== true && isPlainObject(typeOpts) === true) {
+    if (__QUASAR_SSR_SERVER__ !== true && isObject(typeOpts) === true) {
       notifTypes[ typeName ] = typeOpts
     }
   },

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,7 +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 { isPlainObject } from './private/is.js'
+import { isObject } from './private/is.js'
 
 const coreEmitsObject = getEmitsObject(coreEmits)
 
@@ -14,7 +14,7 @@ export default ({ name, props, emits, injectPlugin }) => createComponent({
     ...props
   },
 
-  emits: isPlainObject(emits) === true
+  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,4 +1,4 @@
-import { isPlainObject } from './private/is'
+import { isObject } from './private/is'
 
 export default function extend () {
   let
@@ -33,13 +33,13 @@ export default function extend () {
           continue
         }
 
-        if (deep && copy && (isPlainObject(copy) === true || (copyIsArray = Array.isArray(copy) === true))) {
+        if (deep && copy && (isObject(copy) === true || (copyIsArray = Array.isArray(copy) === true))) {
           if (copyIsArray) {
             copyIsArray = false
             clone = src && Array.isArray(src) === true ? src : []
           }
           else {
-            clone = src && isPlainObject(src) === true ? src : {}
+            clone = src && isObject(src) === true ? src : {}
           }
 
           target[ name ] = extend(deep, clone, copy)

package/src/utils/morph.js

@@ -1,4 +1,4 @@
-import { isPlainObject } from './private/is'
+import { isObject } from './private/is'
 
 let id = 0
 let offsetBase = void 0
@@ -445,7 +445,7 @@ export default function morph (_options) {
       if (typeof options.style === 'string') {
         elTo.style.cssText += ' ' + options.style
       }
-      else if (isPlainObject(options.style) === true) {
+      else if (isObject(options.style) === true) {
         for (const prop in options.style) {
           elTo.style[ prop ] = options.style[ prop ]
         }

package/src/utils/private/is.js

@@ -120,8 +120,10 @@ export function isDeepEqual (a, b) {
   return a !== a && b !== b // eslint-disable-line no-self-compare
 }
 
-export function isPlainObject (v) {
-  return Object.prototype.toString.call(v) === '[object Object]'
+// 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 v !== null && typeof v === 'object' && Array.isArray(v) !== true
 }
 
 export function isDate (v) {

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

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

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.5
- * (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'`
-      }
-    ]
-  }
-}