diff --git a/package-lock.json b/package-lock.json index 1abfa7f0..ff15800c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@diplodoc/mermaid-extension": "^1.2.1", "@diplodoc/openapi-extension": "^2.1.0", "@diplodoc/prettier-config": "^2.0.0", - "@diplodoc/transform": "^4.8.2", + "@diplodoc/transform": "^4.13.0", "@diplodoc/tsconfig": "^1.0.2", "@octokit/core": "4.2.4", "@types/async": "^3.2.15", @@ -1601,17 +1601,17 @@ } }, "node_modules/@diplodoc/transform": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@diplodoc/transform/-/transform-4.11.0.tgz", - "integrity": "sha512-3JRC/6ISrdhPhZIenwTNAZyUJmD+o3vGRkeh4CD7+/Nh5eAlrcQ4/aRkuNIdFqE5sM1WeZLjKgiMsS0lz5RpZg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@diplodoc/transform/-/transform-4.13.0.tgz", + "integrity": "sha512-W0RtMjaWDj5DVbofZnz8Bsd1ZgriBuNqluciTSant42Hg4lJq0c0nJdRVVpOQaEaM9thJvYwPwtfwoEI0jNlJQ==", "dependencies": { "@diplodoc/tabs-extension": "^2.1.0", - "chalk": "4.1.2", + "chalk": "^4.1.2", "cheerio": "^1.0.0-rc.12", "css": "^3.0.0", "cssfilter": "0.0.10", "get-root-node-polyfill": "1.0.0", - "github-slugger": "1.4.0", + "github-slugger": "^1.5.0", "js-yaml": "^4.1.0", "lodash": "4.17.21", "markdown-it": "^13.0.2", @@ -1622,7 +1622,8 @@ "markdownlint": "^0.25.1", "markdownlint-rule-helpers": "0.17.2", "sanitize-html": "^2.11.0", - "slugify": "1.6.5" + "slugify": "1.6.5", + "svgo": "^3.2.0" }, "peerDependencies": { "highlight.js": "^10.0.3 || ^11" @@ -2849,6 +2850,14 @@ "node": ">=14.0.0" } }, + "node_modules/@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/@types/async": { "version": "3.2.24", "dev": true, @@ -4119,6 +4128,18 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/css-tree": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", + "dependencies": { + "mdn-data": "2.0.30", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, "node_modules/css-what": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", @@ -4135,6 +4156,36 @@ "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" }, + "node_modules/csso": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz", + "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==", + "dependencies": { + "css-tree": "~2.2.0" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/csso/node_modules/css-tree": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz", + "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==", + "dependencies": { + "mdn-data": "2.0.28", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/csso/node_modules/mdn-data": { + "version": "2.0.28", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz", + "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==" + }, "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", @@ -5627,9 +5678,9 @@ } }, "node_modules/github-slugger": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz", - "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.5.0.tgz", + "integrity": "sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==" }, "node_modules/glob": { "version": "8.1.0", @@ -7017,6 +7068,11 @@ "node": "*" } }, + "node_modules/mdn-data": { + "version": "2.0.30", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==" + }, "node_modules/mdurl": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", @@ -8748,6 +8804,38 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/svgo": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.2.0.tgz", + "integrity": "sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==", + "dependencies": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^5.1.0", + "css-tree": "^2.3.1", + "css-what": "^6.1.0", + "csso": "^5.0.5", + "picocolors": "^1.0.0" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/svgo" + } + }, + "node_modules/svgo/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" + } + }, "node_modules/synckit": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", diff --git a/package.json b/package.json index 8fd9ecf3..050c5d21 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@diplodoc/mermaid-extension": "^1.2.1", "@diplodoc/openapi-extension": "^2.1.0", "@diplodoc/prettier-config": "^2.0.0", - "@diplodoc/transform": "^4.8.2", + "@diplodoc/transform": "^4.13.0", "@diplodoc/tsconfig": "^1.0.2", "@octokit/core": "4.2.4", "@types/async": "^3.2.15", diff --git a/src/steps/processChangelogs.ts b/src/steps/processChangelogs.ts index ef466fe2..13eaaf53 100644 --- a/src/steps/processChangelogs.ts +++ b/src/steps/processChangelogs.ts @@ -5,11 +5,9 @@ import {readFile, unlink, writeFile} from 'node:fs/promises'; import {Lang} from '../constants'; type Language = string; -type MergedChangelogs = - | { - [language: Language]: Record>; - } - | Record>; +type MergedChangelogs = { + [language: Language]: Record>; +}; /* { @@ -55,7 +53,7 @@ export async function processChangelogs() { } const [lang, ...rest] = path.split('/'); - const [, hash] = rest.pop().split(/[-.]/); + const [, hash] = rest.pop()!.split(/[-.]/); const fullPath = '/' + rest.join('/');