From 6775a1f4ea3f3cd44e18f004c997bf1fb0191b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ya=C3=ABl=20Guilloux?= Date: Mon, 30 Jan 2023 16:22:04 +0100 Subject: [PATCH 1/2] chore(deps): drop html-tags (#1867) Co-authored-by: Farnabaz --- .github/workflows/ci.yml | 2 +- README.md | 2 +- package.json | 3 +- playground/basic/nuxt.config.ts | 3 + src/module.ts | 5 +- .../components/ContentRendererMarkdown.vue | 3 +- .../markdown-parser/handler/paragraph.ts | 3 +- src/runtime/markdown-parser/index.ts | 1 + src/runtime/server/storage.ts | 1 + src/runtime/utils/html-tags.ts | 120 ++++++++++++++++++ yarn.lock | 2 +- 11 files changed, 133 insertions(+), 12 deletions(-) create mode 100644 src/runtime/utils/html-tags.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8688e07d9..d3175dcde 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: node-version: '16' cache: yarn - run: yarn install - - run: yarn dev:prepare + - run: yarn prepare - run: yarn lint - run: yarn build - run: yarn test diff --git a/README.md b/README.md index e46d05307..80b10ed1f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Nuxt 2 is supported with Content v1, documentation is on https://content.nuxtjs. - Clone repository - Install dependencies using `yarn install` -- Prepare using `yarn dev:prepare` +- Prepare using `yarn prepare` - Try playground using `yarn dev` ## License diff --git a/package.json b/package.json index 414554bf4..03ca75d03 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "scripts": { "dev": "./scripts/playground.sh", "dev:build": "nuxi build playground/basic", - "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground/basic", + "prepare": "nuxt-module-build --stub && nuxi prepare playground/basic", "dev:fixtures": "./scripts/fixture.sh", "build": "nuxt-module-build && yarn build:web-types", "build:docs": "(cd docs && nuxi build)", @@ -48,7 +48,6 @@ "defu": "^6.1.2", "destr": "^1.2.2", "detab": "^3.0.2", - "html-tags": "^3.2.0", "json5": "^2.2.3", "knitwork": "^1.0.0", "listhen": "^1.0.2", diff --git a/playground/basic/nuxt.config.ts b/playground/basic/nuxt.config.ts index 2a2f067ca..f6192aba6 100644 --- a/playground/basic/nuxt.config.ts +++ b/playground/basic/nuxt.config.ts @@ -10,5 +10,8 @@ export default defineNuxtConfig({ base: resolve(__dirname, 'content-fa') } } + }, + typescript: { + includeWorkspace: true } }) diff --git a/src/module.ts b/src/module.ts index 02d0be0c8..f7ab88f99 100644 --- a/src/module.ts +++ b/src/module.ts @@ -11,6 +11,7 @@ import { } from '@nuxt/kit' import { genImport, genSafeVariableName } from 'knitwork' import type { ListenOptions } from 'listhen' +// eslint-disable-next-line import/no-named-as-default import defu from 'defu' import { hash } from 'ohash' import { join, relative } from 'pathe' @@ -307,9 +308,7 @@ export default defineNuxtModule({ config.optimizeDeps = config.optimizeDeps || {} config.optimizeDeps.include = config.optimizeDeps.include || [] - config.optimizeDeps.include.push( - 'html-tags', 'slugify' - ) + config.optimizeDeps.include.push('slugify') }) nuxt.hook('nitro:config', (nitroConfig) => { diff --git a/src/runtime/components/ContentRendererMarkdown.vue b/src/runtime/components/ContentRendererMarkdown.vue index bdb8886dd..ca85a0574 100644 --- a/src/runtime/components/ContentRendererMarkdown.vue +++ b/src/runtime/components/ContentRendererMarkdown.vue @@ -3,10 +3,9 @@ import { h, resolveComponent, Text, defineComponent } from 'vue' import destr from 'destr' import { pascalCase } from 'scule' import { find, html } from 'property-information' -// eslint-disable-next-line import/no-named-as-default -import htmlTags from 'html-tags' import type { VNode, ConcreteComponent } from 'vue' import { useRuntimeConfig, useRoute } from '#app' +import htmlTags from '../utils/html-tags' import type { MarkdownNode, ParsedContentMeta } from '../types' type CreateElement = typeof h diff --git a/src/runtime/markdown-parser/handler/paragraph.ts b/src/runtime/markdown-parser/handler/paragraph.ts index ffe8147cd..5b56b2787 100644 --- a/src/runtime/markdown-parser/handler/paragraph.ts +++ b/src/runtime/markdown-parser/handler/paragraph.ts @@ -1,8 +1,7 @@ import type { H } from 'mdast-util-to-hast' import { all } from 'mdast-util-to-hast' -// eslint-disable-next-line import/no-named-as-default -import htmlTags from 'html-tags' import { kebabCase } from 'scule' +import htmlTags from '../../utils/html-tags' import { getTagName } from './utils' export default function paragraph (h: H, node: any) { diff --git a/src/runtime/markdown-parser/index.ts b/src/runtime/markdown-parser/index.ts index 4ad734c1f..ce38b574d 100644 --- a/src/runtime/markdown-parser/index.ts +++ b/src/runtime/markdown-parser/index.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line import/no-named-as-default import defu from 'defu' import remarkEmoji from 'remark-emoji' import rehypeSlug from 'rehype-slug' diff --git a/src/runtime/server/storage.ts b/src/runtime/server/storage.ts index 6f3de80b6..4daef5d7a 100644 --- a/src/runtime/server/storage.ts +++ b/src/runtime/server/storage.ts @@ -2,6 +2,7 @@ import { prefixStorage } from 'unstorage' import { joinURL, withLeadingSlash, withoutTrailingSlash } from 'ufo' import { hash as ohash } from 'ohash' import type { H3Event } from 'h3' +// eslint-disable-next-line import/no-named-as-default import defu from 'defu' import type { QueryBuilderParams, ParsedContent, QueryBuilder, ContentTransformer } from '../types' import { createQuery } from '../query/query' diff --git a/src/runtime/utils/html-tags.ts b/src/runtime/utils/html-tags.ts new file mode 100644 index 000000000..861732c0c --- /dev/null +++ b/src/runtime/utils/html-tags.ts @@ -0,0 +1,120 @@ +// Ref https://github.com/sindresorhus/html-tags/blob/v3.2.0/html-tags.json +export default [ + 'a', + 'abbr', + 'address', + 'area', + 'article', + 'aside', + 'audio', + 'b', + 'base', + 'bdi', + 'bdo', + 'blockquote', + 'body', + 'br', + 'button', + 'canvas', + 'caption', + 'cite', + 'code', + 'col', + 'colgroup', + 'data', + 'datalist', + 'dd', + 'del', + 'details', + 'dfn', + 'dialog', + 'div', + 'dl', + 'dt', + 'em', + 'embed', + 'fieldset', + 'figcaption', + 'figure', + 'footer', + 'form', + 'h1', + 'h2', + 'h3', + 'h4', + 'h5', + 'h6', + 'head', + 'header', + 'hgroup', + 'hr', + 'html', + 'i', + 'iframe', + 'img', + 'input', + 'ins', + 'kbd', + 'label', + 'legend', + 'li', + 'link', + 'main', + 'map', + 'mark', + 'math', + 'menu', + 'menuitem', + 'meta', + 'meter', + 'nav', + 'noscript', + 'object', + 'ol', + 'optgroup', + 'option', + 'output', + 'p', + 'param', + 'picture', + 'pre', + 'progress', + 'q', + 'rb', + 'rp', + 'rt', + 'rtc', + 'ruby', + 's', + 'samp', + 'script', + 'section', + 'select', + 'slot', + 'small', + 'source', + 'span', + 'strong', + 'style', + 'sub', + 'summary', + 'sup', + 'svg', + 'table', + 'tbody', + 'td', + 'template', + 'textarea', + 'tfoot', + 'th', + 'thead', + 'time', + 'title', + 'tr', + 'track', + 'u', + 'ul', + 'var', + 'video', + 'wbr' +] diff --git a/yarn.lock b/yarn.lock index c76f1eb69..4bb5cc6c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4340,7 +4340,7 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tags@^3.1.0, html-tags@^3.2.0: +html-tags@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== From c7ca353c9a166631a0f7f209e909c517374ee4c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 16:42:36 +0100 Subject: [PATCH 2/2] chore(deps): update all non-major dependencies (#1854) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Farnabaz --- docs/package.json | 2 +- docs/yarn.lock | 151 ++++++++++++++++++++++++++++++++-------------- package.json | 6 +- renovate.json | 8 ++- yarn.lock | 96 ++++++++++++++++------------- 5 files changed, 172 insertions(+), 91 deletions(-) diff --git a/docs/package.json b/docs/package.json index b45cca25a..02229b4f6 100755 --- a/docs/package.json +++ b/docs/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@docsearch/js": "^3.3.2", - "@nuxt-themes/docus": "^1.6.1", + "@nuxt-themes/docus": "^1.6.3", "@nuxthq/studio": "^0.6.5", "@nuxtlabs/github-module": "^1.6.1", "monaco-editor-core": "^0.34.1", diff --git a/docs/yarn.lock b/docs/yarn.lock index 905ded198..4f1133f80 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -773,15 +773,15 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@nuxt-themes/docus@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@nuxt-themes/docus/-/docus-1.6.1.tgz#b671d43e13cc59b7781c2f9d478d2a5aa7e9c2e1" - integrity sha512-3d8MxxQyBGlvAGNzxyvM5eUcgNY/EJAYfzaKAwqB59CzhCZKTvdNtxPh28GtlgBC1U82WzsyUtkCer10fLKQSg== +"@nuxt-themes/docus@^1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@nuxt-themes/docus/-/docus-1.6.3.tgz#7c053fc9fb56065cbec63c7395ea386c913b86de" + integrity sha512-H+9kiwufFFQGMsU1iyJieHVr0g8Kj664PrSMI2+bveEMbM1ui1xvDBIk6YhkTQbN3Y7rqOeSiKfr5YGp3zYPSg== dependencies: "@nuxt-themes/elements" "^0.5.2" - "@nuxt-themes/tokens" "^1.6.1" - "@nuxt-themes/typography" "^0.5.0" - "@nuxt/content" "^2.3.0" + "@nuxt-themes/tokens" "^1.6.2" + "@nuxt-themes/typography" "^0.6.0" + "@nuxt/content" "^2.4.1" "@nuxthq/studio" "^0.6.5" "@vueuse/nuxt" "^9.11.1" @@ -811,35 +811,44 @@ "@vueuse/core" "^9.11.1" pinceau "^0.12.3" -"@nuxt-themes/typography@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@nuxt-themes/typography/-/typography-0.5.0.tgz#64d9a1c743d49abd3a7c8d3297a3c71810dd96ce" - integrity sha512-o49O165xjzFPRRuBiq8oYiBQ2C4iWM/PFaytNdh3vjOrIH0/uSkGoPg3U+5QVBJaAkcp4+aSCwxPNp348YVO4A== +"@nuxt-themes/tokens@^1.6.2": + version "1.6.2" + resolved "https://registry.yarnpkg.com/@nuxt-themes/tokens/-/tokens-1.6.2.tgz#5ad3da80a613c7c10b0b93b8f6ab35ccdc24f961" + integrity sha512-J2UZpN7iccMCHB2MHfgJ9od85xmfH1Apwu2NEYynNDBHhQG2e9f2JlByEHJbtTQW7soBFjYJQVSxU2XtzASBTw== dependencies: - "@nuxt-themes/tokens" "^1.6.0" + "@nuxtjs/color-mode" "^3.2.0" + "@vueuse/core" "^9.11.1" + pinceau "^0.12.7" + +"@nuxt-themes/typography@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@nuxt-themes/typography/-/typography-0.6.0.tgz#ba7d61250cc1650d8077550011d4f90da5156cc6" + integrity sha512-RGLi4Ylu7KBr5JYyQQNOafNyDy707C81XjdzmbTznmmKb6VIa5z0rO7XwpsnZhA+wjRkXGJv9B1L+ABhxKEAIA== + dependencies: + "@nuxt-themes/tokens" "^1.6.1" "@nuxtjs/color-mode" "^3.2.0" nuxt-config-schema "^0.4.4" - nuxt-icon "^0.2.7" + nuxt-icon "^0.2.10" ufo "^1.0.1" -"@nuxt/content@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-2.3.0.tgz#96e4c2c78b153c6769d35e909539bad5d98a704d" - integrity sha512-7IudXOiycHXWxRDe7tWFwnIVT6bp0YG5O4wttCYYd7cvyjX3k6d3zD2j1IkjJMhfqU2PWQ/Wd+A2+oeiLNg3gA== +"@nuxt/content@^2.4.1": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-2.4.2.tgz#d297385aa2a060de22e070f902390833f2a202ed" + integrity sha512-Nz2ZcC7R505UY5NQN+WE1pZ4ie8PBBr12qJHFAZqhWCXenzsdb87p48fvr6Zhlj8CyCTQqWg0B2fs7Lyg/CKwg== dependencies: - "@nuxt/kit" v3.0.0 + "@nuxt/kit" "3.1.1" consola "^2.15.3" - defu "^6.1.1" + defu "^6.1.2" destr "^1.2.2" detab "^3.0.2" html-tags "^3.2.0" - json5 "^2.2.1" + json5 "^2.2.3" knitwork "^1.0.0" - listhen "^1.0.1" - mdast-util-to-hast "^12.2.4" + listhen "^1.0.2" + mdast-util-to-hast "^12.2.6" mdurl "^1.0.1" ohash "^1.0.0" - pathe "^1.0.0" + pathe "^1.1.0" property-information "^6.2.0" rehype-external-links "^2.0.1" rehype-raw "^6.1.1" @@ -853,23 +862,23 @@ remark-rehype "^10.1.0" remark-squeeze-paragraphs "^5.0.1" scule "^1.0.0" - shiki-es "^0.1.2" + shiki-es "^0.2.0" slugify "^1.6.5" socket.io-client "^4.5.4" ufo "^1.0.1" unified "^10.1.2" - unist-builder "^3.0.0" - unist-util-position "^4.0.3" - unist-util-visit "^4.1.1" + unist-builder "^3.0.1" + unist-util-position "^4.0.4" + unist-util-visit "^4.1.2" unstorage "^1.0.1" - ws "^8.11.0" + ws "^8.12.0" "@nuxt/devalue@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-2.0.0.tgz#c7bd7e9a516514e612d5d2e511ffc399e0eac322" integrity sha512-YBI/6o2EBz02tdEJRBK8xkt3zvOFOWlLBf7WKYGBsSYSRtjjgrqPe2skp6VLLmKx5WbHHDNcW+6oACaurxGzeA== -"@nuxt/kit@3.1.1": +"@nuxt/kit@3.1.1", "@nuxt/kit@^3.1.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@nuxt/kit/-/kit-3.1.1.tgz#7641afe192297db02d3585234e9d2a71caf164df" integrity sha512-wmqVCIuD/te6BKf3YiqWyMumKI5JIpkiv0li/1Y3QHnTkoxyIhLkbFgNcQHuBxJ3eMlk2UjAjAqWiqBHTX54vQ== @@ -893,7 +902,7 @@ unimport "^2.0.1" untyped "^1.2.2" -"@nuxt/kit@^3.0.0", "@nuxt/kit@v3.0.0": +"@nuxt/kit@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@nuxt/kit/-/kit-3.0.0.tgz#ae49b4e27b15285556cb88f35a56309c5ca0dd79" integrity sha512-7ZsOLt5s9a0ZleAIzmoD70JwkZf5ti6bDdxl6f8ew7Huxz+ni/oRfTPTX9TrORXsgW5CvDt6Q9M7IJNPkAN/Iw== @@ -1340,6 +1349,11 @@ resolved "https://registry.yarnpkg.com/@unocss/reset/-/reset-0.48.5.tgz#f3262e44139f287acc18104fee746c9a96de368d" integrity sha512-+JJT3Btj1oNX4XwKBDPRUYre3NYBNmi0PsC3tqkHN2VphJG0iZl91XNfsveLz8pVpDJPUDdLH4xsqh52WmxU1g== +"@unocss/reset@^0.49.0": + version "0.49.1" + resolved "https://registry.yarnpkg.com/@unocss/reset/-/reset-0.49.1.tgz#27559c3c827ddec35387ba53455051d034bab9b5" + integrity sha512-T1027YK21UDzhgA4qB+L1E8jhNY3dGHqCB15HqB63V5zgVLyw10Hmh0koinrkwtPhxDhLluURuu0tDm7/isvcA== + "@vercel/nft@^0.22.6": version "0.22.6" resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.22.6.tgz#edb30d300bb809c0945ea4c7b87e56f634885541" @@ -3573,7 +3587,7 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json5@^2.2.1, json5@^2.2.2, json5@^2.2.3: +json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -3633,6 +3647,20 @@ listhen@^1.0.0, listhen@^1.0.1: node-forge "^1.3.1" ufo "^1.0.0" +listhen@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.0.2.tgz#3332af0cf77dd914e12d125c70a9c6aed9537033" + integrity sha512-yXz0NIYfVJDBQK2vlCpD/OjSzYkur2mR44boUtlg0eES4holn7oYZf439y5JxP55EOzFtClZ8eZlMJ8a++FwlQ== + dependencies: + clipboardy "^3.0.0" + colorette "^2.0.19" + defu "^6.1.2" + get-port-please "^3.0.1" + http-shutdown "^1.2.2" + ip-regex "^5.0.0" + node-forge "^1.3.1" + ufo "^1.0.1" + local-pkg@^0.4.2, local-pkg@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963" @@ -3890,7 +3918,7 @@ mdast-util-phrasing@^3.0.0: "@types/mdast" "^3.0.0" unist-util-is "^5.0.0" -mdast-util-to-hast@^12.1.0, mdast-util-to-hast@^12.2.4: +mdast-util-to-hast@^12.1.0, mdast-util-to-hast@^12.2.6: version "12.2.6" resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.2.6.tgz#fb90830f427de8d2a7518753e560435531b97ee6" integrity sha512-Kfo1JNUsi6r6CI7ZOJ6yt/IEKMjMK4nNjQ8C+yc8YBbIlDSp9dmj0zY90ryiu6Vy4CVGv0zi1H4ZoIaYVV8cwA== @@ -4595,14 +4623,14 @@ nuxt-config-schema@^0.4.4: pathe "^1.0.0" untyped "^1.2.2" -nuxt-icon@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/nuxt-icon/-/nuxt-icon-0.2.7.tgz#144e556c579b6274ffd3ea03be7ca889249e940f" - integrity sha512-Tv1oh33oLJfFDhQ5nMZ8I5vspbg7A8JTW7sVtD58gDkHfFzEHXBcXz7OesFZZQvKPwBWSKhBLgIenbFu5Jkzlw== +nuxt-icon@^0.2.10: + version "0.2.10" + resolved "https://registry.yarnpkg.com/nuxt-icon/-/nuxt-icon-0.2.10.tgz#7b067e6d5d36ff7dabb4eb736f2936b5f2d17565" + integrity sha512-pI0BOF1bHw73MbDYsTNpZNJhWJ3XAjG4SO7B8sHCfxb3SZmw3Uu/KoKiLtyO68Oc4z4CYCMIjbkTflwpoOBMEQ== dependencies: "@iconify/vue" "^4.0.2" - "@nuxt/kit" "^3.0.0" - nuxt-config-schema "^0.4.2" + "@nuxt/kit" "^3.1.0" + nuxt-config-schema "^0.4.4" nuxt@3.1.1: version "3.1.1" @@ -4888,6 +4916,30 @@ pinceau@^0.12.3: unbuild "^1.1.1" unplugin "^1.0.1" +pinceau@^0.12.7: + version "0.12.8" + resolved "https://registry.yarnpkg.com/pinceau/-/pinceau-0.12.8.tgz#c329992405e98fc51b6f1a6366140de09b79489c" + integrity sha512-kwNUgaJdfTgBn3cD/UNHNJIdzznqvNJ1/vTeK0mPGBTlQgRAsd5dduSPZM4cTrJe53nPWf4YwzPounhWlinp0A== + dependencies: + "@unocss/reset" "^0.49.0" + "@volar/vue-language-core" "^1.0.24" + acorn "^8.8.2" + chroma-js "^2.4.2" + consola "^2.15.3" + csstype "^3.1.1" + defu "^6.1.2" + magic-string "^0.27.0" + nanoid "^4.0.0" + ohash "^1.0.0" + postcss-custom-properties "13.1.0" + postcss-dark-theme-class "0.7.3" + postcss-nested "^6.0.0" + recast "^0.22.0" + scule "^1.0.0" + style-dictionary-esm "^1.2.0" + unbuild "^1.1.1" + unplugin "^1.0.1" + pkg-types@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.1.tgz#25234407f9dc63409af45ced9407625ff446a761" @@ -5629,10 +5681,10 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shiki-es@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/shiki-es/-/shiki-es-0.1.2.tgz#37176c6ff8d734f95e27560b62e1230c9a90c0cb" - integrity sha512-eqtfk8idlYlSLAn0gp0Ly2+FbKc2d78IddigHSS4iHAnpXoY2kdRzyFGZOdi6TvemYMnRhZBi1HsSqZc5eNKqg== +shiki-es@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/shiki-es/-/shiki-es-0.2.0.tgz#ae5bced62dca0ba46ee81149e68d428565a3e6fb" + integrity sha512-RbRMD+IuJJseSZljDdne9ThrUYrwBwJR04FvN4VXpfsU3MNID5VJGHLAD5je/HGThCyEKNgH+nEkSFEWKD7C3Q== signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" @@ -6111,7 +6163,7 @@ unimport@^2.0.1: strip-literal "^1.0.0" unplugin "^1.0.1" -unist-builder@^3.0.0: +unist-builder@^3.0.0, unist-builder@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.1.tgz#258b89dcadd3c973656b2327b347863556907f58" integrity sha512-gnpOw7DIpCA0vpr6NqdPvTWnlPTApCTRzr+38E6hCWx3rz/cjo83SsKIlS1Z+L5ttScQ2AwutNnb8+tAvpb6qQ== @@ -6128,7 +6180,7 @@ unist-util-is@^5.0.0: resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236" integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ== -unist-util-position@^4.0.0, unist-util-position@^4.0.3: +unist-util-position@^4.0.0, unist-util-position@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.4.tgz#93f6d8c7d6b373d9b825844645877c127455f037" integrity sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg== @@ -6168,6 +6220,15 @@ unist-util-visit@^4.0.0, unist-util-visit@^4.1.0, unist-util-visit@^4.1.1: unist-util-is "^5.0.0" unist-util-visit-parents "^5.1.1" +unist-util-visit@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.2.tgz#125a42d1eb876283715a3cb5cceaa531828c72e2" + integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents "^5.1.1" + universal-user-agent@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee" @@ -6528,7 +6589,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.11.0: +ws@^8.11.0, ws@^8.12.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== diff --git a/package.json b/package.json index 03ca75d03..97220b322 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "rehype-slug": "^5.1.0", "rehype-sort-attribute-values": "^4.0.0", "rehype-sort-attributes": "^4.0.0", - "remark-emoji": "^3.0.2", + "remark-emoji": "3.0.2", "remark-gfm": "^3.0.1", "remark-mdc": "^1.1.3", "remark-parse": "^10.0.1", @@ -88,7 +88,7 @@ "@types/ws": "^8.5.4", "c8": "^7.12.0", "csvtojson": "^2.0.10", - "eslint": "^8.32.0", + "eslint": "^8.33.0", "globby": "^13.1.3", "husky": "^8.0.3", "jiti": "^1.16.2", @@ -97,7 +97,7 @@ "rehype-figure": "^1.0.1", "release-it": "^15.6.0", "remark-oembed": "^1.2.2", - "vitest": "^0.28.2", + "vitest": "^0.28.3", "vue-docgen-web-types": "^0.1.8" }, "release-it": { diff --git a/renovate.json b/renovate.json index 57beb46fb..5b61104bf 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,11 @@ "extends": ["@nuxtjs"], "lockFileMaintenance": { "enabled": true - } + }, + "packageRules": [ + { + "matchPackageNames": ["remark-emoji"], + "allowedVersions": "!/3\\.1\\.0$/" + } + ] } diff --git a/yarn.lock b/yarn.lock index 4bb5cc6c4..ef089940a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1404,35 +1404,35 @@ resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz#93815beffd23db46288c787352a8ea31a0c03e5e" integrity sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA== -"@vitest/expect@0.28.2": - version "0.28.2" - resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.28.2.tgz#375af32579b3d6b972a1fe0be0e0260ffb84bc7d" - integrity sha512-syEAK7I24/aGR2lXma98WNnvMwAJ+fMx32yPcj8eLdCEWjZI3SH8ozMaKQMy65B/xZCZAl6MXmfjtJb2CpWPMg== +"@vitest/expect@0.28.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.28.3.tgz#8cd570b662e709f56ba29835879890c87429a194" + integrity sha512-dnxllhfln88DOvpAK1fuI7/xHwRgTgR4wdxHldPaoTaBu6Rh9zK5b//v/cjTkhOfNP/AJ8evbNO8H7c3biwd1g== dependencies: - "@vitest/spy" "0.28.2" - "@vitest/utils" "0.28.2" + "@vitest/spy" "0.28.3" + "@vitest/utils" "0.28.3" chai "^4.3.7" -"@vitest/runner@0.28.2": - version "0.28.2" - resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.28.2.tgz#671c8f489ceac2bcf1bc2d993f9920da10347d3f" - integrity sha512-BJ9CtfPwWM8uc5p7Ty0OprwApyh8RIaSK7QeQPhwfDYA59AAE009OytqA3aX0yj1Qy5+k/mYFJS8RJZgsueSGA== +"@vitest/runner@0.28.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.28.3.tgz#a59bc7a1457957291b6bf1964831284768168314" + integrity sha512-P0qYbATaemy1midOLkw7qf8jraJszCoEvjQOSlseiXZyEDaZTZ50J+lolz2hWiWv6RwDu1iNseL9XLsG0Jm2KQ== dependencies: - "@vitest/utils" "0.28.2" + "@vitest/utils" "0.28.3" p-limit "^4.0.0" pathe "^1.1.0" -"@vitest/spy@0.28.2": - version "0.28.2" - resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.28.2.tgz#74d970601eebc41d48e685323b2853b2c88f8db4" - integrity sha512-KlLzTzi5E6tHcI12VT+brlY1Pdi7sUzLf9+YXgh80+CfLu9DqPZi38doBBAUhqEnW/emoLCMinPMMoJlNAQZXA== +"@vitest/spy@0.28.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.28.3.tgz#6f6f7ecdeefecb023a96e69b6083e0314ea6f04c" + integrity sha512-jULA6suS6CCr9VZfr7/9x97pZ0hC55prnUNHNrg5/q16ARBY38RsjsfhuUXt6QOwvIN3BhSS0QqPzyh5Di8g6w== dependencies: tinyspy "^1.0.2" -"@vitest/utils@0.28.2": - version "0.28.2" - resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.28.2.tgz#2d79de7afb44e821a2c7e692bafb40d2cf765bb7" - integrity sha512-wcVTNnVdr22IGxZHDgiXrxWYcXsNg0iX2iBuOH3tVs9eme6fXJ0wxjn0/gCpp0TofQSoUwo3tX8LNACFVseDuA== +"@vitest/utils@0.28.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.28.3.tgz#75c076d4fdde5c48ee5de2808c83d615fc74d4ef" + integrity sha512-YHiQEHQqXyIbhDqETOJUKx9/psybF7SFFVCNfOvap0FvyUqbzTSDCa3S5lL4C0CLXkwVZttz9xknDoyHMguFRQ== dependencies: cli-truncate "^3.1.0" diff "^5.1.0" @@ -3394,10 +3394,10 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.32.0: - version "8.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861" - integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ== +eslint@^8.33.0: + version "8.33.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7" + integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA== dependencies: "@eslint/eslintrc" "^1.4.1" "@humanwhocodes/config-array" "^0.11.8" @@ -7481,7 +7481,7 @@ release-it@^15.6.0: wildcard-match "5.1.2" yargs-parser "21.1.1" -remark-emoji@^3.0.2: +remark-emoji@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-3.0.2.tgz#786e88af1ecae682d74d7e1219989f34708205da" integrity sha512-hEgxEv2sBtvhT3tNG/tQeeFY3EbslftaOoG14dDZndLo25fWJ6Fbg4ukFbIotOWWrfXyASjXjyHT+6n366k3mg== @@ -8327,10 +8327,10 @@ tinybench@^2.3.1: resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.3.1.tgz#14f64e6b77d7ef0b1f6ab850c7a808c6760b414d" integrity sha512-hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA== -tinypool@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.3.0.tgz#c405d8b743509fc28ea4ca358433190be654f819" - integrity sha512-NX5KeqHOBZU6Bc0xj9Vr5Szbb1j8tUHIeD18s41aDJaPeC5QTdEhK0SpdpUrZlj2nv5cctNcSjaKNanXlfcVEQ== +tinypool@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.3.1.tgz#a99c2e446aba9be05d3e1cb756d6aed7af4723b6" + integrity sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ== tinyspy@^1.0.2: version "1.0.2" @@ -8705,7 +8705,7 @@ unist-util-visit@^2.0.0, unist-util-visit@^2.0.3: unist-util-is "^4.0.0" unist-util-visit-parents "^3.0.0" -unist-util-visit@^4.0.0, unist-util-visit@^4.1.0, unist-util-visit@^4.1.1: +unist-util-visit@^4.0.0, unist-util-visit@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.1.tgz#1c4842d70bd3df6cc545276f5164f933390a9aad" integrity sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg== @@ -8714,7 +8714,7 @@ unist-util-visit@^4.0.0, unist-util-visit@^4.1.0, unist-util-visit@^4.1.1: unist-util-is "^5.0.0" unist-util-visit-parents "^5.1.1" -unist-util-visit@^4.1.2: +unist-util-visit@^4.1.0, unist-util-visit@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.2.tgz#125a42d1eb876283715a3cb5cceaa531828c72e2" integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg== @@ -8905,7 +8905,21 @@ vfile@^5.0.0: unist-util-stringify-position "^3.0.0" vfile-message "^3.0.0" -vite-node@0.28.2, vite-node@^0.28.2: +vite-node@0.28.3: + version "0.28.3" + resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.28.3.tgz#5d693c237d5467f167f81d158a56d3408fea899c" + integrity sha512-uJJAOkgVwdfCX8PUQhqLyDOpkBS5+j+FdbsXoPVPDlvVjRkb/W/mLYQPSL6J+t8R0UV8tJSe8c9VyxVQNsDSyg== + dependencies: + cac "^6.7.14" + debug "^4.3.4" + mlly "^1.1.0" + pathe "^1.1.0" + picocolors "^1.0.0" + source-map "^0.6.1" + source-map-support "^0.5.21" + vite "^3.0.0 || ^4.0.0" + +vite-node@^0.28.2: version "0.28.2" resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.28.2.tgz#58b52fc638f86fee9bfe4990abaea7e4d74f6514" integrity sha512-zyiJ3DLs9zXign4P2MD4PQk+7rdT+JkHukgmmS0KuImbCQ7WnCdea5imQVeT6OtUsBwsLztJxQODUsinVr91tg== @@ -8952,18 +8966,18 @@ vite-plugin-checker@^0.5.4: optionalDependencies: fsevents "~2.3.2" -vitest@^0.28.2: - version "0.28.2" - resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.28.2.tgz#952e1ad83fbd04ee1bfce634b106a371a5973603" - integrity sha512-HJBlRla4Mng0OiZ8aWunCecJ6BzLDA4yuzuxiBuBU2MXjGB6I4zT7QgIBL/UrwGKlNxLwaDC5P/4OpeuTlW8yQ== +vitest@^0.28.3: + version "0.28.3" + resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.28.3.tgz#58322a5ae64854d4cdb75451817b9fb795f9102e" + integrity sha512-N41VPNf3VGJlWQizGvl1P5MGyv3ZZA2Zvh+2V8L6tYBAAuqqDK4zExunT1Cdb6dGfZ4gr+IMrnG8d4Z6j9ctPw== dependencies: "@types/chai" "^4.3.4" "@types/chai-subset" "^1.3.3" "@types/node" "*" - "@vitest/expect" "0.28.2" - "@vitest/runner" "0.28.2" - "@vitest/spy" "0.28.2" - "@vitest/utils" "0.28.2" + "@vitest/expect" "0.28.3" + "@vitest/runner" "0.28.3" + "@vitest/spy" "0.28.3" + "@vitest/utils" "0.28.3" acorn "^8.8.1" acorn-walk "^8.2.0" cac "^6.7.14" @@ -8976,10 +8990,10 @@ vitest@^0.28.2: std-env "^3.3.1" strip-literal "^1.0.0" tinybench "^2.3.1" - tinypool "^0.3.0" + tinypool "^0.3.1" tinyspy "^1.0.2" vite "^3.0.0 || ^4.0.0" - vite-node "0.28.2" + vite-node "0.28.3" why-is-node-running "^2.2.2" vm2@^3.9.8: