Merge branch 'master' into dev

Author: hawkeye64

demo/package.json

@@ -21,7 +21,7 @@
     "@quasar/quasar-app-extension-qmarkdown": "link:../.",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.2",
-    "eslint": "^6.1.0",
+    "eslint": "^6.2.1",
     "eslint-loader": "^2.2.1",
     "eslint-plugin-vue": "^5.2.3",
     "quasar-app-extension-qautomate": "^1.0.0-alpha.5"

demo/src/layouts/MainLayout.vue

@@ -12,8 +12,11 @@
           <q-icon name="menu" />
         </q-btn>
 
-        <q-toolbar-title>
-          QMarkdown - Quasar App Extension
+        <q-toolbar-title v-if="$q.screen.width > 500">
+          QMarkdown <span class="text-subtitle2">v{{ version }}</span>
+          <q-tooltip v-if="$q.screen.width < 1077">
+            QMarkdown <span class="text-subtitle2">v{{ version }}</span>
+          </q-tooltip>
         </q-toolbar-title>
 
         <div>Quasar v{{ $q.version }}</div>
@@ -158,11 +161,13 @@
 <script>
 import { mapGetters } from 'vuex'
 import { scroll } from 'quasar'
+import { version } from '@quasar/quasar-app-extension-qmarkdown/package.json'
 
 export default {
   name: 'MyLayout',
   data () {
     return {
+      version: version,
       leftDrawerOpen: this.$q.platform.is.desktop,
       rightDrawerOpen: this.$q.platform.is.desktop,
       activeToc: 0

demo/src/layouts/MarkdownLayout.vue

@@ -13,9 +13,9 @@
         </q-btn>
 
         <q-toolbar-title v-if="$q.screen.width > 500">
-          QMarkdown
+          QMarkdown <span class="text-subtitle2">v{{ version }}</span>
           <q-tooltip v-if="$q.screen.width < 1077">
-            QMarkdown
+            QMarkdown <span class="text-subtitle2">v{{ version }}</span>
           </q-tooltip>
         </q-toolbar-title>
 
@@ -131,6 +131,7 @@
 <script>
 import { openURL } from 'quasar'
 import MarkdownTypes from '../components/MarkdownTypes'
+import { version } from '@quasar/quasar-app-extension-qmarkdown/package.json'
 
 export default {
   name: 'MarkdownLayout',
@@ -139,6 +140,7 @@ export default {
   },
   data () {
     return {
+      version: version,
       leftDrawerOpen: this.$q.platform.is.desktop
     }
   },

demo/yarn.lock

@@ -1183,6 +1183,11 @@ acorn@^6.0.2, acorn@^6.0.7, acorn@^6.2.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
   integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==
 
+acorn@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a"
+  integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -3003,15 +3008,27 @@ eslint-utils@^1.3.0, eslint-utils@^1.3.1:
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
   integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
 
+eslint-utils@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
+  integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
+  dependencies:
+    eslint-visitor-keys "^1.0.0"
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
   integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
-eslint@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646"
-  integrity sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==
+eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.2.1.tgz#66c2e4fe8b6356b9f01e828adc3ad04030122df1"
+  integrity sha512-ES7BzEzr0Q6m5TK9i+/iTpKjclXitOdDK4vT07OqbkBT2/VcN/gO9EL1C4HlK3TAOXYv2ItcmbVR9jO1MR0fJg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"
@@ -3020,9 +3037,9 @@ eslint@^6.1.0:
     debug "^4.0.1"
     doctrine "^3.0.0"
     eslint-scope "^5.0.0"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^6.0.0"
+    eslint-utils "^1.4.2"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.0"
     esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
@@ -3060,14 +3077,14 @@ espree@^4.1.0:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-espree@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
-  integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==
+espree@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.0.tgz#a1e8aa65bf29a331d70351ed814a80e7534e0884"
+  integrity sha512-boA7CHRLlVWUSg3iL5Kmlt/xT3Q+sXnKoRYYzj1YeM10A76TEJBbotV5pKbnK42hEUIr121zTv+QLRM5LsCPXQ==
   dependencies:
-    acorn "^6.0.7"
+    acorn "^7.0.0"
     acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
+    eslint-visitor-keys "^1.1.0"
 
 esprima@^4.0.0:
   version "4.0.1"
@@ -4869,10 +4886,10 @@ markdown-it-toc-and-anchor@^4.2.0:
     clone "^2.1.0"
     uslug "^1.0.4"
 
-markdown-it@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.0.1.tgz#aafe363c43718720b6575fd10625cde6e4ff2d47"
-  integrity sha512-XC9dMBHg28Xi7y5dPuLjM61upIGPJG8AiHNHYqIaXER2KNnn7eKnM5/sF0ImNnyoV224Ogn9b1Pck8VH4k0bxw==
+markdown-it@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.1.0.tgz#df9601c168568704d554b1fff9af0c5b561168d9"
+  integrity sha512-xHKG4C8iPriyfu/jc2hsCC045fKrMQ0VexX2F1FGYiRxDxqMB2aAhF8WauJ3fltn2kb90moGBkiiEdooGIg55w==
   dependencies:
     argparse "^1.0.7"
     entities "~1.1.1"

docs/index.html

@@ -1,7 +1,7 @@
-<!DOCTYPE html><html><head><title>QMarkdown demo app</title><meta charset=utf-8><meta name=description content="A Quasar Framework app for QMarkdown"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon href=statics/quasar-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link href=/app-extension-qmarkdown/css/19fdb402.c28a14a7.css rel=prefetch><link href=/app-extension-qmarkdown/css/458b94ac.b0325cfb.css rel=prefetch><link href=/app-extension-qmarkdown/js/19fdb402.630ece00.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d0a4f79.15ebc81e.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d0d5fdf.e0e19609.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d0e8be2.c80a8fe3.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d20f31c.96dd02fd.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d21adb6.28f19b99.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb6c62d.1e7be33d.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb766dc.43de8abb.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb7d5d0.0e753a12.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb8558b.3836187f.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb88521.2d2d789a.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb8b8ca.46e6cf8d.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb8c0d7.60097a56.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb965b4.632d99e2.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb9f08a.5902367e.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebabb00.39d372c6.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebacae0.6990e29f.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebad1d9.1c893c56.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb0643.732c15ec.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb0657.3464125d.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb06e0.28f6ec8b.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb8248.6f969a42.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ecd6824.b841e985.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ece5315.9b542601.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ece9c14.388ba9d0.js rel=prefetch><link href=/app-extension-qmarkdown/js/458b94ac.ecefd1ad.js rel=prefetch><link href=/app-extension-qmarkdown/js/4b47640d.e7703afb.js rel=prefetch><link href=/app-extension-qmarkdown/css/app.1e40eb58.css rel=preload as=style><link href=/app-extension-qmarkdown/js/app.10a8a72b.js rel=preload as=script><link href=/app-extension-qmarkdown/js/runtime.b1c40832.js rel=preload as=script><link href=/app-extension-qmarkdown/js/vendor.19036311.js rel=preload as=script><link href=/app-extension-qmarkdown/css/app.1e40eb58.css rel=stylesheet><base href=/app-extension-qmarkdown/ ></head><body><script>(function(){
+<!DOCTYPE html><html><head><title>QMarkdown demo app</title><meta charset=utf-8><meta name=description content="A Quasar Framework app for QMarkdown"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon href=statics/quasar-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link href=/app-extension-qmarkdown/css/19fdb402.c28a14a7.css rel=prefetch><link href=/app-extension-qmarkdown/css/458b94ac.b0325cfb.css rel=prefetch><link href=/app-extension-qmarkdown/js/04432e95.bd552c57.js rel=prefetch><link href=/app-extension-qmarkdown/js/04577c6c.036d76b0.js rel=prefetch><link href=/app-extension-qmarkdown/js/19fdb402.630ece00.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d0a4f79.15ebc81e.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d0e8be2.c80a8fe3.js rel=prefetch><link href=/app-extension-qmarkdown/js/2d20f31c.96dd02fd.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb6c62d.1e7be33d.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb766dc.43de8abb.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb7d5d0.0e753a12.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb8558b.3836187f.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb88521.2d2d789a.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb8b8ca.46e6cf8d.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb8c0d7.60097a56.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb965b4.632d99e2.js rel=prefetch><link href=/app-extension-qmarkdown/js/3eb9f08a.5902367e.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebabb00.39d372c6.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebacae0.6990e29f.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebad1d9.1c893c56.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb0643.732c15ec.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb0657.3464125d.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb06e0.28f6ec8b.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ebb8248.6f969a42.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ecd6824.b841e985.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ece5315.9b542601.js rel=prefetch><link href=/app-extension-qmarkdown/js/3ece9c14.388ba9d0.js rel=prefetch><link href=/app-extension-qmarkdown/js/458b94ac.ecefd1ad.js rel=prefetch><link href=/app-extension-qmarkdown/js/4b47640d.e7703afb.js rel=prefetch><link href=/app-extension-qmarkdown/css/app.1e40eb58.css rel=preload as=style><link href=/app-extension-qmarkdown/js/app.88acf251.js rel=preload as=script><link href=/app-extension-qmarkdown/js/runtime.2dba8d08.js rel=preload as=script><link href=/app-extension-qmarkdown/js/vendor.77989879.js rel=preload as=script><link href=/app-extension-qmarkdown/css/app.1e40eb58.css rel=stylesheet><base href=/app-extension-qmarkdown/ ></head><body><script>(function(){
           let redirect = sessionStorage.redirect;
           delete sessionStorage.redirect;
           if (redirect && redirect !== location.href) {
             history.replaceState(null, null, redirect);
           }
-        })();</script><div id=q-app></div><script type=text/javascript src=/app-extension-qmarkdown/js/app.10a8a72b.js></script><script type=text/javascript src=/app-extension-qmarkdown/js/runtime.b1c40832.js></script><script type=text/javascript src=/app-extension-qmarkdown/js/vendor.19036311.js></script></body></html>
+        })();</script><div id=q-app></div><script type=text/javascript src=/app-extension-qmarkdown/js/app.88acf251.js></script><script type=text/javascript src=/app-extension-qmarkdown/js/runtime.2dba8d08.js></script><script type=text/javascript src=/app-extension-qmarkdown/js/vendor.77989879.js></script></body></html>