Merge branch 'main' into main

vuepress · Jan 24, 2024 · 7b976cc · 7b976cc
2 parents 0d757a5 + 53006c4
commit 7b976cc
Show file tree

Hide file tree

Showing 14 changed files with 813 additions and 787 deletions.
diff --git a/e2e/package.json b/e2e/package.json
@@ -18,14 +18,14 @@
   "dependencies": {
     "@vuepress/bundler-vite": "workspace:*",
     "@vuepress/bundler-webpack": "workspace:*",
-    "sass": "^1.69.5",
-    "sass-loader": "^13.3.3",
-    "vue": "^3.4.0",
+    "sass": "^1.70.0",
+    "sass-loader": "^14.0.0",
+    "vue": "^3.4.15",
     "vuepress": "workspace:*"
   },
   "devDependencies": {
     "anywhere": "^1.6.0",
-    "cypress": "^13.6.2",
+    "cypress": "^13.6.3",
     "process": "^0.11.10",
     "start-server-and-test": "^2.0.3"
   }

diff --git a/package.json b/package.json
@@ -25,30 +25,30 @@
   },
   "prettier": "prettier-config-vuepress",
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@types/node": "^20.10.5",
+    "@commitlint/cli": "^18.5.0",
+    "@commitlint/config-conventional": "^18.5.0",
+    "@types/node": "^20.11.6",
     "@types/webpack-env": "^1.18.4",
-    "@vitest/coverage-istanbul": "^1.1.0",
-    "bumpp": "^9.2.1",
+    "@vitest/coverage-istanbul": "^1.2.1",
+    "bumpp": "^9.3.0",
     "conventional-changelog-cli": "^4.1.0",
     "eslint": "^8.56.0",
     "eslint-config-vuepress": "^4.10.0",
     "eslint-config-vuepress-typescript": "^4.10.0",
     "eslint-plugin-cypress": "^2.15.1",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.4",
     "prettier-config-vuepress": "^4.4.0",
     "rimraf": "^5.0.5",
     "sort-package-json": "^2.6.0",
     "tsconfig-vuepress": "^4.5.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vite": "~5.0.10",
-    "vitest": "^1.1.0"
+    "vite": "~5.0.12",
+    "vitest": "^1.2.1"
   },
-  "packageManager": "pnpm@8.13.1",
+  "packageManager": "pnpm@8.14.3",
   "engines": {
     "node": ">=18.16.0"
   }

diff --git a/packages/bundler-vite/package.json b/packages/bundler-vite/package.json
@@ -33,18 +33,18 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@vitejs/plugin-vue": "^5.0.0",
+    "@vitejs/plugin-vue": "^5.0.3",
     "@vuepress/client": "workspace:*",
     "@vuepress/core": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "autoprefixer": "^10.4.16",
+    "autoprefixer": "^10.4.17",
     "connect-history-api-fallback": "^2.0.0",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.33",
     "postcss-load-config": "^5.0.2",
-    "rollup": "^4.9.1",
-    "vite": "~5.0.10",
-    "vue": "^3.4.0",
+    "rollup": "^4.9.6",
+    "vite": "~5.0.12",
+    "vue": "^3.4.15",
     "vue-router": "^4.2.5"
   },
   "publishConfig": {

diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
@@ -42,20 +42,20 @@
     "@vuepress/core": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "autoprefixer": "^10.4.16",
+    "autoprefixer": "^10.4.17",
     "chokidar": "^3.5.3",
-    "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.8.1",
-    "esbuild-loader": "~4.0.2",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^6.9.1",
+    "esbuild-loader": "~4.0.3",
     "express": "^4.18.2",
     "html-webpack-plugin": "^5.6.0",
-    "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.32",
+    "mini-css-extract-plugin": "^2.7.7",
+    "postcss": "^8.4.33",
     "postcss-csso": "^6.0.1",
-    "postcss-loader": "^7.3.3",
-    "style-loader": "^3.3.3",
-    "vue": "^3.4.0",
-    "vue-loader": "^17.4.0",
+    "postcss-loader": "^8.0.0",
+    "style-loader": "^3.3.4",
+    "vue": "^3.4.15",
+    "vue-loader": "^17.4.2",
     "vue-router": "^4.2.5",
     "webpack": "^5.89.0",
     "webpack-chain": "^6.5.1",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -42,7 +42,7 @@
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "envinfo": "^7.11.0",
-    "esbuild": "~0.19.10"
+    "esbuild": "~0.19.12"
   },
   "devDependencies": {
     "@types/envinfo": "^7.8.3"

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -39,8 +39,8 @@
   "dependencies": {
     "@vue/devtools-api": "^6.5.1",
     "@vuepress/shared": "workspace:*",
-    "@vueuse/core": "^10.7.0",
-    "vue": "^3.4.0",
+    "@vueuse/core": "^10.7.2",
+    "vue": "^3.4.15",
     "vue-router": "^4.2.5"
   },
   "publishConfig": {

diff --git a/packages/client/src/resolvers.ts b/packages/client/src/resolvers.ts
@@ -1,9 +1,4 @@
-import {
-  dedupeHead,
-  isArray,
-  isString,
-  resolveLocalePath,
-} from '@vuepress/shared'
+import { dedupeHead, isString, resolveLocalePath } from '@vuepress/shared'
 import type { Component } from 'vue'
 import { reactive } from 'vue'
 import type {
@@ -67,7 +62,7 @@ export const resolvers = reactive({
       ? frontmatter.description
       : siteLocale.description
     const head: PageHead = [
-      ...(isArray(frontmatter.head) ? frontmatter.head : []),
+      ...(Array.isArray(frontmatter.head) ? frontmatter.head : []),
       ...siteLocale.head,
       ['title', {}, headTitle],
       ['meta', { name: 'description', content: description }],

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -35,7 +35,7 @@
     "@vuepress/markdown": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "vue": "^3.4.0"
+    "vue": "^3.4.15"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -33,8 +33,7 @@
     "clean": "rimraf dist"
   },
   "dependencies": {
-    "@mdit-vue/types": "^2.0.0",
-    "@vue/shared": "^3.4.0"
+    "@mdit-vue/types": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line vue/prefer-import-from-vue
-export { isArray, isFunction, isString } from '@vue/shared'
-
 export * from './dedupeHead.js'
 export * from './ensureLeadingSlash.js'
 export * from './ensureEndingSlash.js'
@@ -15,3 +12,4 @@ export * from './removeLeadingSlash.js'
 export * from './resolveHeadIdentifier.js'
 export * from './resolveLocalePath.js'
 export * from './resolveRoutePathFromUrl.js'
+export * from './typeGuards.js'
diff --git a/packages/shared/src/utils/typeGuards.ts b/packages/shared/src/utils/typeGuards.ts
@@ -0,0 +1,11 @@
+/**
+ * Check if a value is a function
+ */
+// eslint-disable-next-line @typescript-eslint/ban-types
+export const isFunction = (val: unknown): val is Function =>
+  typeof val === 'function'
+
+/**
+ * Check if a value is a string
+ */
+export const isString = (val: unknown): val is string => typeof val === 'string'
diff --git a/packages/vuepress/package.json b/packages/vuepress/package.json
@@ -55,7 +55,7 @@
     "@vuepress/markdown": "workspace:*",
     "@vuepress/shared": "workspace:*",
     "@vuepress/utils": "workspace:*",
-    "vue": "^3.4.0"
+    "vue": "^3.4.15"
   },
   "peerDependencies": {
     "@vuepress/bundler-vite": "workspace:*",