From f48aa83482de951615b07424ad9aa5e5e1d9aa23 Mon Sep 17 00:00:00 2001 From: Dominik Biedebach Date: Sat, 10 Sep 2022 13:56:59 +0200 Subject: [PATCH] docs(extension/code-block-lowlight): updated lowlight to 2.8 in demos, updated demos with lowlight --- demos/package.json | 4 +- .../CodeBlockLanguage/React/index.jsx | 4 +- .../Examples/CodeBlockLanguage/Vue/index.vue | 4 +- demos/src/Experiments/All/Vue/index.vue | 2 +- .../Nodes/CodeBlockLowlight/React/index.jsx | 4 +- .../src/Nodes/CodeBlockLowlight/Vue/index.vue | 4 +- package-lock.json | 128 +++++++++++------- 7 files changed, 89 insertions(+), 61 deletions(-) diff --git a/demos/package.json b/demos/package.json index d85dc52f..f39f1a39 100644 --- a/demos/package.json +++ b/demos/package.json @@ -11,7 +11,7 @@ "@hocuspocus/provider": "^1.0.0-alpha.29", "d3": "^7.3.0", "fast-glob": "^3.2.11", - "lowlight": "^1.20.0", + "lowlight": "^2.7.0", "remixicon": "^2.5.0", "shiki": "^0.10.0", "simplify-js": "^1.2.4", @@ -39,4 +39,4 @@ "vue": "^3.0.5", "vue-router": "^4.0.11" } -} \ No newline at end of file +} diff --git a/demos/src/Examples/CodeBlockLanguage/React/index.jsx b/demos/src/Examples/CodeBlockLanguage/React/index.jsx index b3c0f627..221b355a 100644 --- a/demos/src/Examples/CodeBlockLanguage/React/index.jsx +++ b/demos/src/Examples/CodeBlockLanguage/React/index.jsx @@ -1,5 +1,5 @@ // load specific languages only -// import lowlight from 'lowlight/lib/core' +// import { lowlight } from 'lowlight/lib/core' // import javascript from 'highlight.js/lib/languages/javascript' // lowlight.registerLanguage('javascript', javascript) import './styles.scss' @@ -10,7 +10,7 @@ import Paragraph from '@tiptap/extension-paragraph' import Text from '@tiptap/extension-text' import { EditorContent, ReactNodeViewRenderer, useEditor } from '@tiptap/react' // load all highlight.js languages -import lowlight from 'lowlight' +import { lowlight } from 'lowlight' import React from 'react' import CodeBlockComponent from './CodeBlockComponent' diff --git a/demos/src/Examples/CodeBlockLanguage/Vue/index.vue b/demos/src/Examples/CodeBlockLanguage/Vue/index.vue index 3c080f22..63afce81 100644 --- a/demos/src/Examples/CodeBlockLanguage/Vue/index.vue +++ b/demos/src/Examples/CodeBlockLanguage/Vue/index.vue @@ -14,12 +14,12 @@ import Paragraph from '@tiptap/extension-paragraph' import Text from '@tiptap/extension-text' import { Editor, EditorContent, VueNodeViewRenderer } from '@tiptap/vue-3' // load all highlight.js languages -import lowlight from 'lowlight' +import { lowlight } from 'lowlight' import CodeBlockComponent from './CodeBlockComponent.vue' // load specific languages only -// import lowlight from 'lowlight/lib/core' +// import { lowlight } from 'lowlight/lib/core' // import javascript from 'highlight.js/lib/languages/javascript' // lowlight.registerLanguage('javascript', javascript) diff --git a/demos/src/Experiments/All/Vue/index.vue b/demos/src/Experiments/All/Vue/index.vue index 6dcd54da..f290e3f1 100644 --- a/demos/src/Experiments/All/Vue/index.vue +++ b/demos/src/Experiments/All/Vue/index.vue @@ -106,7 +106,7 @@ import TextAlign from '@tiptap/extension-text-align' import TextStyle from '@tiptap/extension-text-style' import Underline from '@tiptap/extension-underline' import { Editor, EditorContent } from '@tiptap/vue-3' -import lowlight from 'lowlight' +import { lowlight } from 'lowlight' export default { components: { diff --git a/demos/src/Nodes/CodeBlockLowlight/React/index.jsx b/demos/src/Nodes/CodeBlockLowlight/React/index.jsx index 3e5e703c..ea711527 100644 --- a/demos/src/Nodes/CodeBlockLowlight/React/index.jsx +++ b/demos/src/Nodes/CodeBlockLowlight/React/index.jsx @@ -1,5 +1,5 @@ // load specific languages only -// import lowlight from 'lowlight/lib/core' +// import { lowlight } from 'lowlight/lib/core' // import javascript from 'highlight.js/lib/languages/javascript' // lowlight.registerLanguage('javascript', javascript) import './styles.scss' @@ -10,7 +10,7 @@ import Paragraph from '@tiptap/extension-paragraph' import Text from '@tiptap/extension-text' import { EditorContent, useEditor } from '@tiptap/react' // load all highlight.js languages -import lowlight from 'lowlight' +import { lowlight } from 'lowlight' import React from 'react' export default () => { diff --git a/demos/src/Nodes/CodeBlockLowlight/Vue/index.vue b/demos/src/Nodes/CodeBlockLowlight/Vue/index.vue index 8fcabd34..33160fe4 100644 --- a/demos/src/Nodes/CodeBlockLowlight/Vue/index.vue +++ b/demos/src/Nodes/CodeBlockLowlight/Vue/index.vue @@ -18,10 +18,10 @@ import Paragraph from '@tiptap/extension-paragraph' import Text from '@tiptap/extension-text' import { Editor, EditorContent } from '@tiptap/vue-3' // load all highlight.js languages -import lowlight from 'lowlight' +import { lowlight } from 'lowlight' // load specific languages only -// import lowlight from 'lowlight/lib/core' +// import { lowlight } from 'lowlight/lib/core' // import javascript from 'highlight.js/lib/languages/javascript' // lowlight.registerLanguage('javascript', javascript) diff --git a/package-lock.json b/package-lock.json index a526c98c..fcced238 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "@hocuspocus/provider": "^1.0.0-alpha.29", "d3": "^7.3.0", "fast-glob": "^3.2.11", - "lowlight": "^1.20.0", + "lowlight": "^2.7.0", "remixicon": "^2.5.0", "shiki": "^0.10.0", "simplify-js": "^1.2.4", @@ -6747,6 +6747,14 @@ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, + "node_modules/@types/hast": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", + "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", @@ -6847,6 +6855,11 @@ "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", "dev": true }, + "node_modules/@types/unist": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", + "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" + }, "node_modules/@types/uuid": { "version": "8.3.4", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", @@ -11245,9 +11258,9 @@ } }, "node_modules/fault": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz", + "integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==", "dependencies": { "format": "^0.2.0" }, @@ -12012,11 +12025,11 @@ "dev": true }, "node_modules/highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz", + "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==", "engines": { - "node": "*" + "node": ">=12.0.0" } }, "node_modules/hosted-git-info": { @@ -14144,12 +14157,13 @@ } }, "node_modules/lowlight": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", - "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-2.7.0.tgz", + "integrity": "sha512-RRdrHalFfjpxL91ITTX7KhJYH3QmX5bW9Uie2D2E5GPIR3XBYDYhScBjE291ewFZkStz/k2PN9KC+8deNLiI3Q==", "dependencies": { - "fault": "^1.0.0", - "highlight.js": "~10.7.0" + "@types/hast": "^2.0.0", + "fault": "^2.0.0", + "highlight.js": "~11.6.0" }, "funding": { "type": "github", @@ -19929,7 +19943,7 @@ }, "packages/core": { "name": "@tiptap/core", - "version": "2.0.0-beta.182", + "version": "2.0.0-beta.183", "license": "MIT", "dependencies": { "prosemirror-commands": "1.3.0", @@ -19971,7 +19985,7 @@ }, "packages/extension-bubble-menu": { "name": "@tiptap/extension-bubble-menu", - "version": "2.0.0-beta.61", + "version": "2.0.0-beta.62", "license": "MIT", "dependencies": { "prosemirror-state": "1.4.1", @@ -20016,7 +20030,7 @@ }, "packages/extension-code": { "name": "@tiptap/extension-code", - "version": "2.0.0-beta.28", + "version": "2.0.0-beta.29", "license": "MIT", "funding": { "type": "github", @@ -20314,10 +20328,10 @@ }, "packages/extension-mention": { "name": "@tiptap/extension-mention", - "version": "2.0.0-beta.102", + "version": "2.0.0-beta.103", "license": "MIT", "dependencies": { - "@tiptap/suggestion": "^2.0.0-beta.97", + "@tiptap/suggestion": "^2.0.0-beta.98", "prosemirror-model": "1.18.1", "prosemirror-state": "1.4.1" }, @@ -20384,7 +20398,7 @@ }, "packages/extension-subscript": { "name": "@tiptap/extension-subscript", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "license": "MIT", "funding": { "type": "github", @@ -20559,10 +20573,10 @@ }, "packages/html": { "name": "@tiptap/html", - "version": "2.0.0-beta.181", + "version": "2.0.0-beta.182", "license": "MIT", "dependencies": { - "@tiptap/core": "^2.0.0-beta.182", + "@tiptap/core": "^2.0.0-beta.183", "prosemirror-model": "1.18.1", "zeed-dom": "^0.9.19" }, @@ -20573,10 +20587,10 @@ }, "packages/react": { "name": "@tiptap/react", - "version": "2.0.0-beta.114", + "version": "2.0.0-beta.115", "license": "MIT", "dependencies": { - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.62", "@tiptap/extension-floating-menu": "^2.0.0-beta.56", "prosemirror-view": "1.26.2" }, @@ -20598,14 +20612,14 @@ }, "packages/starter-kit": { "name": "@tiptap/starter-kit", - "version": "2.0.0-beta.191", + "version": "2.0.0-beta.192", "license": "MIT", "dependencies": { - "@tiptap/core": "^2.0.0-beta.182", + "@tiptap/core": "^2.0.0-beta.183", "@tiptap/extension-blockquote": "^2.0.0-beta.29", "@tiptap/extension-bold": "^2.0.0-beta.28", "@tiptap/extension-bullet-list": "^2.0.0-beta.29", - "@tiptap/extension-code": "^2.0.0-beta.28", + "@tiptap/extension-code": "^2.0.0-beta.29", "@tiptap/extension-code-block": "^2.0.0-beta.42", "@tiptap/extension-document": "^2.0.0-beta.17", "@tiptap/extension-dropcursor": "^2.0.0-beta.29", @@ -20628,7 +20642,7 @@ }, "packages/suggestion": { "name": "@tiptap/suggestion", - "version": "2.0.0-beta.97", + "version": "2.0.0-beta.98", "license": "MIT", "dependencies": { "prosemirror-model": "1.18.1", @@ -20645,10 +20659,10 @@ }, "packages/vue-2": { "name": "@tiptap/vue-2", - "version": "2.0.0-beta.84", + "version": "2.0.0-beta.85", "license": "MIT", "dependencies": { - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.62", "@tiptap/extension-floating-menu": "^2.0.0-beta.56", "prosemirror-view": "1.26.2" }, @@ -20672,10 +20686,10 @@ }, "packages/vue-3": { "name": "@tiptap/vue-3", - "version": "2.0.0-beta.96", + "version": "2.0.0-beta.97", "license": "MIT", "dependencies": { - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.62", "@tiptap/extension-floating-menu": "^2.0.0-beta.56", "prosemirror-state": "1.4.1", "prosemirror-view": "1.26.2" @@ -25824,7 +25838,7 @@ "@tiptap/extension-mention": { "version": "file:packages/extension-mention", "requires": { - "@tiptap/suggestion": "^2.0.0-beta.97", + "@tiptap/suggestion": "^2.0.0-beta.98", "prosemirror-model": "1.18.1", "prosemirror-state": "1.4.1" } @@ -25913,7 +25927,7 @@ "@tiptap/html": { "version": "file:packages/html", "requires": { - "@tiptap/core": "^2.0.0-beta.182", + "@tiptap/core": "^2.0.0-beta.183", "prosemirror-model": "1.18.1", "zeed-dom": "^0.9.19" } @@ -25921,7 +25935,7 @@ "@tiptap/react": { "version": "file:packages/react", "requires": { - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.62", "@tiptap/extension-floating-menu": "^2.0.0-beta.56", "@types/react": "^18.0.1", "@types/react-dom": "^18.0.0", @@ -25933,11 +25947,11 @@ "@tiptap/starter-kit": { "version": "file:packages/starter-kit", "requires": { - "@tiptap/core": "^2.0.0-beta.182", + "@tiptap/core": "^2.0.0-beta.183", "@tiptap/extension-blockquote": "^2.0.0-beta.29", "@tiptap/extension-bold": "^2.0.0-beta.28", "@tiptap/extension-bullet-list": "^2.0.0-beta.29", - "@tiptap/extension-code": "^2.0.0-beta.28", + "@tiptap/extension-code": "^2.0.0-beta.29", "@tiptap/extension-code-block": "^2.0.0-beta.42", "@tiptap/extension-document": "^2.0.0-beta.17", "@tiptap/extension-dropcursor": "^2.0.0-beta.29", @@ -25965,7 +25979,7 @@ "@tiptap/vue-2": { "version": "file:packages/vue-2", "requires": { - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.62", "@tiptap/extension-floating-menu": "^2.0.0-beta.56", "prosemirror-view": "1.26.2", "vue": "^2.6.0" @@ -25982,7 +25996,7 @@ "@tiptap/vue-3": { "version": "file:packages/vue-3", "requires": { - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.62", "@tiptap/extension-floating-menu": "^2.0.0-beta.56", "prosemirror-state": "1.4.1", "prosemirror-view": "1.26.2", @@ -26021,6 +26035,14 @@ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, + "@types/hast": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", + "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", + "requires": { + "@types/unist": "*" + } + }, "@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", @@ -26121,6 +26143,11 @@ "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", "dev": true }, + "@types/unist": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", + "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" + }, "@types/uuid": { "version": "8.3.4", "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", @@ -29382,9 +29409,9 @@ } }, "fault": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz", + "integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==", "requires": { "format": "^0.2.0" } @@ -29963,9 +29990,9 @@ "dev": true }, "highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" + "version": "11.6.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz", + "integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==" }, "hosted-git-info": { "version": "4.1.0", @@ -31520,12 +31547,13 @@ } }, "lowlight": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", - "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-2.7.0.tgz", + "integrity": "sha512-RRdrHalFfjpxL91ITTX7KhJYH3QmX5bW9Uie2D2E5GPIR3XBYDYhScBjE291ewFZkStz/k2PN9KC+8deNLiI3Q==", "requires": { - "fault": "^1.0.0", - "highlight.js": "~10.7.0" + "@types/hast": "^2.0.0", + "fault": "^2.0.0", + "highlight.js": "~11.6.0" } }, "lru-cache": { @@ -34842,7 +34870,7 @@ "d3": "^7.3.0", "fast-glob": "^3.2.11", "iframe-resizer": "^4.3.2", - "lowlight": "^1.20.0", + "lowlight": "^2.7.0", "postcss": "^8.4.6", "react": "^18.0.0", "react-dom": "^18.0.0",