chore: bump deps, fix dts generation (#3856)

package.json

@@ -104,19 +104,20 @@
   "dependencies": {
     "@docsearch/css": "^3.6.0",
     "@docsearch/js": "^3.6.0",
-    "@shikijs/core": "^1.3.0",
-    "@shikijs/transformers": "^1.3.0",
-    "@types/markdown-it": "^14.0.1",
+    "@shikijs/core": "^1.4.0",
+    "@shikijs/transformers": "^1.4.0",
+    "@types/markdown-it": "^14.1.1",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/devtools-api": "^7.0.27",
+    "@vue/shared": "^3.4.26",
     "@vueuse/core": "^10.9.0",
     "@vueuse/integrations": "^10.9.0",
     "focus-trap": "^7.5.4",
     "mark.js": "8.11.1",
     "minisearch": "^6.3.0",
-    "shiki": "^1.3.0",
-    "vite": "^5.2.10",
-    "vue": "^3.4.25"
+    "shiki": "^1.4.0",
+    "vite": "^5.2.11",
+    "vue": "^3.4.26"
   },
   "devDependencies": {
     "@clack/prompts": "^0.7.0",
@@ -141,13 +142,12 @@
     "@types/mark.js": "^8.11.12",
     "@types/markdown-it-attrs": "^4.1.3",
     "@types/markdown-it-container": "^2.0.10",
-    "@types/markdown-it-emoji": "^2.0.5",
+    "@types/markdown-it-emoji": "^3.0.1",
     "@types/micromatch": "^4.0.7",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.12.8",
     "@types/postcss-prefix-selector": "^1.16.3",
     "@types/prompts": "^2.4.9",
-    "@vue/shared": "^3.4.25",
     "chokidar": "^3.6.0",
     "conventional-changelog-cli": "^4.1.0",
     "cross-spawn": "^7.0.3",
@@ -161,7 +161,7 @@
     "gray-matter": "^4.0.3",
     "lint-staged": "^15.2.2",
     "lodash.template": "^4.5.0",
-    "lru-cache": "^10.2.1",
+    "lru-cache": "^10.2.2",
     "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^8.6.7",
     "markdown-it-attrs": "^4.1.6",
@@ -184,7 +184,7 @@
     "prompts": "^2.4.2",
     "punycode": "^2.3.1",
     "rimraf": "^5.0.5",
-    "rollup": "^4.17.0",
+    "rollup": "^4.17.2",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-esbuild": "^6.1.1",
     "semver": "^7.6.0",
@@ -194,8 +194,8 @@
     "sort-package-json": "^2.10.0",
     "supports-color": "^9.4.0",
     "typescript": "^5.4.5",
-    "vitest": "^1.5.2",
-    "vue-tsc": "^2.0.14",
+    "vitest": "^1.5.3",
+    "vue-tsc": "2.0.14",
     "wait-on": "^7.2.0"
   },
   "peerDependencies": {
@@ -223,8 +223,8 @@
       "ora>string-width": "^5"
     },
     "patchedDependencies": {
-      "@types/markdown-it@14.0.1": "patches/@types__markdown-it@14.0.1.patch",
-      "markdown-it-anchor@8.6.7": "patches/markdown-it-anchor@8.6.7.patch"
+      "markdown-it-anchor@8.6.7": "patches/markdown-it-anchor@8.6.7.patch",
+      "rollup-plugin-dts@6.1.0": "patches/rollup-plugin-dts@6.1.0.patch"
     }
   }
 }

patches/@types__markdown-it@14.0.1.patch

