feat: update deps

antfu · antfu · commit 67b155b1bd32 · 2024-05-14T13:37:17.000+02:00
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
@@ -103,7 +103,7 @@ export default withMermaid(defineConfig({
       {
         name: 'shiki:inline-decorations',
         preprocess(code, options) {
-          const reg = /^\/\/ @decorations:(.*?)\n/
+          const reg = /^\/\/ @decorations:(.*)\n/
           code = code.replace(reg, (match, decorations) => {
             options.decorations ||= []
             options.decorations.push(...JSON.parse(decorations))
@@ -117,13 +117,13 @@ export default withMermaid(defineConfig({
         processHoverInfo(info) {
           return defaultHoverInfoProcessor(info)
             // Remove shiki_core namespace
-            .replace(/_shikijs_core[\w_]*\./g, '')
+            .replace(/_shikijs_core\w*\./g, '')
         },
       }),
       {
         name: 'shiki:remove-escape',
         postprocess(code) {
-          return code.replace(/\[\\\!code/g, '[!code')
+          return code.replace(/\[\\!code/g, '[!code')
         },
       },
     ],
diff --git a/docs/.vitepress/store/playground.ts b/docs/.vitepress/store/playground.ts
@@ -81,7 +81,7 @@ export const usePlayground = defineStore('playground', () => {
         if ((o[0] || !input.value) && n[0] !== o[0]) {
           const sample = await fetchSample(lang.value)
           if (sample)
-            input.value = sample.trim().replace(/\n.*?from.*?$/i, '').trim()
+            input.value = sample.trim().replace(/\n.*?from.*$/i, '').trim()
         }
         run()
       }, { immediate: true })
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "type": "module",
   "version": "1.5.1",
   "private": true,
-  "packageManager": "pnpm@9.1.0",
+  "packageManager": "pnpm@9.1.1",
   "scripts": {
     "lint": "eslint . --cache",
     "release": "bumpp && pnpm -r publish",
@@ -14,7 +14,7 @@
     "prepare": "simple-git-hooks"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.17.0",
+    "@antfu/eslint-config": "^2.18.0",
     "@antfu/ni": "^0.21.12",
     "@antfu/utils": "^0.7.8",
     "@rollup/plugin-alias": "^5.1.0",
@@ -30,7 +30,7 @@
     "@shikijs/vitepress-twoslash": "workspace:*",
     "@types/fs-extra": "^11.0.4",
     "@types/hast": "^3.0.4",
-    "@types/node": "^20.12.11",
+    "@types/node": "^20.12.12",
     "@vitest/coverage-v8": "^1.6.0",
     "ansi-sequence-parser": "^1.1.1",
     "bumpp": "^9.4.1",
@@ -46,9 +46,9 @@
     "mdast-util-gfm": "^3.0.0",
     "mdast-util-to-hast": "^13.1.0",
     "ofetch": "^1.3.4",
-    "pnpm": "^9.1.0",
+    "pnpm": "^9.1.1",
     "prettier": "^3.2.5",
-    "rimraf": "^5.0.5",
+    "rimraf": "^5.0.7",
     "rollup": "^4.17.2",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.0",
@@ -63,8 +63,8 @@
     "vite-tsconfig-paths": "^4.3.2",
     "vitepress-plugin-mermaid": "^2.0.16",
     "vitest": "^1.6.0",
-    "vue-tsc": "^2.0.16",
-    "wrangler": "^3.53.1"
+    "vue-tsc": "^2.0.17",
+    "wrangler": "^3.55.0"
   },
   "resolutions": {
     "@shikijs/compat": "workspace:*",
@@ -75,7 +75,7 @@
     "@shikijs/twoslash": "workspace:*",
     "@shikijs/vitepress-twoslash": "workspace:*",
     "@types/hast": "^3.0.4",
-    "@types/mdast": "^4.0.3",
+    "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.2",
     "shiki": "workspace:*",
     "unified": "^11.0.4",
diff --git a/packages/core/rollup.config.mjs b/packages/core/rollup.config.mjs
@@ -54,7 +54,7 @@ export default defineConfig([
       dir: 'dist',
       format: 'esm',
       chunkFileNames: 'chunk-[name].d.mts',
-      entryFileNames: f => `${f.name.replace(/src[\\\/]/, '')}.d.mts`,
+      entryFileNames: f => `${f.name.replace(/src[\\/]/, '')}.d.mts`,
     },
     plugins: [
       dts({
diff --git a/packages/core/src/code-to-hast.ts b/packages/core/src/code-to-hast.ts
@@ -254,6 +254,7 @@ function splitWhitespaceTokens(tokens: ThemedToken[][]) {
     return line.flatMap((token) => {
       if (token.content.match(/^\s+$/))
         return token
+      // eslint-disable-next-line regexp/no-super-linear-backtracking
       const match = token.content.match(/^(\s*)(.*?)(\s*)$/)
       if (!match)
         return token
diff --git a/packages/rehype/test/index.test.ts b/packages/rehype/test/index.test.ts
@@ -20,7 +20,7 @@ it('run', async () => {
       parseMetaString: (str) => {
         return Object.fromEntries(str.split(' ').reduce((prev: [string, boolean | string][], curr: string) => {
           const [key, value] = curr.split('=')
-          const isNormalKey = /^[A-Za-z0-9]+$/.test(key)
+          const isNormalKey = /^[A-Z0-9]+$/i.test(key)
           if (isNormalKey)
             prev = [...prev, [key, value || true]]
           return prev
diff --git a/packages/shiki/package.json b/packages/shiki/package.json
@@ -103,8 +103,8 @@
     "@shikijs/core": "workspace:*"
   },
   "devDependencies": {
-    "tm-grammars": "^1.11.0",
-    "tm-themes": "^1.4.1",
+    "tm-grammars": "^1.11.3",
+    "tm-themes": "^1.4.3",
     "vscode-oniguruma": "^1.7.0"
   }
 }
diff --git a/packages/shiki/rollup.config.mjs b/packages/shiki/rollup.config.mjs
@@ -52,14 +52,14 @@ export default defineConfig([
       dir: 'dist',
       format: 'esm',
       entryFileNames: (f) => {
-        if (f.facadeModuleId?.match(/[\\\/]langs[\\\/]/))
+        if (f.facadeModuleId?.match(/[\\/]langs[\\/]/))
           return `langs/${f.name}.mjs`
         return '[name].mjs'
       },
       chunkFileNames: (f) => {
-        if (f.moduleIds.some(i => i.match(/[\\\/]langs[\\\/]/)))
+        if (f.moduleIds.some(i => i.match(/[\\/]langs[\\/]/)))
           return `langs/${f.name}.mjs`
-        else if (f.moduleIds.some(i => i.match(/[\\\/]themes[\\\/]/)))
+        else if (f.moduleIds.some(i => i.match(/[\\/]themes[\\/]/)))
           return 'themes/[name].mjs'
         return 'chunks/[name].mjs'
       },
@@ -75,7 +75,7 @@ export default defineConfig([
       dir: 'dist',
       format: 'esm',
       chunkFileNames: 'types/[name].d.mts',
-      entryFileNames: f => `${f.name.replace(/src[\\\/]/, '')}.d.mts`,
+      entryFileNames: f => `${f.name.replace(/src[\\/]/, '')}.d.mts`,
     },
     plugins: [
       dts({
diff --git a/packages/shiki/scripts/prepare/langs.ts b/packages/shiki/scripts/prepare/langs.ts
@@ -50,17 +50,17 @@ export async function prepareLangs() {
     await fs.writeFile(
       `./src/assets/langs/${lang.name}.js`,
       `${COMMENT_HEAD}
-${deps.map(i => `import ${i.replace(/[^\w]/g, '_')} from './${i}'`).join('\n')}
+${deps.map(i => `import ${i.replace(/\W/g, '_')} from './${i}'`).join('\n')}
 
 const lang = Object.freeze(${JSON.stringify(json)})
 
 export default [
 ${[
-  ...deps.map(i => `  ...${i.replace(/[^\w]/g, '_')}`),
+  ...deps.map(i => `  ...${i.replace(/\W/g, '_')}`),
   '  lang',
 ].join(',\n') || ''}
 ]
-`.replace(/\n\n+/g, '\n\n'),
+`.replace(/\n{2,}/g, '\n\n'),
       'utf-8',
     )
 
@@ -165,5 +165,5 @@ export const bundledLanguages = {
 }
 
 function isInvalidFilename(filename: string) {
-  return !filename.match(/^[a-zA-Z0-9_-]+$/)
+  return !filename.match(/^[\w-]+$/)
 }
diff --git a/packages/transformers/src/transformers/transformer-meta-highlight-word.ts b/packages/transformers/src/transformers/transformer-meta-highlight-word.ts
@@ -5,7 +5,7 @@ export function parseMetaHighlightWords(meta: string): string[] {
     return []
 
   // https://regex101.com/r/BHS5fd/1
-  const match = Array.from(meta.matchAll(/\/((?:\\.|[^\/])+?)\//ig))
+  const match = Array.from(meta.matchAll(/\/((?:\\.|[^/])+)\//g))
 
   return match
     // Escape backslashes
diff --git a/packages/transformers/src/transformers/transformer-meta-highlight.ts b/packages/transformers/src/transformers/transformer-meta-highlight.ts
@@ -3,7 +3,7 @@ import type { ShikiTransformer } from 'shiki'
 export function parseMetaHighlightString(meta: string) {
   if (!meta)
     return null
-  const match = meta.match(/{([\d,-]+)}/)
+  const match = meta.match(/\{([\d,-]+)\}/)
   if (!match)
     return null
   const lines = match[1].split(',')
diff --git a/packages/twoslash/package.json b/packages/twoslash/package.json
@@ -59,8 +59,8 @@
     "twoslash": "^0.2.6"
   },
   "devDependencies": {
-    "@iconify-json/carbon": "^1.1.32",
-    "@iconify-json/codicon": "^1.1.47",
+    "@iconify-json/carbon": "^1.1.33",
+    "@iconify-json/codicon": "^1.1.48",
     "@shikijs/twoslash": "^3.1.2",
     "hast-util-from-html": "^2.0.1",
     "typescript": "^5.4.5"
diff --git a/packages/twoslash/src/renderer-rich.ts b/packages/twoslash/src/renderer-rich.ts
@@ -633,20 +633,20 @@ export function rendererRich(options: RendererRichOptions = {}): TwoslashRendere
   }
 }
 
-const regexType = /^[A-Z][a-zA-Z0-9_]*(\<[^\>]*\>)?:/
-const regexFunction = /^[a-zA-Z0-9_]*\(/
+const regexType = /^[A-Z]\w*(<[^>]*>)?:/
+const regexFunction = /^\w*\(/
 
 /**
  * The default hover info processor, which will do some basic cleanup
  */
 export function defaultHoverInfoProcessor(type: string) {
   let content = type
     // remove leading `(property)` or `(method)` on each line
-    .replace(/^\(([\w-]+?)\)\s+/mg, '')
+    .replace(/^\(([\w-]+)\)\s+/gm, '')
     // remove import statement
     .replace(/\nimport .*$/, '')
     // remove interface or namespace lines with only the name
-    .replace(/^(interface|namespace) \w+$/mg, '')
+    .replace(/^(interface|namespace) \w+$/gm, '')
     .trim()
 
   // Add `type` or `function` keyword if needed
diff --git a/packages/twoslash/test/fixtures.test.ts b/packages/twoslash/test/fixtures.test.ts
@@ -13,7 +13,7 @@ describe('fixtures', () => {
       const ext = file.split('.').pop()!
 
       let theme = 'vitesse-dark'
-      code = code.replace(/\/\/\s+@theme:\s+(.*)\n/, (_, t) => {
+      code = code.replace(/\/\/\s+@theme:\s+(\S*)\n/, (_, t) => {
         theme = t
         return ''
       })
diff --git a/packages/vitepress-twoslash/src/index.ts b/packages/vitepress-twoslash/src/index.ts
@@ -73,7 +73,7 @@ export function transformerTwoslash(options: VitePressPluginTwoslashOptions = {}
     },
     postprocess(html) {
       if (this.meta.twoslash)
-        return html.replace(/{/g, '&#123;')
+        return html.replace(/\{/g, '&#123;')
     },
   }
 }
diff --git a/packages/vitepress-twoslash/src/renderer-floating-vue.ts b/packages/vitepress-twoslash/src/renderer-floating-vue.ts
@@ -152,7 +152,7 @@ function vPre<T extends ElementContent>(el: T): T {
 
 function renderMarkdown(this: ShikiTransformerContextCommon, md: string): ElementContent[] {
   const mdast = fromMarkdown(
-    md.replace(/{@link ([^}]*)}/g, '$1'), // replace jsdoc links
+    md.replace(/\{@link ([^}]*)\}/g, '$1'), // replace jsdoc links
     { mdastExtensions: [gfmFromMarkdown()] },
   )
 
diff --git a/packages/vitepress-twoslash/test/fixtures.test.ts b/packages/vitepress-twoslash/test/fixtures.test.ts
@@ -14,7 +14,7 @@ describe('fixtures', () => {
       const ext = file.split('.').pop()!
 
       let theme = 'vitesse-dark'
-      code = code.replace(/\/\/\s+@theme:\s+(.*)\n/, (_, t) => {
+      code = code.replace(/\/\/\s+@theme:\s+(\S*)\n/, (_, t) => {
         theme = t
         return ''
       })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export const usePlayground = defineStore('playground', () => {`
`81`	`81`	`if ((o[0] \|\| !input.value) && n[0] !== o[0]) {`
`82`	`82`	`const sample = await fetchSample(lang.value)`
`83`	`83`	`if (sample)`
`84`		`- input.value = sample.trim().replace(/\n.?from.?$/i, '').trim()`
	`84`	`+ input.value = sample.trim().replace(/\n.?from.$/i, '').trim()`
`85`	`85`	`}`
`86`	`86`	`run()`
`87`	`87`	`}, { immediate: true })`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@`
`103`	`103`	`"@shikijs/core": "workspace:*"`
`104`	`104`	`},`
`105`	`105`	`"devDependencies": {`
`106`		`- "tm-grammars": "^1.11.0",`
`107`		`- "tm-themes": "^1.4.1",`
	`106`	`+ "tm-grammars": "^1.11.3",`
	`107`	`+ "tm-themes": "^1.4.3",`
`108`	`108`	`"vscode-oniguruma": "^1.7.0"`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,17 +50,17 @@ export async function prepareLangs() {`
`50`	`50`	`await fs.writeFile(`
`51`	`51`	`./src/assets/langs/${lang.name}.js`,
`52`	`52`	`${COMMENT_HEAD}
`53`		-${deps.map(i => `import ${i.replace(/[^\w]/g, '_')} from './${i}'`).join('\n')}
	`53`	+${deps.map(i => `import ${i.replace(/\W/g, '_')} from './${i}'`).join('\n')}
`54`	`54`
`55`	`55`	`const lang = Object.freeze(${JSON.stringify(json)})`
`56`	`56`
`57`	`57`	`export default [`
`58`	`58`	`${[`
`59`		- ...deps.map(i => ` ...${i.replace(/[^\w]/g, '_')}`),
	`59`	+ ...deps.map(i => ` ...${i.replace(/\W/g, '_')}`),
`60`	`60`	`' lang',`
`61`	`61`	`].join(',\n') \|\| ''}`
`62`	`62`	`]`
`63`		-`.replace(/\n\n+/g, '\n\n'),
	`63`	+`.replace(/\n{2,}/g, '\n\n'),
`64`	`64`	`'utf-8',`
`65`	`65`	`)`
`66`	`66`
`@@ -165,5 +165,5 @@ export const bundledLanguages = {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`function isInvalidFilename(filename: string) {`
`168`		`- return !filename.match(/^[a-zA-Z0-9_-]+$/)`
	`168`	`+ return !filename.match(/^[\w-]+$/)`
`169`	`169`	`}`