Merge branch 'develop' into fix-embed-mermaid

Author: sy-records

docs/embed-files.md

@@ -16,7 +16,7 @@ Then the content of `example.md` will be displayed directly here;
 
 You can check the original content for [example.md](_media/example.md ':ignore').
 
-Normally, this will compiled into a link, but in docsify, if you add `:include` it will be embedded.
+Normally, this will compiled into a link, but in docsify, if you add `:include` it will be embedded. You can use single or double quotation marks around as you like.
 
 External links can be used too - just replace the target. If you want to use a gist URL, see [Embed a gist](#embed-a-gist) section.
 

docs/write-a-plugin.md

@@ -87,7 +87,7 @@ window.$docsify = {
           editHtml +
           html +
           '\n----\n' +
-          'Last modified {docsify-updated} ' +
+          'Last modified {docsify-updated}' +
           editHtml
         );
       });
@@ -108,4 +108,5 @@ Current version: <span id='tip-version'>loading</span>
 
 <script>
 document.getElementById('tip-version').innerText = Docsify.version
+document.getElementsByClassName("lang-js")[2].innerHTML = document.getElementsByClassName("lang-js")[2].innerHTML.replace(/Last modified .*'/,"Last modified {docsify-updated<span>}'</span>")
 </script>

package-lock.json

@@ -54,7 +54,7 @@
     "*.js": "eslint --fix"
   },
   "dependencies": {
-    "dompurify": "^2.2.8",
+    "dompurify": "^2.2.9",
     "marked": "^1.2.9",
     "medium-zoom": "^1.0.6",
     "opencollective-postinstall": "^2.0.2",

package.json

@@ -23,8 +23,8 @@ export function getAndRemoveConfig(str = '') {
 
   if (str) {
     str = str
-      .replace(/^'/, '')
-      .replace(/'$/, '')
+      .replace(/^('|")/, '')
+      .replace(/('|")$/, '')
       .replace(/(?:^|\s):([\w-]+:?)=?([\w-%]+)?/g, (m, key, value) => {
         if (key.indexOf(':') === -1) {
           config[key] = (value && value.replace(/"/g, '')) || true;

packages/docsify-server-renderer/package-lock.json

@@ -1,4 +1,7 @@
-const { removeAtag } = require('../../src/core/render/utils');
+const {
+  removeAtag,
+  getAndRemoveConfig,
+} = require('../../src/core/render/utils');
 
 const { tree } = require(`../../src/core/render/tpl`);
 
@@ -16,6 +19,46 @@ describe('core/render/utils', () => {
       expect(result).toEqual('content');
     });
   });
+
+  // getAndRemoveConfig()
+  // ---------------------------------------------------------------------------
+  describe('getAndRemoveConfig()', () => {
+    test('parse simple config', () => {
+      const result = getAndRemoveConfig(
+        `[filename](_media/example.md ':include')`
+      );
+
+      expect(result).toMatchObject({
+        config: {},
+        str: `[filename](_media/example.md ':include')`,
+      });
+    });
+
+    test('parse config with arguments', () => {
+      const result = getAndRemoveConfig(
+        `[filename](_media/example.md ':include :foo=bar :baz test')`
+      );
+
+      expect(result).toMatchObject({
+        config: {
+          foo: 'bar',
+          baz: true,
+        },
+        str: `[filename](_media/example.md ':include test')`,
+      });
+    });
+
+    test('parse config with double quotes', () => {
+      const result = getAndRemoveConfig(
+        `[filename](_media/example.md ":include")`
+      );
+
+      expect(result).toMatchObject({
+        config: {},
+        str: `[filename](_media/example.md ":include")`,
+      });
+    });
+  });
 });
 
 describe('core/render/tpl', () => {