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

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
@@ -254,7 +253,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 +262,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, isFunction, isLinkExternal, isLinkHttp, isLinkWithProtocol, isPlainObject, isString, 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);
     }
@@ -107,12 +114,15 @@ var resolveRoutePathFromUrl = (url, base = "/") => {
   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,
   isFunction,
   isLinkExternal,
   isLinkHttp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/shared",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0-rc.2",
   "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.0.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",