diff --git a/demo/HtmlPreview.tsx b/demo/HtmlPreview.tsx index 8103ca86..34e6f3b7 100644 --- a/demo/HtmlPreview.tsx +++ b/demo/HtmlPreview.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import transform from '@doc-tools/transform'; +import transform from '@diplodoc/transform'; import type {ClassNameProps} from '../src/classname'; import {colorClassName, MarkupString} from '../src'; import {plugins} from './md-plugins'; diff --git a/demo/md-plugins.ts b/demo/md-plugins.ts index 46c72c68..ed7831d0 100644 --- a/demo/md-plugins.ts +++ b/demo/md-plugins.ts @@ -1,7 +1,7 @@ import type {PluginWithParams} from 'markdown-it/lib'; -import file from '@doc-tools/transform/lib/plugins/file'; -import imsize from '@doc-tools/transform/lib/plugins/imsize'; +import file from '@diplodoc/transform/lib/plugins/file'; +import imsize from '@diplodoc/transform/lib/plugins/imsize'; import sub from 'markdown-it-sub'; import ins from 'markdown-it-ins'; @@ -9,18 +9,18 @@ import mark from 'markdown-it-mark'; import color from 'markdown-it-color'; import math from 'markdown-it-katex'; -import meta from '@doc-tools/transform/lib/plugins/meta'; -import checkbox from '@doc-tools/transform/lib/plugins/checkbox'; -import deflist from '@doc-tools/transform/lib/plugins/deflist'; -import anchors from '@doc-tools/transform/lib/plugins/anchors'; -import cut from '@doc-tools/transform/lib/plugins/cut'; -import notes from '@doc-tools/transform/lib/plugins/notes'; -import tabs from '@doc-tools/transform/lib/plugins/tabs'; -import code from '@doc-tools/transform/lib/plugins/code'; -import sup from '@doc-tools/transform/lib/plugins/sup'; -import video from '@doc-tools/transform/lib/plugins/video'; -import monospace from '@doc-tools/transform/lib/plugins/monospace'; -import yfmTable from '@doc-tools/transform/lib/plugins/table'; +import meta from '@diplodoc/transform/lib/plugins/meta'; +import checkbox from '@diplodoc/transform/lib/plugins/checkbox'; +import deflist from '@diplodoc/transform/lib/plugins/deflist'; +import anchors from '@diplodoc/transform/lib/plugins/anchors'; +import cut from '@diplodoc/transform/lib/plugins/cut'; +import notes from '@diplodoc/transform/lib/plugins/notes'; +import tabs from '@diplodoc/transform/lib/plugins/tabs'; +import code from '@diplodoc/transform/lib/plugins/code'; +import sup from '@diplodoc/transform/lib/plugins/sup'; +import video from '@diplodoc/transform/lib/plugins/video'; +import monospace from '@diplodoc/transform/lib/plugins/monospace'; +import yfmTable from '@diplodoc/transform/lib/plugins/table'; const defaultPlugins: PluginWithParams[] = [ meta, diff --git a/package-lock.json b/package-lock.json index 83d691b9..09c668cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "tslib": "^2.3.1" }, "devDependencies": { - "@doc-tools/transform": "3.10.2", + "@diplodoc/transform": "4.2.1", "@gravity-ui/components": "2.0.0", "@gravity-ui/eslint-config": "1.0.2", "@gravity-ui/prettier-config": "1.0.1", @@ -60,7 +60,6 @@ "gulp": "4.0.2", "gulp-cli": "2.3.0", "gulp-concat": "2.6.1", - "gulp-esbuild": "0.11.2", "gulp-replace": "1.1.3", "gulp-sass": "5.1.0", "gulp-typescript": "5.0.1", @@ -83,7 +82,7 @@ "typescript": "^4.5.2" }, "peerDependencies": { - "@doc-tools/transform": "^2.16.0 || ^3.0.0", + "@diplodoc/transform": "^4.0.0", "@gravity-ui/components": "^2.0.0", "@gravity-ui/uikit": "^5.0.0", "lodash": "^4.17.20", @@ -2359,9 +2358,9 @@ } }, "node_modules/@diplodoc/tabs-extension": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@diplodoc/tabs-extension/-/tabs-extension-2.0.11.tgz", - "integrity": "sha512-hsKXvx3jOyu1JcIHGRpojdhK+mLAiLsDIyIQjKIi0lkJMxwR0G1Z6lkCR0fK4uoP3LSsBlgfeY48pCzTEVNHvg==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@diplodoc/tabs-extension/-/tabs-extension-2.0.12.tgz", + "integrity": "sha512-tljb1NM2RR0Jwh/qoO3Ci5gzpMqc5gWdtE1iLIABv4khJRneFrx57cNycFzcSnV+l2Bizyawn2SvPiX94sdhZg==", "dev": true, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" @@ -2372,23 +2371,17 @@ } } }, - "node_modules/@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", - "dev": true, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/@doc-tools/transform": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@doc-tools/transform/-/transform-3.10.2.tgz", - "integrity": "sha512-I20gn4cydKJigBfrt5KPiDFubvyP5ALi7fW3TTC7BqEGj0VEk/dVV3NQiX+5x7YKrajxRgA/wrPLpoxkXPNgfQ==", + "node_modules/@diplodoc/transform": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@diplodoc/transform/-/transform-4.2.1.tgz", + "integrity": "sha512-e9rU5Sdoe9ntdDn3vRNrgJ9/NqG5Vu6PHoiqEhIRcnK/x2Tp/GqUgZYcU5CLKNupx0SMqfv4GgGNzg+uJiWzXQ==", "dev": true, "dependencies": { - "@diplodoc/tabs-extension": "^2.0.10", + "@diplodoc/tabs-extension": "2.0.12", "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", "js-yaml": "^4.1.0", @@ -2412,7 +2405,7 @@ } } }, - "node_modules/@doc-tools/transform/node_modules/js-yaml": { + "node_modules/@diplodoc/transform/node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", @@ -2424,6 +2417,15 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", + "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "dev": true, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", @@ -9723,6 +9725,201 @@ "node": ">=10" } }, + "node_modules/cheerio": { + "version": "1.0.0-rc.12", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", + "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==", + "dev": true, + "dependencies": { + "cheerio-select": "^2.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "htmlparser2": "^8.0.1", + "parse5": "^7.0.0", + "parse5-htmlparser2-tree-adapter": "^7.0.0" + }, + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/cheeriojs/cheerio?sponsor=1" + } + }, + "node_modules/cheerio-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", + "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", + "dev": true, + "dependencies": { + "boolbase": "^1.0.0", + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cheerio-select/node_modules/css-select": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", + "dev": true, + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cheerio-select/node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/cheerio-select/node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/cheerio-select/node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "dev": true, + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/cheerio-select/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/cheerio/node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/cheerio/node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/cheerio/node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "dev": true, + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/cheerio/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/cheerio/node_modules/htmlparser2": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", + "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "dev": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1", + "entities": "^4.4.0" + } + }, + "node_modules/cheerio/node_modules/parse5": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dev": true, + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -10378,6 +10575,17 @@ "node": ">=8" } }, + "node_modules/css": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz", + "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==", + "dev": true, + "dependencies": { + "inherits": "^2.0.4", + "source-map": "^0.6.1", + "source-map-resolve": "^0.6.0" + } + }, "node_modules/css-functions-list": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz", @@ -10462,6 +10670,17 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/css/node_modules/source-map-resolve": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz", + "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==", + "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dev": true, + "dependencies": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0" + } + }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -10474,6 +10693,12 @@ "node": ">=4" } }, + "node_modules/cssfilter": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", + "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==", + "dev": true + }, "node_modules/cssom": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", @@ -12635,12 +12860,6 @@ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", "dev": true }, - "node_modules/fast-fifo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", - "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "dev": true - }, "node_modules/fast-glob": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", @@ -14243,533 +14462,81 @@ "node": ">= 0.10" } }, - "node_modules/gulp-esbuild": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/gulp-esbuild/-/gulp-esbuild-0.11.2.tgz", - "integrity": "sha512-skS81h8Rco/JpWxnU8IWFUnhYVSy9Y7ImpmpKNCf1N5+h4i8OMfaPzHF+F8X2rP+Rv0QarpTjHGodSU4OwRsTA==", + "node_modules/gulp-replace": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz", + "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==", "dev": true, "dependencies": { - "esbuild": "^0.18.7", - "plugin-error": "^2.0.1", - "vinyl": "^3.0.0" + "@types/node": "^14.14.41", + "@types/vinyl": "^2.0.4", + "istextorbinary": "^3.0.0", + "replacestream": "^4.0.3", + "yargs-parser": ">=5.0.0-security.0" }, "engines": { - "node": ">=12" + "node": ">=10" } }, - "node_modules/gulp-esbuild/node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", - "cpu": [ - "arm" - ], + "node_modules/gulp-replace/node_modules/@types/node": { + "version": "14.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz", + "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw==", + "dev": true + }, + "node_modules/gulp-sass": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-5.1.0.tgz", + "integrity": "sha512-7VT0uaF+VZCmkNBglfe1b34bxn/AfcssquLKVDYnCDJ3xNBaW7cUuI3p3BQmoKcoKFrs9jdzUxyb+u+NGfL4OQ==", "dev": true, - "optional": true, - "os": [ - "android" - ], + "dependencies": { + "lodash.clonedeep": "^4.5.0", + "picocolors": "^1.0.0", + "plugin-error": "^1.0.1", + "replace-ext": "^2.0.0", + "strip-ansi": "^6.0.1", + "vinyl-sourcemaps-apply": "^0.2.1" + }, "engines": { "node": ">=12" } }, - "node_modules/gulp-esbuild/node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", - "cpu": [ - "arm64" - ], + "node_modules/gulp-sass/node_modules/replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", "dev": true, - "optional": true, - "os": [ - "android" - ], "engines": { - "node": ">=12" + "node": ">= 10" } }, - "node_modules/gulp-esbuild/node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", - "cpu": [ - "x64" - ], + "node_modules/gulp-typescript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz", + "integrity": "sha512-YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ==", "dev": true, - "optional": true, - "os": [ - "android" - ], + "dependencies": { + "ansi-colors": "^3.0.5", + "plugin-error": "^1.0.1", + "source-map": "^0.7.3", + "through2": "^3.0.0", + "vinyl": "^2.1.0", + "vinyl-fs": "^3.0.3" + }, "engines": { - "node": ">=12" + "node": ">= 8" + }, + "peerDependencies": { + "typescript": "~2.7.1 || >=2.8.0-dev || >=2.9.0-dev || ~3.0.0 || >=3.0.0-dev || >=3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev" } }, - "node_modules/gulp-esbuild/node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", - "cpu": [ - "arm64" - ], + "node_modules/gulp-typescript/node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", "dev": true, - "optional": true, - "os": [ - "darwin" - ], "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-esbuild/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-esbuild/node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" - } - }, - "node_modules/gulp-esbuild/node_modules/plugin-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz", - "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==", - "dev": true, - "dependencies": { - "ansi-colors": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/gulp-esbuild/node_modules/replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/gulp-esbuild/node_modules/vinyl": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz", - "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==", - "dev": true, - "dependencies": { - "clone": "^2.1.2", - "clone-stats": "^1.0.0", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/gulp-replace": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz", - "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==", - "dev": true, - "dependencies": { - "@types/node": "^14.14.41", - "@types/vinyl": "^2.0.4", - "istextorbinary": "^3.0.0", - "replacestream": "^4.0.3", - "yargs-parser": ">=5.0.0-security.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/gulp-replace/node_modules/@types/node": { - "version": "14.18.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz", - "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw==", - "dev": true - }, - "node_modules/gulp-sass": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/gulp-sass/-/gulp-sass-5.1.0.tgz", - "integrity": "sha512-7VT0uaF+VZCmkNBglfe1b34bxn/AfcssquLKVDYnCDJ3xNBaW7cUuI3p3BQmoKcoKFrs9jdzUxyb+u+NGfL4OQ==", - "dev": true, - "dependencies": { - "lodash.clonedeep": "^4.5.0", - "picocolors": "^1.0.0", - "plugin-error": "^1.0.1", - "replace-ext": "^2.0.0", - "strip-ansi": "^6.0.1", - "vinyl-sourcemaps-apply": "^0.2.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/gulp-sass/node_modules/replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/gulp-typescript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz", - "integrity": "sha512-YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ==", - "dev": true, - "dependencies": { - "ansi-colors": "^3.0.5", - "plugin-error": "^1.0.1", - "source-map": "^0.7.3", - "through2": "^3.0.0", - "vinyl": "^2.1.0", - "vinyl-fs": "^3.0.3" - }, - "engines": { - "node": ">= 8" - }, - "peerDependencies": { - "typescript": "~2.7.1 || >=2.8.0-dev || >=2.9.0-dev || ~3.0.0 || >=3.0.0-dev || >=3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev" - } - }, - "node_modules/gulp-typescript/node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", - "dev": true, - "engines": { - "node": ">= 8" + "node": ">= 8" } }, "node_modules/gulp-typescript/node_modules/through2": { @@ -20204,6 +19971,58 @@ "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz", + "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==", + "dev": true, + "dependencies": { + "domhandler": "^5.0.2", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter/node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dev": true, + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -21183,12 +21002,6 @@ } ] }, - "node_modules/queue-tick": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", - "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", - "dev": true - }, "node_modules/quick-lru": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", @@ -22916,16 +22729,6 @@ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", "dev": true }, - "node_modules/streamx": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz", - "integrity": "sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==", - "dev": true, - "dependencies": { - "fast-fifo": "^1.1.0", - "queue-tick": "^1.0.1" - } - }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -23645,15 +23448,6 @@ "node": ">=10" } }, - "node_modules/teex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", - "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", - "dev": true, - "dependencies": { - "streamx": "^2.12.5" - } - }, "node_modules/telejson": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz", diff --git a/package.json b/package.json index aa3ddb81..790b48be 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "tslib": "^2.3.1" }, "devDependencies": { - "@doc-tools/transform": "3.10.2", + "@diplodoc/transform": "4.2.1", "@gravity-ui/components": "2.0.0", "@gravity-ui/eslint-config": "1.0.2", "@gravity-ui/prettier-config": "1.0.1", @@ -111,7 +111,7 @@ "typescript": "^4.5.2" }, "peerDependencies": { - "@doc-tools/transform": "^2.16.0 || ^3.0.0", + "@diplodoc/transform": "^4.0.0", "@gravity-ui/components": "^2.0.0", "@gravity-ui/uikit": "^5.0.0", "lodash": "^4.17.20", diff --git a/src/extensions/markdown/Html/spec.ts b/src/extensions/markdown/Html/spec.ts index df74f47b..ec6789a1 100644 --- a/src/extensions/markdown/Html/spec.ts +++ b/src/extensions/markdown/Html/spec.ts @@ -1,4 +1,4 @@ -import sanitize from '@doc-tools/transform/lib/sanitize'; +import sanitize from '@diplodoc/transform/lib/sanitize'; import type {NodeSpec} from 'prosemirror-model'; import {HtmlAttr, HtmlNode} from './const'; diff --git a/src/extensions/markdown/Superscript/SuperscriptSpecs/index.ts b/src/extensions/markdown/Superscript/SuperscriptSpecs/index.ts index 748d8047..5e320de5 100644 --- a/src/extensions/markdown/Superscript/SuperscriptSpecs/index.ts +++ b/src/extensions/markdown/Superscript/SuperscriptSpecs/index.ts @@ -1,5 +1,5 @@ -import log from '@doc-tools/transform/lib/log'; -import sup from '@doc-tools/transform/lib/plugins/sup'; +import log from '@diplodoc/transform/lib/log'; +import sup from '@diplodoc/transform/lib/plugins/sup'; import type {ExtensionAuto} from '../../../../core'; import {markTypeFactory} from '../../../../utils/schema'; diff --git a/src/extensions/yfm/Checkbox/CheckboxSpecs/index.ts b/src/extensions/yfm/Checkbox/CheckboxSpecs/index.ts index 9e363beb..3cfc81c5 100644 --- a/src/extensions/yfm/Checkbox/CheckboxSpecs/index.ts +++ b/src/extensions/yfm/Checkbox/CheckboxSpecs/index.ts @@ -1,5 +1,5 @@ import type {NodeSpec} from 'prosemirror-model'; -import checkboxPlugin from '@doc-tools/transform/lib/plugins/checkbox'; +import checkboxPlugin from '@diplodoc/transform/lib/plugins/checkbox'; import type {ExtensionAuto, YENodeSpec} from '../../../../core'; import {nodeTypeFactory} from '../../../../utils/schema'; diff --git a/src/extensions/yfm/ImgSize/ImgSizeSpecs/index.ts b/src/extensions/yfm/ImgSize/ImgSizeSpecs/index.ts index 0002f661..f3ca8f88 100644 --- a/src/extensions/yfm/ImgSize/ImgSizeSpecs/index.ts +++ b/src/extensions/yfm/ImgSize/ImgSizeSpecs/index.ts @@ -1,8 +1,8 @@ import isNumber from 'is-number'; import type {NodeSpec} from 'prosemirror-model'; -import imsize from '@doc-tools/transform/lib/plugins/imsize'; -import {ImsizeAttr as ImgSizeAttr} from '@doc-tools/transform/lib/plugins/imsize/const'; -import log from '@doc-tools/transform/lib/log'; +import imsize from '@diplodoc/transform/lib/plugins/imsize'; +import {ImsizeAttr as ImgSizeAttr} from '@diplodoc/transform/lib/plugins/imsize/const'; +import log from '@diplodoc/transform/lib/log'; import type {ExtensionAuto} from '../../../../core'; import {imageNodeName} from '../../../markdown/Image/const'; diff --git a/src/extensions/yfm/Monospace/MonospaceSpecs/index.ts b/src/extensions/yfm/Monospace/MonospaceSpecs/index.ts index 569baca2..ab5eaaf1 100644 --- a/src/extensions/yfm/Monospace/MonospaceSpecs/index.ts +++ b/src/extensions/yfm/Monospace/MonospaceSpecs/index.ts @@ -1,5 +1,5 @@ -import log from '@doc-tools/transform/lib/log'; -import yfmPlugin from '@doc-tools/transform/lib/plugins/monospace'; +import log from '@diplodoc/transform/lib/log'; +import yfmPlugin from '@diplodoc/transform/lib/plugins/monospace'; import type {ExtensionAuto} from '../../../../core'; import {markTypeFactory} from '../../../../utils/schema'; diff --git a/src/extensions/yfm/Video/VideoSpecs/index.ts b/src/extensions/yfm/Video/VideoSpecs/index.ts index 2d802db1..6b326278 100644 --- a/src/extensions/yfm/Video/VideoSpecs/index.ts +++ b/src/extensions/yfm/Video/VideoSpecs/index.ts @@ -2,7 +2,7 @@ import type {ExtensionAuto} from '../../../../core'; import {VideoAttr, videoNodeName} from './const'; import {createViewStub, serializeNodeToString} from './utils'; import {defaults, VideoPluginOptions, VideoService, videoPlugin, VideoToken} from './md-video'; -import log from '@doc-tools/transform/lib/log'; +import log from '@diplodoc/transform/lib/log'; // we don't support osf service const availableServices: ReadonlySet = new Set([ diff --git a/src/extensions/yfm/Video/VideoSpecs/md-video.ts b/src/extensions/yfm/Video/VideoSpecs/md-video.ts index df907cda..9ea52a38 100644 --- a/src/extensions/yfm/Video/VideoSpecs/md-video.ts +++ b/src/extensions/yfm/Video/VideoSpecs/md-video.ts @@ -1,5 +1,5 @@ -import video from '@doc-tools/transform/lib/plugins/video'; +import video from '@diplodoc/transform/lib/plugins/video'; export const videoPlugin = video; -export {VideoService, defaults} from '@doc-tools/transform/lib/plugins/video/const'; -export type {VideoPluginOptions, VideoToken} from '@doc-tools/transform/lib/plugins/video/types'; -export {parseVideoUrl} from '@doc-tools/transform/lib/plugins/video/parsers'; +export {VideoService, defaults} from '@diplodoc/transform/lib/plugins/video/const'; +export type {VideoPluginOptions, VideoToken} from '@diplodoc/transform/lib/plugins/video/types'; +export {parseVideoUrl} from '@diplodoc/transform/lib/plugins/video/parsers'; diff --git a/src/extensions/yfm/YfmCut/YfmCutSpecs/index.ts b/src/extensions/yfm/YfmCut/YfmCutSpecs/index.ts index 60bab752..16130979 100644 --- a/src/extensions/yfm/YfmCut/YfmCutSpecs/index.ts +++ b/src/extensions/yfm/YfmCut/YfmCutSpecs/index.ts @@ -1,5 +1,5 @@ -import log from '@doc-tools/transform/lib/log'; -import yfmPlugin from '@doc-tools/transform/lib/plugins/cut'; +import log from '@diplodoc/transform/lib/log'; +import yfmPlugin from '@diplodoc/transform/lib/plugins/cut'; import type {NodeSpec} from 'prosemirror-model'; import type {ExtensionAuto, YENodeSpec} from '../../../../core'; diff --git a/src/extensions/yfm/YfmDist/index.ts b/src/extensions/yfm/YfmDist/index.ts index 881b09a3..707a16ff 100644 --- a/src/extensions/yfm/YfmDist/index.ts +++ b/src/extensions/yfm/YfmDist/index.ts @@ -1,7 +1,7 @@ import {Plugin} from 'prosemirror-state'; -import '@doc-tools/transform/dist/js/yfm'; -import '@doc-tools/transform/dist/css/yfm.css'; +import '@diplodoc/transform/dist/js/yfm'; +import '@diplodoc/transform/dist/css/yfm.css'; import './yfm.scss'; import type {ExtensionAuto} from '../../../core'; diff --git a/src/extensions/yfm/YfmFile/YfmFileSpecs/const.ts b/src/extensions/yfm/YfmFile/YfmFileSpecs/const.ts index ef2fbc2d..e39b0b7f 100644 --- a/src/extensions/yfm/YfmFile/YfmFileSpecs/const.ts +++ b/src/extensions/yfm/YfmFile/YfmFileSpecs/const.ts @@ -6,7 +6,7 @@ import { FILE_TO_LINK_ATTRS_MAP, KNOWN_ATTRS as FILE_KNOWN_ATTRS, REQUIRED_ATTRS as FILE_REQUIRED_ATTRS, -} from '@doc-tools/transform/lib/plugins/file/const'; +} from '@diplodoc/transform/lib/plugins/file/const'; export const yfmFileNodeName = FILE_TOKEN; diff --git a/src/extensions/yfm/YfmFile/YfmFileSpecs/index.ts b/src/extensions/yfm/YfmFile/YfmFileSpecs/index.ts index 25602338..ce2fcc66 100644 --- a/src/extensions/yfm/YfmFile/YfmFileSpecs/index.ts +++ b/src/extensions/yfm/YfmFile/YfmFileSpecs/index.ts @@ -1,5 +1,5 @@ -import yfmPlugin from '@doc-tools/transform/lib/plugins/file'; -import {FileClassName, LinkHtmlAttr, PREFIX} from '@doc-tools/transform/lib/plugins/file/const'; +import yfmPlugin from '@diplodoc/transform/lib/plugins/file'; +import {FileClassName, LinkHtmlAttr, PREFIX} from '@diplodoc/transform/lib/plugins/file/const'; import type {Extension} from '../../../../core'; import {nodeTypeFactory} from '../../../../utils/schema'; diff --git a/src/extensions/yfm/YfmNote/YfmNoteSpecs/index.ts b/src/extensions/yfm/YfmNote/YfmNoteSpecs/index.ts index 5711eb99..74b2cb93 100644 --- a/src/extensions/yfm/YfmNote/YfmNoteSpecs/index.ts +++ b/src/extensions/yfm/YfmNote/YfmNoteSpecs/index.ts @@ -1,5 +1,5 @@ -import log from '@doc-tools/transform/lib/log'; -import yfmPlugin from '@doc-tools/transform/lib/plugins/notes'; +import log from '@diplodoc/transform/lib/log'; +import yfmPlugin from '@diplodoc/transform/lib/plugins/notes'; import type {NodeSpec} from 'prosemirror-model'; import type {ExtensionAuto} from '../../../../core'; diff --git a/src/extensions/yfm/YfmTable/YfmTableSpecs/index.ts b/src/extensions/yfm/YfmTable/YfmTableSpecs/index.ts index 879bbcef..68f769f8 100644 --- a/src/extensions/yfm/YfmTable/YfmTableSpecs/index.ts +++ b/src/extensions/yfm/YfmTable/YfmTableSpecs/index.ts @@ -1,5 +1,5 @@ -import log from '@doc-tools/transform/lib/log'; -import yfmTable from '@doc-tools/transform/lib/plugins/table'; +import log from '@diplodoc/transform/lib/log'; +import yfmTable from '@diplodoc/transform/lib/plugins/table'; import type {NodeSpec} from 'prosemirror-model'; import type {ExtensionWithOptions} from '../../../../core'; diff --git a/src/extensions/yfm/YfmTabs/YfmTabs.test.ts b/src/extensions/yfm/YfmTabs/YfmTabs.test.ts index 06272216..a094ff4a 100644 --- a/src/extensions/yfm/YfmTabs/YfmTabs.test.ts +++ b/src/extensions/yfm/YfmTabs/YfmTabs.test.ts @@ -69,7 +69,7 @@ describe('YfmTabs extension', () => { role: 'tab', 'aria-controls': generatedId, 'aria-selected': 'true', - tabindex: '0', + tabindex: '-1', 'data-diplodoc-is-active': 'true', 'data-diplodoc-id': 'panel-title-1', 'data-diplodoc-key': 'panel%20title%201', @@ -83,7 +83,7 @@ describe('YfmTabs extension', () => { role: 'tab', 'aria-controls': generatedId, 'aria-selected': 'false', - tabindex: '-1', + tabindex: '0', 'data-diplodoc-is-active': 'false', 'data-diplodoc-id': 'panel-title-2', 'data-diplodoc-key': 'panel%20title%202', diff --git a/src/extensions/yfm/YfmTabs/YfmTabsSpecs/index.ts b/src/extensions/yfm/YfmTabs/YfmTabsSpecs/index.ts index 459a944d..92c49bc4 100644 --- a/src/extensions/yfm/YfmTabs/YfmTabsSpecs/index.ts +++ b/src/extensions/yfm/YfmTabs/YfmTabsSpecs/index.ts @@ -1,5 +1,5 @@ -import log from '@doc-tools/transform/lib/log'; -import yfmPlugin from '@doc-tools/transform/lib/plugins/tabs'; +import log from '@diplodoc/transform/lib/log'; +import yfmPlugin from '@diplodoc/transform/lib/plugins/tabs'; import {NodeSpec} from 'prosemirror-model'; import type {ExtensionAuto, YENodeSpec} from '../../../../core'; diff --git a/src/extensions/yfm/YfmTabs/actions.ts b/src/extensions/yfm/YfmTabs/actions.ts index 7a045166..ae0a3c16 100644 --- a/src/extensions/yfm/YfmTabs/actions.ts +++ b/src/extensions/yfm/YfmTabs/actions.ts @@ -1,4 +1,4 @@ -import {generateID} from '@doc-tools/transform/lib/plugins/utils'; +import {generateID} from '@diplodoc/transform/lib/plugins/utils'; import type {Command} from 'prosemirror-state'; import {tabPanelType, tabsListType, tabsType, tabType} from '.'; import {pType} from '../../base/BaseSchema'; diff --git a/src/extensions/yfm/YfmTabs/plugins.ts b/src/extensions/yfm/YfmTabs/plugins.ts index f6eb4665..b2c2b0dc 100644 --- a/src/extensions/yfm/YfmTabs/plugins.ts +++ b/src/extensions/yfm/YfmTabs/plugins.ts @@ -17,7 +17,7 @@ import { } from './const'; import {findChildIndex} from '../../../table-utils/helpers'; import {get$Cursor, isTextSelection} from '../../../utils/selection'; -import {generateID} from '@doc-tools/transform/lib/plugins/utils'; +import {generateID} from '@diplodoc/transform/lib/plugins/utils'; import { createFakeParagraph, findFakeParaPosClosestToPos, diff --git a/tests/esbuild-test/esbuild-tester.js b/tests/esbuild-test/esbuild-tester.js index 94f8f201..c4df83d0 100644 --- a/tests/esbuild-test/esbuild-tester.js +++ b/tests/esbuild-test/esbuild-tester.js @@ -6,7 +6,7 @@ const esbuild = require('esbuild'); const fs = require('fs'); -const fsPrmosises = require('fs/promises'); +const fsPromises = require('fs/promises'); const path = require('path'); const {sassPlugin} = require('esbuild-sass-plugin'); @@ -15,6 +15,7 @@ const paths = { tempTest: path.join(__dirname, './temp-test.mjs'), localBuild: path.join(__dirname, './build'), compiledEsBuildToTest: path.join(__dirname, './build/esbuild-to-test.mjs'), + aliases: path.join(__dirname, './node-module-alias-fallback.js'), }; const esbuildOptions = { @@ -32,6 +33,8 @@ const esbuildOptions = { '.js': '.mjs', }, plugins: [sassPlugin()], + platform: 'browser', + alias: ['fs', 'path', 'stream'].reduce((acc, name) => ({...acc, [name]: paths.aliases}), {}), }; esbuild @@ -39,7 +42,7 @@ esbuild .then(async () => { const allExports = (await import(paths.compiledEsBuildToTest)).default; // Make a file that exports everything from src - await fsPrmosises.writeFile(paths.tempTest, `import {${allExports}} from '../../src'`); + await fsPromises.writeFile(paths.tempTest, `import {${allExports}} from '../../src'`); await esbuild.build({...esbuildOptions, entryPoints: [paths.tempTest]}); }) .finally(() => { diff --git a/tests/esbuild-test/node-module-alias-fallback.js b/tests/esbuild-test/node-module-alias-fallback.js new file mode 100644 index 00000000..7646bbd1 --- /dev/null +++ b/tests/esbuild-test/node-module-alias-fallback.js @@ -0,0 +1 @@ +export default null;