From 5abdcdfea433f7986e93cd6e766ce1cc445e9dff Mon Sep 17 00:00:00 2001 From: meteorlxy Date: Fri, 8 Dec 2023 16:57:41 +0800 Subject: [PATCH] feat(markdown): bump to markdown-it 14 BREAKING CHANGE: bump to markdown-it 14 --- packages/markdown/package.json | 20 +-- packages/markdown/src/plugins/emojiPlugin.ts | 5 +- .../src/plugins/markdown-it-emoji.d.ts | 12 ++ packages/shared/package.json | 2 +- pnpm-lock.yaml | 154 +++++++++--------- 5 files changed, 104 insertions(+), 89 deletions(-) create mode 100644 packages/markdown/src/plugins/markdown-it-emoji.d.ts diff --git a/packages/markdown/package.json b/packages/markdown/package.json index 51671da869..6c40ea1319 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -31,21 +31,21 @@ "clean": "rimraf dist" }, "dependencies": { - "@mdit-vue/plugin-component": "^1.0.0", - "@mdit-vue/plugin-frontmatter": "^1.0.0", - "@mdit-vue/plugin-headers": "^1.0.0", - "@mdit-vue/plugin-sfc": "^1.0.0", - "@mdit-vue/plugin-title": "^1.0.0", - "@mdit-vue/plugin-toc": "^1.0.0", - "@mdit-vue/shared": "^1.0.0", - "@mdit-vue/types": "^1.0.0", + "@mdit-vue/plugin-component": "^2.0.0", + "@mdit-vue/plugin-frontmatter": "^2.0.0", + "@mdit-vue/plugin-headers": "^2.0.0", + "@mdit-vue/plugin-sfc": "^2.0.0", + "@mdit-vue/plugin-title": "^2.0.0", + "@mdit-vue/plugin-toc": "^2.0.0", + "@mdit-vue/shared": "^2.0.0", + "@mdit-vue/types": "^2.0.0", "@types/markdown-it": "^13.0.7", "@types/markdown-it-emoji": "^2.0.4", "@vuepress/shared": "workspace:*", "@vuepress/utils": "workspace:*", - "markdown-it": "^13.0.2", + "markdown-it": "^14.0.0", "markdown-it-anchor": "^8.6.7", - "markdown-it-emoji": "^2.0.2", + "markdown-it-emoji": "^3.0.0", "mdurl": "^2.0.0" }, "devDependencies": { diff --git a/packages/markdown/src/plugins/emojiPlugin.ts b/packages/markdown/src/plugins/emojiPlugin.ts index cdc99fcbf3..5defb59291 100644 --- a/packages/markdown/src/plugins/emojiPlugin.ts +++ b/packages/markdown/src/plugins/emojiPlugin.ts @@ -1,4 +1,5 @@ -import emojiPlugin from 'markdown-it-emoji' +import { full as emojiPlugin } from 'markdown-it-emoji' +import type { Options } from 'markdown-it-emoji' -export type EmojiPluginOptions = emojiPlugin.Options +export type EmojiPluginOptions = Options export { emojiPlugin } diff --git a/packages/markdown/src/plugins/markdown-it-emoji.d.ts b/packages/markdown/src/plugins/markdown-it-emoji.d.ts new file mode 100644 index 0000000000..c34a3a154d --- /dev/null +++ b/packages/markdown/src/plugins/markdown-it-emoji.d.ts @@ -0,0 +1,12 @@ +// TODO: markdown-it-emoji v3 is not typed correctly for now +declare module 'markdown-it-emoji' { + import type emojiPlugin from '@types/markdown-it-emoji' + + const bare: typeof emojiPlugin + const light: typeof emojiPlugin + const full: typeof emojiPlugin + type Options = emojiPlugin.Options + + export { bare, light, full } + export type { Options } +} diff --git a/packages/shared/package.json b/packages/shared/package.json index f462493b58..468d49c8c7 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -33,7 +33,7 @@ "clean": "rimraf dist" }, "dependencies": { - "@mdit-vue/types": "^1.0.0", + "@mdit-vue/types": "^2.0.0", "@vue/shared": "^3.3.11" }, "publishConfig": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 28f12e7c18..4f8449d511 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -259,29 +259,29 @@ importers: packages/markdown: dependencies: '@mdit-vue/plugin-component': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/plugin-frontmatter': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/plugin-headers': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/plugin-sfc': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/plugin-title': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/plugin-toc': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/shared': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@mdit-vue/types': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@types/markdown-it': specifier: ^13.0.7 version: 13.0.7 @@ -295,14 +295,14 @@ importers: specifier: workspace:* version: link:../utils markdown-it: - specifier: ^13.0.2 - version: 13.0.2 + specifier: ^14.0.0 + version: 14.0.0 markdown-it-anchor: specifier: ^8.6.7 - version: 8.6.7(@types/markdown-it@13.0.7)(markdown-it@13.0.2) + version: 8.6.7(@types/markdown-it@13.0.7)(markdown-it@14.0.0) markdown-it-emoji: - specifier: ^2.0.2 - version: 2.0.2 + specifier: ^3.0.0 + version: 3.0.0 mdurl: specifier: ^2.0.0 version: 2.0.0 @@ -314,8 +314,8 @@ importers: packages/shared: dependencies: '@mdit-vue/types': - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^2.0.0 + version: 2.0.0 '@vue/shared': specifier: ^3.3.11 version: 3.3.11 @@ -1071,67 +1071,67 @@ packages: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: false - /@mdit-vue/plugin-component@1.0.0: - resolution: {integrity: sha512-ZXsJwxkG5yyTHARIYbR74cT4AZ0SfMokFFjiHYCbypHIeYWgJhso4+CZ8+3V9EWFG3EHlGoKNGqKp9chHnqntQ==} + /@mdit-vue/plugin-component@2.0.0: + resolution: {integrity: sha512-cTRxlocav/+mfgDcp0P2z/gWuWBez+iNuN4D+b74LpX4AR6UAx2ZvWtCrUZ8VXrO4eCt1/G0YC/Af7mpIb3aoQ==} dependencies: '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/plugin-frontmatter@1.0.0: - resolution: {integrity: sha512-MMA7Ny+YPZA7eDOY1t4E+rKuEWO39mzDdP/M68fKdXJU6VfcGkPr7gnpnJfW2QBJ5qIvMrK/3lDAA2JBy5TfpA==} + /@mdit-vue/plugin-frontmatter@2.0.0: + resolution: {integrity: sha512-/LrT6E60QI4XV4mqx3J87hqYXlR7ZyMvndmftR2RGz7cRAwa/xL+kyFLlgrMxkBIKitOShKa3LS/9Ov9b0fU+g==} dependencies: - '@mdit-vue/types': 1.0.0 + '@mdit-vue/types': 2.0.0 '@types/markdown-it': 13.0.7 gray-matter: 4.0.3 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/plugin-headers@1.0.0: - resolution: {integrity: sha512-0rK/iKy6x13d/Pp5XxdLBshTD0+YjZvtHIaIV+JO+/H2WnOv7oaRgs48G5d44z3XJVUE2u6fNnTlI169fef0/A==} + /@mdit-vue/plugin-headers@2.0.0: + resolution: {integrity: sha512-ITMMPCnLEYHHgj3XEUL2l75jsNn8guxNqr26YrMSi1f5zcgq4XVy1LIvfwvJ1puqM6Cc5v4BHk3oAyorAi7l1A==} dependencies: - '@mdit-vue/shared': 1.0.0 - '@mdit-vue/types': 1.0.0 + '@mdit-vue/shared': 2.0.0 + '@mdit-vue/types': 2.0.0 '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/plugin-sfc@1.0.0: - resolution: {integrity: sha512-agMUe0fY4YHxsZivSvplBwRwrFvsIf/JNUJCAYq1+2Sg9+2hviTBZwjZDxYqHDHOVLtiNr+wuo68tE24mAx3AQ==} + /@mdit-vue/plugin-sfc@2.0.0: + resolution: {integrity: sha512-OXrMXOyk0iwdIou2jRoIHIbjskwghkO14C9/OjgVHXSSX+iM/WQ4l4yi1aWmNlbQNjtP8IXcVAyJB9K0DFYmLg==} dependencies: - '@mdit-vue/types': 1.0.0 + '@mdit-vue/types': 2.0.0 '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/plugin-title@1.0.0: - resolution: {integrity: sha512-8yC60fCZ95xcJ/cvJH4Lv43Rs4k+33UGyKrRWj5J8TNyMwUyGcwur0XyPM+ffJH4/Bzq4myZLsj/TTFSkXRxvw==} + /@mdit-vue/plugin-title@2.0.0: + resolution: {integrity: sha512-eqBoETPVkMXNLvwFshz/A2+Cz81VB5HEkXDm0tt6RBW/rTvnoWmGJ1Z+mvcjR5ck5W4nYdIyT68oHxX2JI2M4g==} dependencies: - '@mdit-vue/shared': 1.0.0 - '@mdit-vue/types': 1.0.0 + '@mdit-vue/shared': 2.0.0 + '@mdit-vue/types': 2.0.0 '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/plugin-toc@1.0.0: - resolution: {integrity: sha512-WN8blfX0X/5Nolic0ClDWP7eVo9IB+U4g0jbycX3lolIZX5Bai1UpsD3QYZr5VVsPbQJMKMGvTrCEtCNTGvyWQ==} + /@mdit-vue/plugin-toc@2.0.0: + resolution: {integrity: sha512-PKQ8sZna3D5chTnt2lxL+ddpyXd++6Nyc0l8VXCeDgStlySQwiP9jaLeeC88oqY4BtRu4cAmILmxDrvuX0Rrdg==} dependencies: - '@mdit-vue/shared': 1.0.0 - '@mdit-vue/types': 1.0.0 + '@mdit-vue/shared': 2.0.0 + '@mdit-vue/types': 2.0.0 '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/shared@1.0.0: - resolution: {integrity: sha512-nbYBfmEi+pR2Lm0Z6TMVX2/iBjfr/kGEsHW8CC0rQw+3+sG5dY6VG094HuFAkiAmmvZx9DZZb+7ZMWp9vkwCRw==} + /@mdit-vue/shared@2.0.0: + resolution: {integrity: sha512-PdxpQpbyTazeo2JT87qms6RPZIzyJd+gwuB+1jSwLDI7+0u5g79y2XgTAbZromSVgY2f3UU5HWdwaLbV9w4uOw==} dependencies: - '@mdit-vue/types': 1.0.0 + '@mdit-vue/types': 2.0.0 '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /@mdit-vue/types@1.0.0: - resolution: {integrity: sha512-xeF5+sHLzRNF7plbksywKCph4qli20l72of2fMlZQQ7RECvXYrRkE9+bjRFQCyULC7B8ydUYbpbkux5xJlVWyw==} + /@mdit-vue/types@2.0.0: + resolution: {integrity: sha512-1BeEB+DbtmDMUAfvbNUj5Hso8cSl2sBVK2iTyOMAqhfDVLdh+/9+D0JmQHaCeUk/vuJoMhOwbweZvh55wHxm4w==} dev: false /@nodelib/fs.scandir@2.1.5: @@ -3098,8 +3098,8 @@ packages: resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} dev: false - /entities@3.0.1: - resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==} + /entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} dev: false @@ -4802,10 +4802,10 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true - /linkify-it@4.0.1: - resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==} + /linkify-it@5.0.0: + resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} dependencies: - uc.micro: 1.0.6 + uc.micro: 2.0.0 dev: false /lint-staged@15.2.0: @@ -5013,39 +5013,36 @@ packages: engines: {node: '>=8'} dev: true - /markdown-it-anchor@8.6.7(@types/markdown-it@13.0.7)(markdown-it@13.0.2): + /markdown-it-anchor@8.6.7(@types/markdown-it@13.0.7)(markdown-it@14.0.0): resolution: {integrity: sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==} peerDependencies: '@types/markdown-it': '*' markdown-it: '*' dependencies: '@types/markdown-it': 13.0.7 - markdown-it: 13.0.2 + markdown-it: 14.0.0 dev: false - /markdown-it-emoji@2.0.2: - resolution: {integrity: sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==} + /markdown-it-emoji@3.0.0: + resolution: {integrity: sha512-+rUD93bXHubA4arpEZO3q80so0qgoFJEKRkRbjKX8RTdca89v2kfyF+xR3i2sQTwql9tpPZPOQN5B+PunspXRg==} dev: false - /markdown-it@13.0.2: - resolution: {integrity: sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==} + /markdown-it@14.0.0: + resolution: {integrity: sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==} hasBin: true dependencies: argparse: 2.0.1 - entities: 3.0.1 - linkify-it: 4.0.1 - mdurl: 1.0.1 - uc.micro: 1.0.6 + entities: 4.5.0 + linkify-it: 5.0.0 + mdurl: 2.0.0 + punycode.js: 2.3.1 + uc.micro: 2.0.0 dev: false /mdn-data@2.0.28: resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} dev: false - /mdurl@1.0.1: - resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} - dev: false - /mdurl@2.0.0: resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} dev: false @@ -5828,6 +5825,11 @@ packages: ipaddr.js: 1.9.1 dev: false + /punycode.js@2.3.1: + resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} + engines: {node: '>=6'} + dev: false + /punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -6966,8 +6968,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - /uc.micro@1.0.6: - resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} + /uc.micro@2.0.0: + resolution: {integrity: sha512-DffL94LsNOccVn4hyfRe5rdKa273swqeA5DJpMOeFmEn1wCDc7nAbbB0gXlgBCL7TNzeTv6G7XVWzan7iJtfig==} dev: false /ufo@1.3.2: