diff --git a/packages/contentful-slatejs-adapter/package.json b/packages/contentful-slatejs-adapter/package.json index 862b498e..ee6a85cd 100644 --- a/packages/contentful-slatejs-adapter/package.json +++ b/packages/contentful-slatejs-adapter/package.json @@ -41,8 +41,7 @@ "lodash.camelcase": "^4.3.0", "prompt": "^1.0.0", "rimraf": "^2.6.1", - "ts-jest": "^29.1.2", - "typescript": "^5.3.2" + "ts-jest": "^29.1.2" }, "publishConfig": { "access": "public", diff --git a/packages/rich-text-from-markdown/package.json b/packages/rich-text-from-markdown/package.json index 029be833..95def6ee 100644 --- a/packages/rich-text-from-markdown/package.json +++ b/packages/rich-text-from-markdown/package.json @@ -46,8 +46,7 @@ "faker": "^4.1.0", "rimraf": "^2.6.3", "ts-jest": "^29.1.2", - "tslint": "^6.1.3", - "typescript": "^5.3.2" + "tslint": "^6.1.3" }, "bugs": { "url": "https://github.com/contentful/rich-text/issues" diff --git a/packages/rich-text-from-markdown/src/index.ts b/packages/rich-text-from-markdown/src/index.ts index 437a0bc2..2f9b2540 100644 --- a/packages/rich-text-from-markdown/src/index.ts +++ b/packages/rich-text-from-markdown/src/index.ts @@ -1,19 +1,19 @@ -import _ from 'lodash'; -import unified from 'unified'; -import markdown from 'remark-parse'; -import gfm from 'remark-gfm'; import { - Document, - Node, - Block, BLOCKS, - TopLevelBlock, - INLINES, + Block, + Document, Hyperlink, - Text, + INLINES, Inline, + Node, + Text, + TopLevelBlock, } from '@contentful/rich-text-types'; -import { MarkdownNode, MarkdownLinkNode, MarkdownTree } from './types'; +import _ from 'lodash'; +import gfm from 'remark-gfm'; +import markdown from 'remark-parse'; +import unified from 'unified'; +import { MarkdownLinkNode, MarkdownNode, MarkdownTree } from './types'; const markdownNodeTypes = new Map([ ['paragraph', BLOCKS.PARAGRAPH], @@ -194,7 +194,7 @@ const buildText = async ( ): Promise> => { const nodeType = nodeTypeFor(node); const markType = markTypeFor(node); - const marks = [...appliedMarksTypes]; + const marks = Array.from(appliedMarksTypes); if (markType) { marks.push(markType); } diff --git a/packages/rich-text-html-renderer/package.json b/packages/rich-text-html-renderer/package.json index b7d1bdea..a1dfaa14 100644 --- a/packages/rich-text-html-renderer/package.json +++ b/packages/rich-text-html-renderer/package.json @@ -35,7 +35,6 @@ "lodash.clonedeep": "^4.5.0", "rimraf": "^2.6.3", "ts-jest": "^29.1.2", - "tslint": "^6.1.3", - "typescript": "^5.3.2" + "tslint": "^6.1.3" } } diff --git a/packages/rich-text-links/package.json b/packages/rich-text-links/package.json index 54472b49..8dcd78cf 100644 --- a/packages/rich-text-links/package.json +++ b/packages/rich-text-links/package.json @@ -31,7 +31,6 @@ "devDependencies": { "rimraf": "^2.6.3", "ts-jest": "^29.1.2", - "tslint": "^6.1.3", - "typescript": "^5.3.2" + "tslint": "^6.1.3" } } diff --git a/packages/rich-text-plain-text-renderer/package.json b/packages/rich-text-plain-text-renderer/package.json index da1c48c3..615e2779 100644 --- a/packages/rich-text-plain-text-renderer/package.json +++ b/packages/rich-text-plain-text-renderer/package.json @@ -31,7 +31,6 @@ "devDependencies": { "rimraf": "^2.6.3", "ts-jest": "^29.1.2", - "tslint": "^6.1.3", - "typescript": "^5.3.2" + "tslint": "^6.1.3" } } diff --git a/yarn.lock b/yarn.lock index 1cba5897..48a18bee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7552,11 +7552,6 @@ typescript@5.4.5, "typescript@>=3 < 6": resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== -typescript@^5.3.2: - version "5.3.3" - resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== - typescript@~5.1.0: version "5.1.6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"