@vuepress/shared 2.0.0-rc.0 → 2.0.0-rc.10

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-present, Yuxi (Evan) You
+Copyright (c) 2018-present, VuePress Community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -0,0 +1,12 @@
+# @vuepress/shared
+
+[![npm](https://badgen.net/npm/v/@vuepress/shared/next)](https://www.npmjs.com/package/@vuepress/shared)
+[![license](https://badgen.net/github/license/vuepress/core)](https://github.com/vuepress/core/blob/main/LICENSE)
+
+## Documentation
+
+https://v2.vuepress.vuejs.org
+
+## License
+
+[MIT](https://github.com/vuepress/core/blob/main/LICENSE)

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { MarkdownItHeader } from '@mdit-vue/types';
-export { isArray, isFunction, isString } from '@vue/shared';
 
 /**
  * Config for `<head>` tags
@@ -42,14 +41,6 @@ type LocaleData = Record<never, never>;
  * Base type of vuepress page
  */
 interface PageBase<ExtraPageFrontmatter extends Record<any, any> = Record<string, unknown>> {
-    /**
-     * Identifier of the page
-     *
-     * Will also be used as the component name
-     *
-     * @example 'v-foobar'
-     */
-    key: string;
     /**
      * Route path of the page
      *
@@ -94,7 +85,7 @@ type PageFrontmatter<T extends Record<any, any> = Record<string, unknown>> = Par
     head?: HeadConfig[];
     lang?: string;
     layout?: string;
-    permalink?: string;
+    permalink?: string | null;
     permalinkPattern?: string | null;
     routeMeta?: Record<string, unknown>;
     title?: string;
@@ -168,7 +159,7 @@ interface SiteLocaleData {
     /**
      * Head config
      *
-     * Descibe the tags to be appended into the `<head>` tag
+     * Describe the tags to be appended into the `<head>` tag
      *
      * @default []
      *
@@ -212,6 +203,11 @@ declare const ensureEndingSlash: (str: string) => string;
  */
 declare const formatDateString: (str: string, defaultDateString?: string) => string;
 
+/**
+ * Infer route path according to the given (markdown file) path
+ */
+declare const inferRoutePath: (path: string) => string;
+
 /**
  * Determine a link is external or not
  */
@@ -236,6 +232,11 @@ declare const isLinkWithProtocol: (link: string) => boolean;
  */
 declare const isPlainObject: <T extends Record<any, any> = Record<any, any>>(val: unknown) => val is T;
 
+/**
+ * Normalize the given path to the final route path
+ */
+declare const normalizeRoutePath: (path: string, current?: string) => string;
+
 /**
  * Omit properties from an object
  */
@@ -254,7 +255,7 @@ declare const removeLeadingSlash: (str: string) => string;
 /**
  * Resolve identifier of a tag, to avoid duplicated tags in `<head>`
  */
-declare const resolveHeadIdentifier: ([tag, attrs, content,]: HeadConfig) => string;
+declare const resolveHeadIdentifier: ([tag, attrs, content]: HeadConfig) => string | null;
 
 /**
  * Resolve the matched locale path of route path
@@ -263,4 +264,13 @@ declare const resolveLocalePath: (locales: LocaleConfig, routePath: string) => s
 
 declare const resolveRoutePathFromUrl: (url: string, base?: string) => string;
 
-export { HeadAttrsConfig, HeadConfig, HeadTag, HeadTagEmpty, HeadTagNonEmpty, LocaleConfig, LocaleData, PageBase, PageData, PageFrontmatter, PageHeader, SiteData, SiteLocaleConfig, SiteLocaleData, VuepressSSRContext, dedupeHead, ensureEndingSlash, ensureLeadingSlash, formatDateString, isLinkExternal, isLinkHttp, isLinkWithProtocol, isPlainObject, omit, removeEndingSlash, removeLeadingSlash, resolveHeadIdentifier, resolveLocalePath, resolveRoutePathFromUrl };
+/**
+ * Check if a value is a function
+ */
+declare const isFunction: (val: unknown) => val is Function;
+/**
+ * Check if a value is a string
+ */
+declare const isString: (val: unknown) => val is string;
+
+export { type HeadAttrsConfig, type HeadConfig, type HeadTag, type HeadTagEmpty, type HeadTagNonEmpty, type LocaleConfig, type LocaleData, type PageBase, type PageData, type PageFrontmatter, type PageHeader, type SiteData, type SiteLocaleConfig, type SiteLocaleData, type VuepressSSRContext, dedupeHead, ensureEndingSlash, ensureLeadingSlash, formatDateString, inferRoutePath, isFunction, isLinkExternal, isLinkHttp, isLinkWithProtocol, isPlainObject, isString, normalizeRoutePath, omit, removeEndingSlash, removeLeadingSlash, resolveHeadIdentifier, resolveLocalePath, resolveRoutePathFromUrl };

package/dist/index.js

@@ -1,22 +1,29 @@
-// src/utils/index.ts
-import { isArray, isFunction, isString } from "@vue/shared";
-
 // src/utils/resolveHeadIdentifier.ts
-var resolveHeadIdentifier = ([
-  tag,
-  attrs,
-  content
-]) => {
+var TAGS_ALLOWED = ["link", "meta", "script", "style", "noscript", "template"];
+var TAGS_UNIQUE = ["title", "base"];
+var resolveHeadIdentifier = ([tag, attrs, content]) => {
+  if (TAGS_UNIQUE.includes(tag)) {
+    return tag;
+  }
+  if (!TAGS_ALLOWED.includes(tag)) {
+    return null;
+  }
   if (tag === "meta" && attrs.name) {
     return `${tag}.${attrs.name}`;
   }
-  if (["title", "base"].includes(tag)) {
-    return tag;
-  }
   if (tag === "template" && attrs.id) {
     return `${tag}.${attrs.id}`;
   }
-  return JSON.stringify([tag, attrs, content]);
+  return JSON.stringify([
+    tag,
+    Object.entries(attrs).map(([key, value]) => {
+      if (typeof value === "boolean") {
+        return value ? [key, ""] : null;
+      }
+      return [key, value];
+    }).filter((item) => item != null).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)),
+    content
+  ]);
 };
 
 // src/utils/dedupeHead.ts
@@ -25,7 +32,7 @@ var dedupeHead = (head) => {
   const result = [];
   head.forEach((item) => {
     const identifier = resolveHeadIdentifier(item);
-    if (!identifierSet.has(identifier)) {
+    if (identifier && !identifierSet.has(identifier)) {
       identifierSet.add(identifier);
       result.push(item);
     }
@@ -49,27 +56,48 @@ var formatDateString = (str, defaultDateString = "") => {
   return [yearStr, monthStr.padStart(2, "0"), dayStr.padStart(2, "0")].join("-");
 };
 
-// src/utils/isLinkHttp.ts
-var isLinkHttp = (link) => /^(https?:)?\/\//.test(link);
-
-// src/utils/isLinkExternal.ts
-var markdownLinkRegexp = /.md((\?|#).*)?$/;
-var isLinkExternal = (link, base = "/") => {
-  if (isLinkHttp(link)) {
-    return true;
+// src/utils/inferRoutePath.ts
+var inferRoutePath = (path) => {
+  if (!path || path.endsWith("/"))
+    return path;
+  let routePath = path.replace(/(^|\/)README.md$/i, "$1index.html");
+  if (routePath.endsWith(".md")) {
+    routePath = routePath.substring(0, routePath.length - 3) + ".html";
+  } else if (!routePath.endsWith(".html")) {
+    routePath = routePath + ".html";
   }
-  if (link.startsWith("/") && !link.startsWith(base) && !markdownLinkRegexp.test(link)) {
-    return true;
+  if (routePath.endsWith("/index.html")) {
+    routePath = routePath.substring(0, routePath.length - 10);
   }
-  return false;
+  return routePath;
 };
 
 // src/utils/isLinkWithProtocol.ts
-var isLinkWithProtocol = (link) => /^[a-z][a-z0-9+.-]*:/.test(link);
+var isLinkWithProtocol = (link) => /^[a-z][a-z0-9+.-]*:/.test(link) || link.startsWith("//");
+
+// src/utils/isLinkExternal.ts
+var markdownLinkRegexp = /.md((\?|#).*)?$/;
+var isLinkExternal = (link, base = "/") => isLinkWithProtocol(link) || // absolute link that does not start with `base` and does not end with `.md`
+link.startsWith("/") && !link.startsWith(base) && !markdownLinkRegexp.test(link);
+
+// src/utils/isLinkHttp.ts
+var isLinkHttp = (link) => /^(https?:)?\/\//.test(link);
 
 // src/utils/isPlainObject.ts
 var isPlainObject = (val) => Object.prototype.toString.call(val) === "[object Object]";
 
+// src/utils/normalizeRoutePath.ts
+var FAKE_HOST = "http://.";
+var normalizeRoutePath = (path, current) => {
+  if (!path.startsWith("/") && current) {
+    const loc = current.slice(0, current.lastIndexOf("/"));
+    const { pathname: pathname2, search, hash } = new URL(`${loc}/${path}`, FAKE_HOST);
+    return inferRoutePath(pathname2) + search + hash;
+  }
+  const [pathname, ...queryAndHash] = path.split(/(\?|#)/);
+  return inferRoutePath(pathname) + queryAndHash.join("");
+};
+
 // src/utils/omit.ts
 var omit = (obj, ...keys) => {
   const result = { ...obj };
@@ -104,21 +132,26 @@ var resolveLocalePath = (locales, routePath) => {
 
 // src/utils/resolveRoutePathFromUrl.ts
 var resolveRoutePathFromUrl = (url, base = "/") => {
-  const pathname = url.replace(/^(https?:)?\/\/[^/]*/, "");
+  const pathname = url.replace(/^(?:https?:)?\/\/[^/]*/, "");
   return pathname.startsWith(base) ? `/${pathname.slice(base.length)}` : pathname;
 };
+
+// src/utils/typeGuards.ts
+var isFunction = (val) => typeof val === "function";
+var isString = (val) => typeof val === "string";
 export {
   dedupeHead,
   ensureEndingSlash,
   ensureLeadingSlash,
   formatDateString,
-  isArray,
+  inferRoutePath,
   isFunction,
   isLinkExternal,
   isLinkHttp,
   isLinkWithProtocol,
   isPlainObject,
   isString,
+  normalizeRoutePath,
   omit,
   removeEndingSlash,
   removeLeadingSlash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/shared",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.10",
   "description": "Utils that shared between VuePress node and client",
   "keywords": [
     "vuepress",
@@ -9,11 +9,11 @@
   ],
   "homepage": "https://github.com/vuepress",
   "bugs": {
-    "url": "https://github.com/vuepress/vuepress-next/issues"
+    "url": "https://github.com/vuepress/core/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vuepress/vuepress-next.git"
+    "url": "git+https://github.com/vuepress/core.git"
   },
   "license": "MIT",
   "author": "meteorlxy",
@@ -29,8 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "@mdit-vue/types": "^1.0.0",
-    "@vue/shared": "^3.3.8"
+    "@mdit-vue/types": "^2.1.0"
   },
   "publishConfig": {
     "access": "public"
@@ -47,7 +46,7 @@
     "outDir": "./dist",
     "sourcemap": false,
     "target": "es2022",
-    "tsconfig": "../tsconfig.dts.json"
+    "tsconfig": "../../tsconfig.dts.json"
   },
   "scripts": {
     "build": "tsup",