@vuepress/markdown 2.0.0-beta.60 → 2.0.0-beta.62

package/dist/index.js

@@ -28,9 +28,16 @@ import { default as anchorPlugin } from "markdown-it-anchor";
 // src/plugins/assetsPlugin/resolveLink.ts
 import { path } from "@vuepress/utils";
 import { decode } from "mdurl";
-var resolveLink = (link, relativePathPrefix, env) => {
+var resolveLink = (link, relativePathPrefix, env, strict = false) => {
   let resolvedLink = decode(link);
-  if (/^\.{1,2}\//.test(link) && env.filePathRelative) {
+  const isRelativePath = strict ? (
+    // in strict mode, only link that starts with `./` or `../` is considered as relative path
+    /^\.{1,2}\//.test(link)
+  ) : (
+    // in non-strict mode, link that does not start with `/` and does not have protocol is considered as relative path
+    !link.startsWith("/") && !/[A-z]+:\/\//.test(link)
+  );
+  if (isRelativePath && env.filePathRelative) {
     resolvedLink = `${relativePathPrefix}/${path.join(
       path.dirname(env.filePathRelative),
       resolvedLink
@@ -56,7 +63,8 @@ var assetsPlugin = (md, { relativePathPrefix = "@source" } = {}) => {
       (_, prefix, quote, src) => `${prefix}${quote}${resolveLink(
         src.trim(),
         relativePathPrefix,
-        env
+        env,
+        true
       )}${quote}`
     ).replace(
       /(<img\b.*?srcset=)(['"])([^\2]*?)\2/gs,
@@ -66,7 +74,8 @@ var assetsPlugin = (md, { relativePathPrefix = "@source" } = {}) => {
           (_2, url, descriptor = "") => `${resolveLink(
             url.trim(),
             relativePathPrefix,
-            env
+            env,
+            true
           )}${descriptor.replace(/[ \n]+/g, " ").trimEnd()}`
         )
       ).join(", ")}${quote}`
@@ -235,7 +244,8 @@ var codePlugin = (md, {
     const language = resolveLanguage(info);
     const languageClass = `${options.langPrefix}${language.name}`;
     const code = options.highlight?.(token.content, language.name, "") || md.utils.escapeHtml(token.content);
-    let result = code.startsWith("<pre") ? code : `<pre class="${languageClass}"><code>${code}</code></pre>`;
+    token.attrJoin("class", languageClass);
+    let result = code.startsWith("<pre") ? code : `<pre${slf.renderAttrs(token)}><code>${code}</code></pre>`;
     const useVPre = resolveVPre(info) ?? vPreBlock;
     if (useVPre) {
       result = `<pre v-pre${result.slice("<pre".length)}`;
@@ -313,11 +323,14 @@ var createImportCodeBlockRule = ({ handleImportPath = (str) => str }) => (state,
 };
 
 // src/plugins/importCodePlugin/resolveImportCode.ts
-import { fs, path as path3 } from "@vuepress/utils";
+import { colors, fs, logger, path as path3 } from "@vuepress/utils";
 var resolveImportCode = ({ importPath, lineStart, lineEnd }, { filePath }) => {
   let importFilePath = importPath;
   if (!path3.isAbsolute(importPath)) {
     if (!filePath) {
+      logger.error(
+        `Import file ${colors.magenta(importPath)} can not be resolved`
+      );
       return {
         importFilePath: null,
         importCode: "Error when resolving path"
@@ -326,6 +339,7 @@ var resolveImportCode = ({ importPath, lineStart, lineEnd }, { filePath }) => {
     importFilePath = path3.resolve(filePath, "..", importPath);
   }
   if (!fs.existsSync(importFilePath)) {
+    logger.error(`Import file ${colors.magenta(importPath)} not found`);
     return {
       importFilePath,
       importCode: "File not found"
@@ -353,8 +367,8 @@ var importCodePlugin = (md, options = {}) => {
     const { importFilePath, importCode } = resolveImportCode(token.meta, env);
     token.content = importCode;
     if (importFilePath) {
-      const importedFiles = env.importedFiles || (env.importedFiles = []);
-      importedFiles.push(importFilePath);
+      ;
+      (env.importedFiles ?? (env.importedFiles = [])).push(importFilePath);
     }
     return md.renderer.rules.fence(tokens, idx, options2, env, slf);
   };
@@ -380,6 +394,7 @@ var resolvePaths = (rawPath, base, filePathRelative) => {
   } else {
     if (filePathRelative) {
       relativePath = path4.join(
+        // file path may contain non-ASCII characters
         path4.dirname(encodeURI(filePathRelative)),
         rawPath
       );
@@ -439,8 +454,7 @@ var linksPlugin = (md, options = {}) => {
       hasOpenInternalLink = true;
     }
     hrefAttr[1] = `${normalizedPath}${rawHash}`;
-    const links = env.links || (env.links = []);
-    links.push({
+    (env.links ?? (env.links = [])).push({
       raw: hrefLink,
       relative: relativePath,
       absolute: absolutePath
@@ -478,6 +492,7 @@ var createMarkdown = ({
 } = {}) => {
   const md = MarkdownIt({
     ...markdownItOptions,
+    // should always enable html option
     html: true
   });
   if (anchor !== false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.60",
+  "version": "2.0.0-beta.62",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -27,22 +27,22 @@
     "dist"
   ],
   "dependencies": {
-    "@mdit-vue/plugin-component": "^0.11.2",
-    "@mdit-vue/plugin-frontmatter": "^0.11.1",
-    "@mdit-vue/plugin-headers": "^0.11.2",
-    "@mdit-vue/plugin-sfc": "^0.11.1",
-    "@mdit-vue/plugin-title": "^0.11.2",
-    "@mdit-vue/plugin-toc": "^0.11.2",
-    "@mdit-vue/shared": "^0.11.2",
-    "@mdit-vue/types": "^0.11.0",
+    "@mdit-vue/plugin-component": "^0.12.0",
+    "@mdit-vue/plugin-frontmatter": "^0.12.0",
+    "@mdit-vue/plugin-headers": "^0.12.0",
+    "@mdit-vue/plugin-sfc": "^0.12.0",
+    "@mdit-vue/plugin-title": "^0.12.0",
+    "@mdit-vue/plugin-toc": "^0.12.0",
+    "@mdit-vue/shared": "^0.12.0",
+    "@mdit-vue/types": "^0.12.0",
     "@types/markdown-it": "^12.2.3",
     "@types/markdown-it-emoji": "^2.0.2",
     "markdown-it": "^13.0.1",
-    "markdown-it-anchor": "^8.6.6",
+    "markdown-it-anchor": "^8.6.7",
     "markdown-it-emoji": "^2.0.2",
     "mdurl": "^1.0.1",
-    "@vuepress/shared": "2.0.0-beta.60",
-    "@vuepress/utils": "2.0.0-beta.60"
+    "@vuepress/shared": "2.0.0-beta.62",
+    "@vuepress/utils": "2.0.0-beta.62"
   },
   "devDependencies": {
     "@types/mdurl": "^1.0.2"