Merge remote-tracking branch 'origin/main'

Author: andrey-helldar

lib/node/plugins/transformers/commit.js

@@ -2,13 +2,16 @@ import { regex } from '../regex.js';
 import { template } from '../template.js';
 import { url } from '../url.js';
 export const commitCompact = (text, repo) => {
-    const replacer = (value, item) => value.replace(item[0], template('commit', `${item[1]}/${item[2]}`, item[3]));
-    text = regex(text, /\[[\w\d\s`]+]\(https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})\)/g, replacer);
-    text = regex(text, /https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})/g, replacer);
+    const replacerFull = (value, item) => value.replace(item[0], template('commit', `${item[1]}/${item[2]}`, item[3]));
+    const replacerShort = (value, item) => value.replace(item[0], template('commit', repo, item[1]));
+    text = regex(text, /<a.*href\s?=\s?"?https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})"?.*>.*<\/a>/g, replacerFull);
+    text = regex(text, /\[[\w\d\s`]+]\(https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})\)/g, replacerFull);
+    text = regex(text, /https:\/\/github\.com\/([\w\d\-_]+)\/([\w\d\-_]+)\/commit\/([\w\d]{40})/g, replacerFull);
+    text = regex(text, /[^\D\W\S:]*([\w\d]{40})[^:]/g, replacerShort);
     return text;
 };
 export const commitExpand = (text, repo) => {
-    const replacer = (value, item) => value.replace(item[0], url(`${item[1]}#${item[2].substring(0, 7)}`, `${item[1]}/commit/${item[2]}`));
+    const replacer = (value, item) => value.replace(item[0], url(repo, `${item[1].includes(repo) ? '' : item[1] + '#'}${item[2].substring(0, 7)}`, `${item[1]}/commit/${item[2]}`));
     text = regex(text, /::commit::([\w\d\-_\/]+)::([\w\d]+)::/g, replacer);
     return text;
 };

lib/node/plugins/transformers/compare.js

@@ -10,7 +10,7 @@ export const compareCompact = (text, repo) => {
     return text;
 };
 export const compareExpand = (text, repo) => {
-    const replacer = (value, item) => value.replace(item[0], url(`${item[2]}...${item[3]}`, `${item[1]}/compare/${item[2]}...${item[3]}`));
+    const replacer = (value, item) => value.replace(item[0], url(repo, `${item[1].includes(repo) ? '' : item[1] + '#'}${item[2]}...${item[3]}`, `${item[1]}/compare/${item[2]}...${item[3]}`));
     text = regex(text, /::compare::([\w\d.\-\/]+)::([\w\d.\-]+)::([\w\d.\-]+)::/g, replacer);
     return text;
 };

lib/node/plugins/transformers/pull-request.js

@@ -10,7 +10,7 @@ export const pullRequestCompact = (text, repo) => {
     return text;
 };
 export const pullRequestExpand = (text, repo) => {
-    const replacer = (value, item) => value.replace(item[0], url(`${item[1]}#${item[2]}`, `${item[1]}/pull/${item[2]}`));
+    const replacer = (value, item) => value.replace(item[0], url(repo, `${item[1]}#${item[2]}`, `${item[1]}/pull/${item[2]}`));
     text = regex(text, /::pull_request::([\w\d\-_\/]+)::([\w\d\-_]+)::/g, replacer);
     return text;
 };

lib/node/plugins/transformers/username.js

@@ -9,7 +9,7 @@ export const usernameCompact = (text, repo) => {
     return text;
 };
 export const usernameExpand = (text, repo) => {
-    const replacer = (value, item) => value.replace(item[0], url(`@${item[1]}`, item[1]));
+    const replacer = (value, item) => value.replace(item[0], url(repo, `@${item[1]}`, item[1]));
     text = regex(text, /::username::([\w\d\-_]+)::/g, replacer);
     return text;
 };

lib/node/plugins/url.d.ts

@@ -1 +1 @@
-export declare const url: (value: string, link?: string) => string;
+export declare const url: (repo: string, value: string, link?: string) => string;

lib/node/plugins/url.js

@@ -1,4 +1,5 @@
-export const url = (value, link) => {
+export const url = (repo, value, link) => {
     link = (link || value).replace('https://github.com/', '');
+    value = value.replace(repo + '/', '').replace(repo, '');
     return `<a href="https://github.com/${link}" target="_blank" rel="noopener noreferrer">${value} <ExternalLinkIcon /></a>`;
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vuepress-plugin-github-linkify",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "description": "Fix display of GitHub links for Vuepress 2",
     "author": {
         "name": "Andrey Helldar",