@@ -1,13 +0,0 @@
-diff --git a/package.json b/package.json
-index 3b3cdfc4427a1a64fdd3b37604a7174e4646e423..afaea16b115554fcf15a905642562e881ece7ca6 100644
---- a/package.json
-+++ b/package.json
-@@ -27,7 +27,7 @@
-         }
-     ],
-     "main": "",
--    "types": "index.d.ts",
-+    "types": "index.d.mts",
-     "exports": {
-         ".": {
-             "import": "./index.d.mts",

patches/rollup-plugin-dts@6.1.0.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/rollup-plugin-dts.mjs b/dist/rollup-plugin-dts.mjs
+index 4a9412285c48c37d03340a086c771f8e61fd82ac..c73cba3bf47550f69011366e37d2ae974f0c9fc0 100644
+--- a/dist/rollup-plugin-dts.mjs
++++ b/dist/rollup-plugin-dts.mjs
+@@ -675,6 +675,8 @@ function preProcess({ sourceFile }) {
+             const nextToken = children[idx + 1];
+             const isPunctuation = nextToken.kind >= ts.SyntaxKind.FirstPunctuation && nextToken.kind <= ts.SyntaxKind.LastPunctuation;
+             if (isPunctuation) {
++                const addSpace = code.slice(token.getEnd(), nextToken.getStart()) != " ";
++                code.appendLeft(nextToken.getStart(), `${addSpace ? " " : ""}${defaultExport}`);
+                 code.appendLeft(nextToken.getStart(), defaultExport);
+             }
+             else {

rollup.config.ts

@@ -11,15 +11,15 @@ import replace from '@rollup/plugin-replace'
 import alias from '@rollup/plugin-alias'
 import dts from 'rollup-plugin-dts'
 
+const ROOT = fileURLToPath(import.meta.url)
+const r = (p: string) => resolve(ROOT, '..', p)
+
 const require = createRequire(import.meta.url)
-const pkg = require('./package.json')
+const pkg = require(r('package.json'))
 
 const DEV = !!process.env.DEV
 const PROD = !DEV
 
-const ROOT = fileURLToPath(import.meta.url)
-const r = (p: string) => resolve(ROOT, '..', p)
-
 const external = [
   ...Object.keys(pkg.dependencies),
   ...Object.keys(pkg.peerDependencies),
@@ -29,11 +29,7 @@ const external = [
 ]
 
 const plugins = [
-  alias({
-    entries: {
-      'readable-stream': 'stream'
-    }
-  }),
+  alias({ entries: { 'readable-stream': 'stream' } }),
   replace({
     // polyfill broken browser check from bundled deps
     'navigator.userAgentData': 'undefined',
@@ -69,21 +65,34 @@ const typesExternal = [
   'fast-glob'
 ]
 
+const dtsNode = dts({
+  respectExternal: true,
+  tsconfig: r('src/node/tsconfig.json')
+})
+
+const originalResolveId = dtsNode.resolveId
+
+dtsNode.resolveId = async function (source, importer) {
+  const res = await (originalResolveId as Function).call(this, source, importer)
+  if (res?.id) res.id = await fs.realpath(res.id)
+  return res
+}
+
 const nodeTypes: RollupOptions = {
   input: r('src/node/index.ts'),
   output: {
     format: 'esm',
-    file: 'dist/node/index.d.ts'
+    file: r('dist/node/index.d.ts')
   },
   external: typesExternal,
-  plugins: [dts({ respectExternal: true })]
+  plugins: [dtsNode]
 }
 
 const clientTypes: RollupOptions = {
   input: r('dist/client-types/index.d.ts'),
   output: {
     format: 'esm',
-    file: 'dist/client/index.d.ts'
+    file: r('dist/client/index.d.ts')
   },
   external: typesExternal,
   plugins: [
@@ -99,10 +108,4 @@ const clientTypes: RollupOptions = {
   ]
 }
 
-const config = defineConfig([])
-
-config.push(esmBuild)
-config.push(nodeTypes)
-config.push(clientTypes)
-
-export default config
+export default defineConfig([esmBuild, nodeTypes, clientTypes])

src/client/tsconfig.json

@@ -3,11 +3,8 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "../../dist/client",
-    "moduleResolution": "bundler",
     "declaration": true,
     "declarationDir": "../../dist/client-types",
-    "jsx": "preserve",
-    "lib": ["esnext", "dom", "dom.iterable"],
     "types": ["vite/client"],
     "paths": {
       "vitepress": ["index.ts"],

src/node/markdown/markdown.ts

@@ -18,7 +18,6 @@ import type { Options } from 'markdown-it'
 import MarkdownIt from 'markdown-it'
 import anchorPlugin from 'markdown-it-anchor'
 import attrsPlugin from 'markdown-it-attrs'
-// @ts-expect-error: types of markdown-it-emoji are not up-to-date
 import { full as emojiPlugin } from 'markdown-it-emoji'
 import type {
   BuiltinTheme,

src/node/tsconfig.json

@@ -1,10 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "target": "es2022",
     "baseUrl": ".",
     "outDir": "../../dist/node",
-    "module": "esnext",
     "types": ["node"],
     "sourceMap": true
   },

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "module": "esnext",
     "target": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,