Merge branch 'docsifyjs:develop' into develop

naneko · web-flow · commit 94f7fbf3e447 · 2023-03-09T21:56:51.000-05:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,10 +26,7 @@ jobs:
       - name: Lint
         run: npm run lint
 
-      - name: Install dependencies [server-renderer]
-        working-directory: ./packages/docsify-server-renderer
-        run: npm ci --ignore-scripts
-      - name: Build [server-renderer]
+      - name: Verify dependencies [server-renderer]
         working-directory: ./packages/docsify-server-renderer
         run: npm ci --ignore-scripts
 
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -153,19 +153,6 @@ window.$docsify = {
 };
 ```
 
-## crossOriginLinks
-
-- Type: `Array`
-
-When `routerMode: 'history'`, you may face cross-origin issues. See [#1379](https://github.com/docsifyjs/docsify/issues/1379).
-In Markdown content, there is a simple way to solve it: see extends Markdown syntax `Cross-Origin link` in [helpers](helpers.md).
-
-```js
-window.$docsify = {
-  crossOriginLinks: ['https://example.com/cross-origin-link'],
-};
-```
-
 ## el
 
 - Type: `String`
@@ -701,6 +688,7 @@ window.$docsify = {
 Define "virtual" routes that can provide content dynamically. A route is a map between the expected path, to either a string or a function. If the mapped value is a string, it is treated as markdown and parsed accordingly. If it is a function, it is expected to return markdown content.
 
 A route function receives up to three parameters:
+
 1. `route` - the path of the route that was requested (e.g. `/bar/baz`)
 2. `matched` - the [`RegExpMatchArray`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match) that was matched by the route (e.g. for `/bar/(.+)`, you get `['/bar/baz', 'baz']`)
 3. `next` - this is a callback that you may call when your route function is async
@@ -714,23 +702,23 @@ window.$docsify = {
     '/foo': '# Custom Markdown',
 
     // RegEx match w/ synchronous function
-    '/bar/(.*)': function(route, matched) {
+    '/bar/(.*)': function (route, matched) {
       return '# Custom Markdown';
     },
 
     // RegEx match w/ asynchronous function
-    '/baz/(.*)': function(route, matched, next) {
-       // Requires `fetch` polyfill for legacy browsers (https://github.github.io/fetch/)
+    '/baz/(.*)': function (route, matched, next) {
+      // Requires `fetch` polyfill for legacy browsers (https://github.github.io/fetch/)
       fetch('/api/users?id=12345')
-        .then(function(response) {
+        .then(function (response) {
           next('# Custom Markdown');
         })
-        .catch(function(err) {
+        .catch(function (err) {
           // Handle error...
         });
-    }
-  }
-}
+    },
+  },
+};
 ```
 
 Other than strings, route functions can return a falsy value (`null` \ `undefined`) to indicate that they ignore the current request:
diff --git a/docs/helpers.md b/docs/helpers.md
@@ -65,14 +65,6 @@ You will get `<a href="/demo/">link</a>`html. Do not worry, you can still set th
 [link](/demo ':disabled')
 ```
 
-## Cross-Origin link
-
-Only when you set both the `routerMode: 'history'` and `externalLinkTarget: '_self'`, you need to add this configuration for those Cross-Origin links.
-
-```md
-[example.com](https://example.com/ ':crossorgin')
-```
-
 ## GitHub Task Lists
 
 ```md
diff --git a/docs/index.html b/docs/index.html
@@ -41,6 +41,12 @@
       title="pure"
       disabled
     />
+    <link
+      rel="stylesheet"
+      href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/dolphin.css"
+      title="dolphin"
+      disabled
+    />
     <style>
       nav.app-nav li ul {
         min-width: 100px;
diff --git a/docs/more-pages.md b/docs/more-pages.md
@@ -135,3 +135,5 @@ This header won't appear in the sidebar table of contents.
 ```
 
 Both `<!-- {docsify-ignore} -->` and `<!-- {docsify-ignore-all} -->` will not be rendered on the page when used.
+
+And the `{docsify-ignore}` and `{docsify-ignore-all}` can do the samething as well.
diff --git a/docs/themes.md b/docs/themes.md
@@ -8,6 +8,7 @@ There is a handful of themes available, both official and community-made. Copy [
 <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/buble.css" />
 <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/dark.css" />
 <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/pure.css" />
+<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/dolphin.css" />
 ```
 <!-- prettier-ignore-end -->
 
@@ -21,6 +22,7 @@ There is a handful of themes available, both official and community-made. Copy [
 <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/buble.css" />
 <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dark.css" />
 <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/pure.css" />
+<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/lib/themes/dolphin.css" />
 ```
 <!-- prettier-ignore-end -->
 
@@ -33,6 +35,7 @@ If you have any ideas or would like to develop a new theme, you are welcome to s
   <a data-theme="buble">buble.css</a>
   <a data-theme="dark">dark.css</a>
   <a data-theme="pure">pure.css</a>
+  <a data-theme="dolphin">dolphin.css</a>
 </div>
 
 <style>
diff --git a/index.html b/index.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/themes/dark.css" title="dark" disabled />
     <link rel="stylesheet" href="/themes/buble.css" title="buble" disabled />
     <link rel="stylesheet" href="/themes/pure.css" title="pure" disabled />
+    <link rel="stylesheet" href="/themes/dolphin.css" title="dolphin" disabled />
     <style>
       nav.app-nav li ul {
         min-width: 100px;
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/docsify-server-renderer/package-lock.json b/packages/docsify-server-renderer/package-lock.json
diff --git a/packages/docsify-server-renderer/package.json b/packages/docsify-server-renderer/package.json
@@ -17,7 +17,7 @@
   "dependencies": {
     "debug": "^4.3.4",
     "docsify": "^4.13.0",
-    "node-fetch": "^2.6.6",
+    "node-fetch": "^2.6.9",
     "resolve-pathname": "^3.0.0"
   }
 }
diff --git a/src/core/config.js b/src/core/config.js
@@ -13,7 +13,6 @@ export default function (vm) {
       catchPluginErrors: true,
       cornerExternalLinkTarget: '_blank',
       coverpage: '',
-      crossOriginLinks: [],
       el: '#app',
       executeScript: null,
       ext: '.md',
diff --git a/src/core/render/compiler/link.js b/src/core/render/compiler/link.js
@@ -43,17 +43,6 @@ export const linkCompiler = ({
       );
     }
 
-    // special case to check crossorigin urls
-    if (
-      config.crossorgin &&
-      linkTarget === '_self' &&
-      compilerClass.config.routerMode === 'history'
-    ) {
-      if (compilerClass.config.crossOriginLinks.indexOf(href) === -1) {
-        compilerClass.config.crossOriginLinks.push(href);
-      }
-    }
-
     if (config.disabled) {
       attrs.push('disabled');
       href = 'javascript:void(0)';
diff --git a/src/core/router/history/hash.js b/src/core/router/history/hash.js
@@ -1,4 +1,4 @@
-import { noop } from '../../util/core';
+import { isExternal, noop } from '../../util/core';
 import { on } from '../../util/dom';
 import { endsWith } from '../../util/str';
 import { parseQuery, cleanPath, replaceSlug } from '../util';
@@ -48,7 +48,7 @@ export class HashHistory extends History {
     on('click', e => {
       const el = e.target.tagName === 'A' ? e.target : e.target.parentNode;
 
-      if (el && el.tagName === 'A' && !/_blank/.test(el.target)) {
+      if (el && el.tagName === 'A' && !isExternal(el.href)) {
         navigating = true;
       }
     });
diff --git a/src/core/router/history/html5.js b/src/core/router/history/html5.js

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"dependencies": {`
`18`	`18`	`"debug": "^4.3.4",`
`19`	`19`	`"docsify": "^4.13.0",`
`20`		`- "node-fetch": "^2.6.6",`
	`20`	`+ "node-fetch": "^2.6.9",`
`21`	`21`	`"resolve-pathname": "^3.0.0"`
`22`	`22`	`}`
`23`	`23`	`}`