diff --git a/package.json b/package.json index 1d6f25d14..5da81e4c8 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "mdurl": "^1.0.1", "micromark": "^4.0.0", "micromark-util-sanitize-uri": "^2.0.0", - "nuxt-mdc": "npm:nuxt-mdc-edge@latest", + "@nuxtjs/mdc": "^0.1.0", "ohash": "^1.1.3", "pathe": "^1.1.1", "scule": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 009a6fca4..6cbdb5f92 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ dependencies: '@nuxt/kit': specifier: ^3.6.5 version: 3.6.5(rollup@3.28.1) + '@nuxtjs/mdc': + specifier: ^0.1.0 + version: 0.1.0(rollup@3.28.1) '@vueuse/head': specifier: ^1.3.1 version: 1.3.1 @@ -38,9 +41,6 @@ dependencies: micromark-util-sanitize-uri: specifier: ^2.0.0 version: 2.0.0 - nuxt-mdc: - specifier: npm:nuxt-mdc-edge@latest - version: /nuxt-mdc-edge@0.0.2-28214512.e5770b3(rollup@3.28.1) ohash: specifier: ^1.1.3 version: 1.1.3 @@ -1486,6 +1486,43 @@ packages: - supports-color dev: true + /@nuxtjs/mdc@0.1.0(rollup@3.28.1): + resolution: {integrity: sha512-FY0aPlGWxCKsJU7KmtzndApH9z5+DON3BJpOEWTYayFZhCxIOxX0pdrd8CTuA2f7B/82iTKpHYVinRs2y10cYQ==} + dependencies: + '@nuxt/kit': 3.7.0(rollup@3.28.1) + '@types/hast': 3.0.0 + '@types/mdast': 4.0.0 + '@vue/compiler-core': 3.3.4 + consola: 3.2.3 + defu: 6.1.2 + destr: 2.0.1 + detab: 3.0.2 + github-slugger: 2.0.0 + hast-util-to-string: 2.0.0 + mdast-util-to-hast: 13.0.1 + micromark-util-sanitize-uri: 2.0.0 + property-information: 6.2.0 + rehype-external-links: 2.1.0 + rehype-raw: 6.1.1 + rehype-slug: 5.1.0 + rehype-sort-attribute-values: 4.0.0 + rehype-sort-attributes: 4.0.0 + remark-emoji: 4.0.0 + remark-gfm: 3.0.1 + remark-mdc: 1.2.0 + remark-parse: 10.0.2 + remark-rehype: 10.1.0 + scule: 1.0.0 + shiki-es: 0.14.0 + ufo: 1.3.0 + unified: 11.0.2 + unist-builder: 4.0.0 + unist-util-visit: 5.0.0 + transitivePeerDependencies: + - rollup + - supports-color + dev: false + /@octokit/auth-token@3.0.4: resolution: {integrity: sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==} engines: {node: '>= 14'} @@ -6365,6 +6402,25 @@ packages: - supports-color dev: false + /mdast-util-from-markdown@2.0.0: + resolution: {integrity: sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==} + dependencies: + '@types/mdast': 4.0.0 + '@types/unist': 3.0.0 + decode-named-character-reference: 1.0.2 + devlop: 1.1.0 + mdast-util-to-string: 4.0.0 + micromark: 4.0.0 + micromark-util-decode-numeric-character-reference: 2.0.0 + micromark-util-decode-string: 2.0.0 + micromark-util-normalize-identifier: 2.0.0 + micromark-util-symbol: 2.0.0 + micromark-util-types: 2.0.0 + unist-util-stringify-position: 4.0.0 + transitivePeerDependencies: + - supports-color + dev: false + /mdast-util-gfm-autolink-literal@1.0.3: resolution: {integrity: sha512-My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA==} dependencies: @@ -6428,6 +6484,13 @@ packages: unist-util-is: 5.2.1 dev: false + /mdast-util-phrasing@4.0.0: + resolution: {integrity: sha512-xadSsJayQIucJ9n053dfQwVu1kuXg7jCTdYsMK8rqzKZh52nLfSH/k0sAxE0u+pj/zKZX+o5wB+ML5mRayOxFA==} + dependencies: + '@types/mdast': 4.0.0 + unist-util-is: 6.0.0 + dev: false + /mdast-util-to-hast@12.3.0: resolution: {integrity: sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==} dependencies: @@ -6467,12 +6530,31 @@ packages: zwitch: 2.0.4 dev: false + /mdast-util-to-markdown@2.1.0: + resolution: {integrity: sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==} + dependencies: + '@types/mdast': 4.0.0 + '@types/unist': 3.0.0 + longest-streak: 3.1.0 + mdast-util-phrasing: 4.0.0 + mdast-util-to-string: 4.0.0 + micromark-util-decode-string: 2.0.0 + unist-util-visit: 5.0.0 + zwitch: 2.0.4 + dev: false + /mdast-util-to-string@3.2.0: resolution: {integrity: sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==} dependencies: '@types/mdast': 3.0.12 dev: false + /mdast-util-to-string@4.0.0: + resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} + dependencies: + '@types/mdast': 4.0.0 + dev: false + /mdn-data@2.0.28: resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} dev: true @@ -6774,6 +6856,15 @@ packages: micromark-util-symbol: 1.1.0 dev: false + /micromark-util-decode-string@2.0.0: + resolution: {integrity: sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==} + dependencies: + decode-named-character-reference: 1.0.2 + micromark-util-character: 2.0.1 + micromark-util-decode-numeric-character-reference: 2.0.0 + micromark-util-symbol: 2.0.0 + dev: false + /micromark-util-encode@1.1.0: resolution: {integrity: sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==} dev: false @@ -7379,43 +7470,6 @@ packages: - supports-color dev: true - /nuxt-mdc-edge@0.0.2-28214512.e5770b3(rollup@3.28.1): - resolution: {integrity: sha512-3jEo0INT+lkmEM8Wez6R80IH4UE1ahXzKrgT8s39ATy7m216yoneqPZBnL8eSVOxVNaZUEmwdnT7hIF/VCKKbw==} - dependencies: - '@nuxt/kit': 3.7.0(rollup@3.28.1) - '@types/hast': 3.0.0 - '@types/mdast': 4.0.0 - '@vue/compiler-core': 3.3.4 - consola: 3.2.3 - defu: 6.1.2 - destr: 2.0.1 - detab: 3.0.2 - github-slugger: 2.0.0 - hast-util-to-string: 2.0.0 - mdast-util-to-hast: 13.0.1 - micromark-util-sanitize-uri: 2.0.0 - property-information: 6.2.0 - rehype-external-links: 2.1.0 - rehype-raw: 6.1.1 - rehype-slug: 5.1.0 - rehype-sort-attribute-values: 4.0.0 - rehype-sort-attributes: 4.0.0 - remark-emoji: 4.0.0 - remark-gfm: 3.0.1 - remark-mdc: 1.1.3 - remark-parse: 10.0.2 - remark-rehype: 10.1.0 - scule: 1.0.0 - shiki-es: 0.14.0 - ufo: 1.3.0 - unified: 11.0.2 - unist-builder: 4.0.0 - unist-util-visit: 5.0.0 - transitivePeerDependencies: - - rollup - - supports-color - dev: false - /nuxt@3.6.5(@types/node@20.5.3)(eslint@8.47.0)(rollup@3.28.1)(typescript@5.1.6): resolution: {integrity: sha512-0A7V8B1HrIXX9IlqPc2w+5ZPXi+7MYa9QVhtuGYuLvjRKoSFANhCoMPRP6pKdoxigM1MBxhLue2VmHA/VbtJCw==} engines: {node: ^14.18.0 || >=16.10.0} @@ -8731,23 +8785,27 @@ packages: - supports-color dev: false - /remark-mdc@1.1.3: - resolution: {integrity: sha512-ilYSkkQJhu5cUCEE2CJEncoMDoarP32ugfJpFWghXbnv3sWI3j2HtJuArc9tZzxN4ID6fngio3d8N87QfQAnRQ==} + /remark-mdc@1.2.0: + resolution: {integrity: sha512-zK0GYvlhl9fw5gg1TYA2BmC06+wQaeQ0QewhJZI/6rocsP0Rfw3s2kbC5yeIyu9//kpBAwh6kJPFSDLiQbcFQQ==} dependencies: + '@types/mdast': 4.0.0 + '@types/unist': 3.0.0 flat: 5.0.2 js-yaml: 4.1.0 - mdast-util-from-markdown: 1.3.1 - mdast-util-to-markdown: 1.5.0 - micromark: 3.2.0 - micromark-core-commonmark: 1.1.0 - micromark-factory-space: 1.1.0 - micromark-factory-whitespace: 1.1.0 - micromark-util-character: 1.2.0 + mdast-util-from-markdown: 2.0.0 + mdast-util-to-markdown: 2.1.0 + micromark: 4.0.0 + micromark-core-commonmark: 2.0.0 + micromark-factory-space: 2.0.0 + micromark-factory-whitespace: 2.0.0 + micromark-util-character: 2.0.1 + micromark-util-types: 2.0.0 parse-entities: 4.0.1 scule: 1.0.0 stringify-entities: 4.0.3 - unist-util-visit: 4.1.2 - unist-util-visit-parents: 5.1.3 + unified: 11.0.2 + unist-util-visit: 5.0.0 + unist-util-visit-parents: 6.0.1 transitivePeerDependencies: - supports-color dev: false diff --git a/src/module.ts b/src/module.ts index ba2690fc8..02e58af32 100644 --- a/src/module.ts +++ b/src/module.ts @@ -460,7 +460,7 @@ export default defineNuxtModule({ if ( c.filePath.includes('@nuxt/content/dist') || - c.filePath.includes('nuxt-mdc/dist') || + c.filePath.includes('@nuxtjs/mdc/dist') || c.filePath.includes('nuxt/dist/app') || c.filePath.includes('NuxtWelcome') ) { @@ -658,7 +658,7 @@ export default defineNuxtModule({ } } - await installModule('nuxt-mdc', nuxtMDCOptions) + await installModule('@nuxtjs/mdc', nuxtMDCOptions) nuxt.options.runtimeConfig.public.content = defu(nuxt.options.runtimeConfig.public.content, { locales: options.locales, diff --git a/src/runtime/composables/useUnwrap.ts b/src/runtime/composables/useUnwrap.ts index bdc6d852f..b95f9d6a0 100644 --- a/src/runtime/composables/useUnwrap.ts +++ b/src/runtime/composables/useUnwrap.ts @@ -1,4 +1,4 @@ -import { unwrap, flatUnwrap } from 'nuxt-mdc/dist/runtime/utils/node' +import { unwrap, flatUnwrap } from '@nuxtjs/mdc/dist/runtime/utils/node' export const useUnwrap = () => ({ unwrap, diff --git a/src/runtime/transformers/markdown.ts b/src/runtime/transformers/markdown.ts index a504b1923..55c0680ab 100644 --- a/src/runtime/transformers/markdown.ts +++ b/src/runtime/transformers/markdown.ts @@ -1,4 +1,4 @@ -import { parseMarkdown } from 'nuxt-mdc/dist/runtime' +import { parseMarkdown } from '@nuxtjs/mdc/dist/runtime' import { type State } from 'mdast-util-to-hast' import { normalizeUri } from 'micromark-util-sanitize-uri' import { type Properties, type Element } from 'hast'