@vuepress/markdown 2.0.0-rc.1 → 2.0.0-rc.11

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { SfcPluginOptions } from '@mdit-vue/plugin-sfc';
 export { MarkdownSfcBlocks, SfcPluginOptions, sfcPlugin } from '@mdit-vue/plugin-sfc';
 import { MarkdownItEnv } from '@mdit-vue/types';
 import { PageHeader, PageFrontmatter } from '@vuepress/shared';
-import MarkdownIt, { PluginWithOptions } from 'markdown-it';
+import MarkdownIt, { PluginWithOptions, Options as Options$1 } from 'markdown-it';
 import { FrontmatterPluginOptions } from '@mdit-vue/plugin-frontmatter';
 export { FrontmatterPluginOptions, frontmatterPlugin } from '@mdit-vue/plugin-frontmatter';
 import { HeadersPluginOptions } from '@mdit-vue/plugin-headers';
@@ -87,9 +87,9 @@ interface LinksPluginOptions {
     /**
      * Tag for internal links
      *
-     * @default 'RouterLink'
+     * @default 'RouteLink'
      */
-    internalTag?: 'a' | 'RouterLink';
+    internalTag?: 'a' | 'RouteLink' | 'RouterLink';
     /**
      * Additional attributes for external links
      *
@@ -106,14 +106,14 @@ interface LinksPluginOptions {
 /**
  * Process links in markdown file
  *
- * - internal links: convert them into `<RouterLink>`
- * - external links: add extra attrs and external icon
+ * - internal links: convert `<a>` tag into internalTag
+ * - external links: add extra attrs
  */
 declare const linksPlugin: PluginWithOptions<LinksPluginOptions>;
 
 type Markdown = MarkdownIt;
 
-interface MarkdownOptions extends MarkdownIt.Options {
+interface MarkdownOptions extends Options$1 {
     anchor?: false | AnchorPluginOptions;
     assets?: false | AssetsPluginOptions;
     code?: false | CodePluginOptions;
@@ -140,7 +140,7 @@ type MarkdownHeader = PageHeader;
 interface MarkdownLink {
     raw: string;
     relative: string;
-    absolute: string;
+    absolute: string | null;
 }
 /**
  * The `env` object to be passed to markdown-it render function

package/dist/index.js

@@ -400,7 +400,7 @@ var importCodePlugin = (md, options = {}) => {
 };
 
 // src/plugins/linksPlugin/linksPlugin.ts
-import { isLinkExternal } from "@vuepress/shared";
+import { inferRoutePath, isLinkExternal } from "@vuepress/shared";
 
 // src/plugins/linksPlugin/resolvePaths.ts
 import { removeLeadingSlash } from "@vuepress/shared";
@@ -426,7 +426,7 @@ var resolvePaths = (rawPath, base, filePathRelative) => {
       absolutePath = path4.join(base, relativePath);
     } else {
       relativePath = rawPath.replace(/^(?:\.\/)?(.*)$/, "$1");
-      absolutePath = relativePath;
+      absolutePath = null;
     }
   }
   return {
@@ -437,7 +437,7 @@ var resolvePaths = (rawPath, base, filePathRelative) => {
 
 // src/plugins/linksPlugin/linksPlugin.ts
 var linksPlugin = (md, options = {}) => {
-  const internalTag = options.internalTag || "RouterLink";
+  const internalTag = options.internalTag || "RouteLink";
   const externalAttrs = {
     target: "_blank",
     rel: "noopener noreferrer",
@@ -460,25 +460,31 @@ var linksPlugin = (md, options = {}) => {
       return;
     }
     const internalLinkMatch = hrefLink.match(
-      /^((?:.*)(?:\/|\.md|\.html))(#.*)?$/
+      /^([^#?]*?(?:\/|\.md|\.html))([#?].*)?$/
     );
     if (!internalLinkMatch) {
       return;
     }
     const rawPath = internalLinkMatch[1];
-    const rawHash = internalLinkMatch[2] || "";
+    const rawHashAndQueries = internalLinkMatch[2] || "";
     const { relativePath, absolutePath } = resolvePaths(
       rawPath,
       base,
       filePathRelative
     );
-    const normalizedPath = absolutePath.replace(new RegExp(`^${base}`), "/").replace(/(^|\/)(README|index).md$/i, "$1").replace(/\.md$/, ".html");
-    if (internalTag === "RouterLink") {
+    if (["RouterLink", "RouteLink"].includes(internalTag)) {
       token.tag = internalTag;
       hrefAttr[0] = "to";
+      const normalizedPath = inferRoutePath(
+        absolutePath ? absolutePath.replace(new RegExp(`^${base}`), "/") : relativePath
+      );
+      hrefAttr[1] = `${normalizedPath}${rawHashAndQueries}`;
       hasOpenInternalLink = true;
+    } else {
+      const normalizedPath = inferRoutePath(absolutePath ?? relativePath);
+      hrefAttr[1] = `${normalizedPath}${rawHashAndQueries}`;
     }
-    hrefAttr[1] = `${normalizedPath}${rawHash}`;
+    ;
     (env.links ??= []).push({
       raw: hrefLink,
       relative: relativePath,
@@ -489,7 +495,7 @@ var linksPlugin = (md, options = {}) => {
     handleLinkOpen(tokens, idx, env);
     return self.renderToken(tokens, idx, options2);
   };
-  md.renderer.rules.link_close = (tokens, idx, options2, env, self) => {
+  md.renderer.rules.link_close = (tokens, idx, options2, _env, self) => {
     if (hasOpenInternalLink) {
       hasOpenInternalLink = false;
       tokens[idx].tag = internalTag;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.11",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -27,25 +27,25 @@
     "dist"
   ],
   "dependencies": {
-    "@mdit-vue/plugin-component": "^2.0.0",
-    "@mdit-vue/plugin-frontmatter": "^2.0.0",
-    "@mdit-vue/plugin-headers": "^2.0.0",
-    "@mdit-vue/plugin-sfc": "^2.0.0",
-    "@mdit-vue/plugin-title": "^2.0.0",
-    "@mdit-vue/plugin-toc": "^2.0.0",
-    "@mdit-vue/shared": "^2.0.0",
-    "@mdit-vue/types": "^2.0.0",
-    "@types/markdown-it": "^13.0.7",
-    "@types/markdown-it-emoji": "^2.0.4",
-    "markdown-it": "^14.0.0",
+    "@mdit-vue/plugin-component": "^2.1.3",
+    "@mdit-vue/plugin-frontmatter": "^2.1.3",
+    "@mdit-vue/plugin-headers": "^2.1.3",
+    "@mdit-vue/plugin-sfc": "^2.1.3",
+    "@mdit-vue/plugin-title": "^2.1.3",
+    "@mdit-vue/plugin-toc": "^2.1.3",
+    "@mdit-vue/shared": "^2.1.3",
+    "@mdit-vue/types": "^2.1.0",
+    "@types/markdown-it": "^14.1.1",
+    "@types/markdown-it-emoji": "^3.0.1",
+    "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^8.6.7",
     "markdown-it-emoji": "^3.0.0",
     "mdurl": "^2.0.0",
-    "@vuepress/shared": "2.0.0-rc.1",
-    "@vuepress/utils": "2.0.0-rc.1"
+    "@vuepress/shared": "2.0.0-rc.11",
+    "@vuepress/utils": "2.0.0-rc.11"
   },
   "devDependencies": {
-    "@types/mdurl": "^1.0.5"
+    "@types/mdurl": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"