From 3921e656b10711a0f8bc6170090662954dbf45fa Mon Sep 17 00:00:00 2001 From: Ayres Vitor Date: Mon, 28 Jul 2025 16:03:20 -0300 Subject: [PATCH] fix conflicts --- package.json | 3 +- .../{package.json => package.json.old} | 0 pnpm-lock.yaml | 175 ++---------------- 3 files changed, 12 insertions(+), 166 deletions(-) rename packages/js-api-generator/{package.json => package.json.old} (100%) diff --git a/package.json b/package.json index 306d11c20..b3d52d9bc 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,7 @@ "starlight-links-validator": "^0.17.0", "starlight-sidebar-topics": "^0.6.0", "starlight-typedoc": "^0.21.3", - "typedoc": "0.28.7", - "typedoc-plugin-markdown": "4.7.1" + "typedoc": "0.28.8" }, "packageManager": "pnpm@10.13.1", "engines": { diff --git a/packages/js-api-generator/package.json b/packages/js-api-generator/package.json.old similarity index 100% rename from packages/js-api-generator/package.json rename to packages/js-api-generator/package.json.old diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7ed926565..212f265c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -70,13 +70,10 @@ importers: version: 0.6.0(@astrojs/starlight@0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0))) starlight-typedoc: specifier: ^0.21.3 - version: 0.21.3(@astrojs/starlight@0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0)))(typedoc-plugin-markdown@4.7.1(typedoc@0.28.7(typescript@5.8.3)))(typedoc@0.28.7(typescript@5.8.3)) + version: 0.21.3(@astrojs/starlight@0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0)))(typedoc-plugin-markdown@4.7.1(typedoc@0.28.8(typescript@5.8.3)))(typedoc@0.28.8(typescript@5.8.3)) typedoc: - specifier: 0.28.7 - version: 0.28.7(typescript@5.8.3) - typedoc-plugin-markdown: - specifier: 4.7.1 - version: 4.7.1(typedoc@0.28.7(typescript@5.8.3)) + specifier: 0.28.8 + version: 0.28.8(typescript@5.8.3) packages/cli-generator: dependencies: @@ -129,27 +126,6 @@ importers: specifier: ^5.3.3 version: 5.5.4 - packages/js-api-generator: - dependencies: - github-slugger: - specifier: ^2.0.0 - version: 2.0.0 - tsm: - specifier: ^2.3.0 - version: 2.3.0 - typedoc: - specifier: 0.26.6 - version: 0.26.6(typescript@5.5.4) - typedoc-plugin-markdown: - specifier: 4.2.6 - version: 4.2.6(typedoc@0.26.6(typescript@5.5.4)) - typedoc-plugin-mdn-links: - specifier: 3.2.11 - version: 3.2.11(typedoc@0.26.6(typescript@5.5.4)) - typescript: - specifier: '5.5' - version: 5.5.4 - packages/releases-generator: dependencies: '@types/semver': @@ -1429,39 +1405,21 @@ packages: cpu: [x64] os: [win32] - '@shikijs/core@1.29.2': - resolution: {integrity: sha512-vju0lY9r27jJfOY4Z7+Rt/nIOjzJpZ3y+nYpqtUZInVoXQ/TJZcfGnNOGnKjFdVZb8qexiCuSlZRKcGfhhTTZQ==} - '@shikijs/core@3.8.1': resolution: {integrity: sha512-uTSXzUBQ/IgFcUa6gmGShCHr4tMdR3pxUiiWKDm8pd42UKJdYhkAYsAmHX5mTwybQ5VyGDgTjW4qKSsRvGSang==} - '@shikijs/engine-javascript@1.29.2': - resolution: {integrity: sha512-iNEZv4IrLYPv64Q6k7EPpOCE/nuvGiKl7zxdq0WFuRPF5PAE9PRo2JGq/d8crLusM59BRemJ4eOqrFrC4wiQ+A==} - '@shikijs/engine-javascript@3.8.1': resolution: {integrity: sha512-rZRp3BM1llrHkuBPAdYAzjlF7OqlM0rm/7EWASeCcY7cRYZIrOnGIHE9qsLz5TCjGefxBFnwgIECzBs2vmOyKA==} - '@shikijs/engine-oniguruma@1.29.2': - resolution: {integrity: sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==} - '@shikijs/engine-oniguruma@3.8.1': resolution: {integrity: sha512-KGQJZHlNY7c656qPFEQpIoqOuC4LrxjyNndRdzk5WKB/Ie87+NJCF1xo9KkOUxwxylk7rT6nhlZyTGTC4fCe1g==} - '@shikijs/langs@1.29.2': - resolution: {integrity: sha512-FIBA7N3LZ+223U7cJDUYd5shmciFQlYkFXlkKVaHsCPgfVLiO+e12FmQE6Tf9vuyEsFe3dIl8qGWKXgEHL9wmQ==} - '@shikijs/langs@3.8.1': resolution: {integrity: sha512-TjOFg2Wp1w07oKnXjs0AUMb4kJvujML+fJ1C5cmEj45lhjbUXtziT1x2bPQb9Db6kmPhkG5NI2tgYW1/DzhUuQ==} - '@shikijs/themes@1.29.2': - resolution: {integrity: sha512-i9TNZlsq4uoyqSbluIcZkmPL9Bfi3djVxRnofUHwvx/h6SRW3cwgBC5SML7vsDcWyukY0eCzVN980rqP6qNl9g==} - '@shikijs/themes@3.8.1': resolution: {integrity: sha512-Vu3t3BBLifc0GB0UPg2Pox1naTemrrvyZv2lkiSw3QayVV60me1ujFQwPZGgUTmwXl1yhCPW8Lieesm0CYruLQ==} - '@shikijs/types@1.29.2': - resolution: {integrity: sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==} - '@shikijs/types@3.8.1': resolution: {integrity: sha512-5C39Q8/8r1I26suLh+5TPk1DTrbY/kn3IdWA5HdizR0FhlhD05zx5nKCqhzSfDHH3p4S0ZefxWd77DLV+8FhGg==} @@ -2029,9 +1987,6 @@ packages: electron-to-chromium@1.5.70: resolution: {integrity: sha512-P6FPqAWIZrC3sHDAwBitJBs7N7IF58m39XVny7DFseQXK2eiMn7nNQizFf63mWDDUnFvaqsM8FI0+ZZfLkdUGA==} - emoji-regex-xs@1.0.0: - resolution: {integrity: sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==} - emoji-regex@10.4.0: resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} @@ -3067,9 +3022,6 @@ packages: oniguruma-parser@0.12.1: resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==} - oniguruma-to-es@2.3.0: - resolution: {integrity: sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g==} - oniguruma-to-es@4.3.3: resolution: {integrity: sha512-rPiZhzC3wXwE59YQMRDodUwwT9FZ9nNBwQQfsd1wfdtlKEyCdRV0avrTcSZ5xlIvGRVPd/cx6ZN45ECmS39xvg==} @@ -3216,18 +3168,12 @@ packages: regenerator-transform@0.15.2: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} - regex-recursion@5.1.1: - resolution: {integrity: sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==} - regex-recursion@6.0.2: resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==} regex-utilities@2.3.0: resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==} - regex@5.1.1: - resolution: {integrity: sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==} - regex@6.0.1: resolution: {integrity: sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==} @@ -3394,9 +3340,6 @@ packages: resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - shiki@1.29.2: - resolution: {integrity: sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg==} - shiki@3.8.1: resolution: {integrity: sha512-+MYIyjwGPCaegbpBeFN9+oOifI8CKiKG3awI/6h3JeT85c//H2wDW/xCJEGuQ5jPqtbboKNqNy+JyX9PYpGwNg==} @@ -3642,32 +3585,14 @@ packages: resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} engines: {node: '>= 0.4'} - typedoc-plugin-markdown@4.2.6: - resolution: {integrity: sha512-k33o2lZSGpL3GjH28eW+RsujzCYFP0L5GNqpK+wa4CBcMOxpj8WV7SydNRLS6eSa2UvaPvNVJTaAZ6Tm+8GXoA==} - engines: {node: '>= 18'} - peerDependencies: - typedoc: 0.26.x - typedoc-plugin-markdown@4.7.1: resolution: {integrity: sha512-HN/fHLm2S6MD4HX8txfB4eWvVBzX/mEYy5U5s1KTAdh3E5uX5/lilswqTzZlPTT6fNZInAboAdFGpbAuBKnE4A==} engines: {node: '>= 18'} peerDependencies: typedoc: 0.28.x - typedoc-plugin-mdn-links@3.2.11: - resolution: {integrity: sha512-0VlF21O3S1L373UTkUFleoQDrgkh5quAqjCVusBaa3czLahK6LsUxQj6PRqbT5xN0emUVYnT7UTwe8haU2MFrw==} - peerDependencies: - typedoc: '>= 0.23.14 || 0.24.x || 0.25.x || 0.26.x' - - typedoc@0.26.6: - resolution: {integrity: sha512-SfEU3SH3wHNaxhFPjaZE2kNl/NFtLNW5c1oHsg7mti7GjmUj1Roq6osBQeMd+F4kL0BoRBBr8gQAuqBlfFu8LA==} - engines: {node: '>= 18'} - hasBin: true - peerDependencies: - typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x - - typedoc@0.28.7: - resolution: {integrity: sha512-lpz0Oxl6aidFkmS90VQDQjk/Qf2iw0IUvFqirdONBdj7jPSN9mGXhy66BcGNDxx5ZMyKKiBVAREvPEzT6Uxipw==} + typedoc@0.28.8: + resolution: {integrity: sha512-16GfLopc8icHfdvqZDqdGBoS2AieIRP2rpf9mU+MgN+gGLyEQvAO0QgOa6NJ5QNmQi0LFrDY9in4F2fUNKgJKA==} engines: {node: '>= 18', pnpm: '>= 10'} hasBin: true peerDependencies: @@ -5467,15 +5392,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.45.1': optional: true - '@shikijs/core@1.29.2': - dependencies: - '@shikijs/engine-javascript': 1.29.2 - '@shikijs/engine-oniguruma': 1.29.2 - '@shikijs/types': 1.29.2 - '@shikijs/vscode-textmate': 10.0.2 - '@types/hast': 3.0.4 - hast-util-to-html: 9.0.5 - '@shikijs/core@3.8.1': dependencies: '@shikijs/types': 3.8.1 @@ -5483,49 +5399,25 @@ snapshots: '@types/hast': 3.0.4 hast-util-to-html: 9.0.5 - '@shikijs/engine-javascript@1.29.2': - dependencies: - '@shikijs/types': 1.29.2 - '@shikijs/vscode-textmate': 10.0.2 - oniguruma-to-es: 2.3.0 - '@shikijs/engine-javascript@3.8.1': dependencies: '@shikijs/types': 3.8.1 '@shikijs/vscode-textmate': 10.0.2 oniguruma-to-es: 4.3.3 - '@shikijs/engine-oniguruma@1.29.2': - dependencies: - '@shikijs/types': 1.29.2 - '@shikijs/vscode-textmate': 10.0.2 - '@shikijs/engine-oniguruma@3.8.1': dependencies: '@shikijs/types': 3.8.1 '@shikijs/vscode-textmate': 10.0.2 - '@shikijs/langs@1.29.2': - dependencies: - '@shikijs/types': 1.29.2 - '@shikijs/langs@3.8.1': dependencies: '@shikijs/types': 3.8.1 - '@shikijs/themes@1.29.2': - dependencies: - '@shikijs/types': 1.29.2 - '@shikijs/themes@3.8.1': dependencies: '@shikijs/types': 3.8.1 - '@shikijs/types@1.29.2': - dependencies: - '@shikijs/vscode-textmate': 10.0.2 - '@types/hast': 3.0.4 - '@shikijs/types@3.8.1': dependencies: '@shikijs/vscode-textmate': 10.0.2 @@ -6162,8 +6054,6 @@ snapshots: electron-to-chromium@1.5.70: {} - emoji-regex-xs@1.0.0: {} - emoji-regex@10.4.0: {} emoji-regex@8.0.0: {} @@ -7631,12 +7521,6 @@ snapshots: oniguruma-parser@0.12.1: {} - oniguruma-to-es@2.3.0: - dependencies: - emoji-regex-xs: 1.0.0 - regex: 5.1.1 - regex-recursion: 5.1.1 - oniguruma-to-es@4.3.3: dependencies: oniguruma-parser: 0.12.1 @@ -7797,21 +7681,12 @@ snapshots: dependencies: '@babel/runtime': 7.25.6 - regex-recursion@5.1.1: - dependencies: - regex: 5.1.1 - regex-utilities: 2.3.0 - regex-recursion@6.0.2: dependencies: regex-utilities: 2.3.0 regex-utilities@2.3.0: {} - regex@5.1.1: - dependencies: - regex-utilities: 2.3.0 - regex@6.0.1: dependencies: regex-utilities: 2.3.0 @@ -8112,17 +7987,6 @@ snapshots: '@img/sharp-win32-ia32': 0.33.5 '@img/sharp-win32-x64': 0.33.5 - shiki@1.29.2: - dependencies: - '@shikijs/core': 1.29.2 - '@shikijs/engine-javascript': 1.29.2 - '@shikijs/engine-oniguruma': 1.29.2 - '@shikijs/langs': 1.29.2 - '@shikijs/themes': 1.29.2 - '@shikijs/types': 1.29.2 - '@shikijs/vscode-textmate': 10.0.2 - '@types/hast': 3.0.4 - shiki@3.8.1: dependencies: '@shikijs/core': 3.8.1 @@ -8223,12 +8087,12 @@ snapshots: '@astrojs/starlight': 0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0)) picomatch: 4.0.3 - starlight-typedoc@0.21.3(@astrojs/starlight@0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0)))(typedoc-plugin-markdown@4.7.1(typedoc@0.28.7(typescript@5.8.3)))(typedoc@0.28.7(typescript@5.8.3)): + starlight-typedoc@0.21.3(@astrojs/starlight@0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0)))(typedoc-plugin-markdown@4.7.1(typedoc@0.28.8(typescript@5.8.3)))(typedoc@0.28.8(typescript@5.8.3)): dependencies: '@astrojs/starlight': 0.35.1(astro@5.12.3(@types/node@24.1.0)(jiti@1.21.6)(rollup@2.79.1)(sass@1.89.2)(terser@5.31.0)(typescript@5.8.3)(yaml@2.8.0)) github-slugger: 2.0.0 - typedoc: 0.28.7(typescript@5.8.3) - typedoc-plugin-markdown: 4.7.1(typedoc@0.28.7(typescript@5.8.3)) + typedoc: 0.28.8(typescript@5.8.3) + typedoc-plugin-markdown: 4.7.1(typedoc@0.28.8(typescript@5.8.3)) stream-replace-string@2.0.0: {} @@ -8420,28 +8284,11 @@ snapshots: is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 - typedoc-plugin-markdown@4.2.6(typedoc@0.26.6(typescript@5.5.4)): + typedoc-plugin-markdown@4.7.1(typedoc@0.28.8(typescript@5.8.3)): dependencies: - typedoc: 0.26.6(typescript@5.5.4) + typedoc: 0.28.8(typescript@5.8.3) - typedoc-plugin-markdown@4.7.1(typedoc@0.28.7(typescript@5.8.3)): - dependencies: - typedoc: 0.28.7(typescript@5.8.3) - - typedoc-plugin-mdn-links@3.2.11(typedoc@0.26.6(typescript@5.5.4)): - dependencies: - typedoc: 0.26.6(typescript@5.5.4) - - typedoc@0.26.6(typescript@5.5.4): - dependencies: - lunr: 2.3.9 - markdown-it: 14.1.0 - minimatch: 9.0.5 - shiki: 1.29.2 - typescript: 5.5.4 - yaml: 2.8.0 - - typedoc@0.28.7(typescript@5.8.3): + typedoc@0.28.8(typescript@5.8.3): dependencies: '@gerrit0/mini-shiki': 3.8.1 lunr: 2.3.9