Merge pull request #1186 from anikethsaha/fixes-1183

fix: fixed target and rel issue (fixes #1183)

packages/docsify-server-renderer/index.js

@@ -1,13 +1,13 @@
 import { readFileSync } from 'fs';
 import { resolve, basename } from 'path';
 import resolvePathname from 'resolve-pathname';
+import fetch from 'node-fetch';
+import debug from 'debug';
 import { AbstractHistory } from '../../src/core/router/history/abstract';
 import { Compiler } from '../../src/core/render/compiler';
 import { isAbsolutePath } from '../../src/core/router/util';
 import * as tpl from '../../src/core/render/tpl';
 import { prerenderEmbed } from '../../src/core/render/embed';
-import fetch from 'node-fetch';
-import debug from 'debug';
 
 function cwd(...args) {
   return resolve(process.cwd(), ...args);

src/core/event/scroll.js

@@ -1,8 +1,8 @@
+import Tweezer from 'tweezer.js';
 import { isMobile } from '../util/env';
 import * as dom from '../util/dom';
 import { removeParams } from '../router/util';
 import config from '../config';
-import Tweezer from 'tweezer.js';
 
 const nav = {};
 let hoverOver = false;

src/core/global-api.js

@@ -1,10 +1,10 @@
+import prism from 'prismjs';
+import marked from 'marked';
 import * as util from './util';
 import * as dom from './util/dom';
 import { Compiler } from './render/compiler';
 import { slugify } from './render/slugify';
 import { get } from './fetch/ajax';
-import prism from 'prismjs';
-import marked from 'marked';
 
 export default function() {
   window.Docsify = {

src/core/render/compiler.js

@@ -1,3 +1,4 @@
+import marked from 'marked';
 import { isAbsolutePath, getPath, getParentPath } from '../router/util';
 import { isFn, merge, cached, isPrimitive } from '../util/core';
 import { tree as treeTpl } from './tpl';
@@ -11,7 +12,6 @@ import { paragraphCompiler } from './compiler/paragraph';
 import { taskListCompiler } from './compiler/taskList';
 import { taskListItemCompiler } from './compiler/taskListItem';
 import { linkCompiler } from './compiler/link';
-import marked from 'marked';
 
 const cachedLinks = {};
 
@@ -193,7 +193,7 @@ export class Compiler {
 
   _initRenderer() {
     const renderer = new marked.Renderer();
-    const { linkTarget, router, contentBase } = this;
+    const { linkTarget, linkRel, router, contentBase } = this;
     const _self = this;
     const origin = {};
 
@@ -233,6 +233,7 @@ export class Compiler {
       renderer,
       router,
       linkTarget,
+      linkRel,
       compilerClass: _self,
     });
     origin.paragraph = paragraphCompiler({ renderer });

src/core/render/compiler/link.js

@@ -1,11 +1,21 @@
 import { getAndRemoveConfig } from '../utils';
 import { isAbsolutePath } from '../../router/util';
 
-export const linkCompiler = ({ renderer, router, linkTarget, compilerClass }) =>
+export const linkCompiler = ({
+  renderer,
+  router,
+  linkTarget,
+  linkRel,
+  compilerClass,
+}) =>
   (renderer.link = (href, title = '', text) => {
     let attrs = [];
     const { str, config } = getAndRemoveConfig(title);
-
+    linkTarget = config.target || linkTarget;
+    linkRel =
+      linkTarget === '_blank'
+        ? compilerClass.config.externalLinkRel || 'noopener'
+        : '';
     title = str;
 
     if (
@@ -24,10 +34,13 @@ export const linkCompiler = ({ renderer, router, linkTarget, compilerClass }) =>
           document.URL.replace(/\/(?!.*\/).*/, '/').replace('#/./', '') + href;
       }
       attrs.push(href.indexOf('mailto:') === 0 ? '' : `target="${linkTarget}"`);
-    }
-
-    if (config.target) {
-      attrs.push(`target="${config.target}"`);
+      attrs.push(
+        href.indexOf('mailto:') === 0
+          ? ''
+          : linkRel !== ''
+          ? ` rel="${linkRel}"`
+          : ''
+      );
     }
 
     // special case to check crossorigin urls

src/core/render/embed.js

@@ -1,6 +1,6 @@
+import stripIndent from 'strip-indent';
 import { get } from '../fetch/ajax';
 import { merge } from '../util/core';
-import stripIndent from 'strip-indent';
 
 const cached = {};
 

src/core/render/index.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-vars */
+import tinydate from 'tinydate';
 import * as dom from '../util/dom';
 import cssVars from '../util/polyfill/css-vars';
 import { callHook } from '../init/lifecycle';
@@ -10,7 +11,6 @@ import { scrollActiveSidebar } from '../event/scroll';
 import { Compiler } from './compiler';
 import * as tpl from './tpl';
 import { prerenderEmbed } from './embed';
-import tinydate from 'tinydate';
 
 function executeScript() {
   const script = dom

test/unit/base.test.js

@@ -2,8 +2,8 @@
 require = require('esm')(
   module /* , options */
 ); /* eslint-disable-line no-global-assign */
-const { History } = require('../../src/core/router/history/base');
 const { expect } = require('chai');
+const { History } = require('../../src/core/router/history/base');
 
 class MockHistory extends History {
   parse(path) {