Merge branch 'master' into dev

Author: hawkeye64

README.md

@@ -45,6 +45,29 @@ Shortcuts (emoticons): :-) :-( 8-) ;)
 </q-markdown>
 ```
 
+# Imports
+QMarkdown now allows you to import markdown files into your Vue files.
+
+```
+import markdown from '../markdown/calendar.md'
+```
+
+then,
+
+```
+  data () {
+    return {
+      markdown: markdown
+    }
+  },
+```
+
+and finally:
+
+```
+<q-markdown :src="markdown" />
+```
+
 # QMarkdown Vue Properties
 | Vue&nbsp;Property | Type	| Description |
 |---|---|---|

package.json

@@ -46,7 +46,8 @@
     "markdown-it-sup": "^1.0.0",
     "markdown-it-task-lists": "^2.1.1",
     "markdown-it-toc-and-anchor": "^4.2.0",
-    "prismjs": "^1.16.0"
+    "prismjs": "^1.16.0",
+    "raw-loader": "^2.0.0"
   },
   "devDependencies": {
     "@vue/eslint-config-standard": "^4.0.0",

src/component/markdown.styl

@@ -107,7 +107,7 @@
     text-decoration none
     outline 0
     border-bottom 1px dotted currentColor
-    vertical-align center
+    text-align center
     transition opacity .2s
     white-space nowrap
 
@@ -141,8 +141,8 @@
 
   &--token
     white-space nowrap
-    background lighten($primary, 85%)
-    color $dark-primary
+    background-color lighten($primary, 85%)
+    color darken($primary, 15%)
     font-family inherit
     border-radius $generic-border-radius
     padding 1px 5px
@@ -169,7 +169,7 @@
       background-color lighten($grey-6, 40%)
       color white
       .q-markdown--token
-        background lighten($grey-6, 55%)
+        background-color lighten($grey-6, 55%)
       .q-markdown--link
         color darken($grey-6, 35%)
 
@@ -178,7 +178,7 @@
       background-color lighten($blue-6, 20%)
       color white
       .q-markdown--token
-        background lighten($blue-6, 55%)
+        background-color lighten($blue-6, 55%)
       .q-markdown--link
         color darken($blue-6, 35%)
 
@@ -187,7 +187,7 @@
       background-color lighten($positive, 20%)
       color white
       .q-markdown--token
-        background lighten($positive, 55%)
+        background-color lighten($positive, 55%)
       .q-markdown--link
         color darken($positive, 35%)
 
@@ -205,7 +205,7 @@
       background-color lighten($negative, 60%)
       color white
       .q-markdown--token
-        background lighten($negative, 65%)
+        background-color lighten($negative, 65%)
       .q-markdown--link
         color darken($negative, 25%)
 

src/index.js

@@ -18,6 +18,14 @@ const extendQuasarConf = function (conf) {
   console.log(` App Extension (qmarkdown) Info: 'Adding markdown.styl css reference to your quasar.conf.js'`)
 }
 
+const chainWebpack = function (chain, { isClient }) {
+  console.log(` App Extension (qmarkdown) Info: 'Adding markdown loader to chainWebpack in your quasar.conf.js'`)
+  chain.module.rule('md')
+    .test(/\.md$/i)
+    .use('raw-loader')
+    .loader('raw-loader')
+}
+
 module.exports = function (api) {
   // quasar compatibility check
   api.compatibleWith('@quasar/app', '^1.0.0-beta.18')
@@ -27,4 +35,7 @@ module.exports = function (api) {
 
   // extend quasar.conf
   api.extendQuasarConf(extendQuasarConf)
+
+  // chain webpack
+  api.chainWebpack(chainWebpack)
 }

yarn.lock

@@ -111,7 +111,17 @@ acorn@^6.0.2, acorn@^6.0.7:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
-ajv@^6.9.1:
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
+  integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
+
+ajv@^6.1.0, ajv@^6.9.1:
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
   integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
@@ -833,7 +843,7 @@ loader-fs-cache@^1.0.0:
     find-cache-dir "^0.1.1"
     mkdirp "0.5.1"
 
-loader-utils@^1.0.2:
+loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -1176,6 +1186,14 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+raw-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-2.0.0.tgz#e2813d9e1e3f80d1bbade5ad082e809679e20c26"
+  integrity sha512-kZnO5MoIyrojfrPWqrhFNLZemIAX8edMOCp++yC5RKxzFB3m92DqKNhKlU6+FvpOhWtvyh3jOaD7J6/9tpdIKg==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
@@ -1244,6 +1262,15 @@ rxjs@^6.4.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
 select@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"