Merge pull request #3926 from nextcloud/backport/3898/stable23

[stable23] Switch to 'markdown-it-task-checkbox' for rendering of task lists
This commit is contained in:
Julius Härtl
2022-08-01 22:05:56 +02:00
committed by GitHub
3 changed files with 16 additions and 12 deletions

22
package-lock.json generated
View File

@@ -5,7 +5,8 @@
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "1.6.0", "name": "deck",
"version": "1.6.3",
"license": "agpl", "license": "agpl",
"dependencies": { "dependencies": {
"@babel/polyfill": "^7.12.1", "@babel/polyfill": "^7.12.1",
@@ -27,7 +28,7 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"markdown-it": "^12.2.0", "markdown-it": "^12.2.0",
"markdown-it-link-attributes": "^3.0.0", "markdown-it-link-attributes": "^3.0.0",
"markdown-it-task-lists": "^2.1.1", "markdown-it-task-checkbox": "^1.0.6",
"moment": "^2.29.1", "moment": "^2.29.1",
"nextcloud-vue-collections": "^0.9.0", "nextcloud-vue-collections": "^0.9.0",
"p-queue": "^6.6.2", "p-queue": "^6.6.2",
@@ -55,8 +56,8 @@
"vue-jest": "^3.0.7" "vue-jest": "^3.0.7"
}, },
"engines": { "engines": {
"node": ">=14.0.0", "node": "^14.0.0",
"npm": ">=7.0.0" "npm": "^7.0.0"
} }
}, },
"node_modules/@babel/cli": { "node_modules/@babel/cli": {
@@ -12755,9 +12756,10 @@
"resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-3.0.0.tgz", "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-3.0.0.tgz",
"integrity": "sha512-B34ySxVeo6MuEGSPCWyIYryuXINOvngNZL87Mp7YYfKIf6DcD837+lXA8mo6EBbauKsnGz22ZH0zsbOiQRWTNg==" "integrity": "sha512-B34ySxVeo6MuEGSPCWyIYryuXINOvngNZL87Mp7YYfKIf6DcD837+lXA8mo6EBbauKsnGz22ZH0zsbOiQRWTNg=="
}, },
"node_modules/markdown-it-task-lists": { "node_modules/markdown-it-task-checkbox": {
"version": "2.1.1", "version": "1.0.6",
"license": "ISC" "resolved": "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz",
"integrity": "sha512-7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="
}, },
"node_modules/markdown-it/node_modules/argparse": { "node_modules/markdown-it/node_modules/argparse": {
"version": "2.0.1", "version": "2.0.1",
@@ -28231,8 +28233,10 @@
"resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-3.0.0.tgz", "resolved": "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-3.0.0.tgz",
"integrity": "sha512-B34ySxVeo6MuEGSPCWyIYryuXINOvngNZL87Mp7YYfKIf6DcD837+lXA8mo6EBbauKsnGz22ZH0zsbOiQRWTNg==" "integrity": "sha512-B34ySxVeo6MuEGSPCWyIYryuXINOvngNZL87Mp7YYfKIf6DcD837+lXA8mo6EBbauKsnGz22ZH0zsbOiQRWTNg=="
}, },
"markdown-it-task-lists": { "markdown-it-task-checkbox": {
"version": "2.1.1" "version": "1.0.6",
"resolved": "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz",
"integrity": "sha512-7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="
}, },
"marked": { "marked": {
"version": "2.1.3", "version": "2.1.3",

View File

@@ -46,8 +46,8 @@
"dompurify": "^2.3.3", "dompurify": "^2.3.3",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"markdown-it": "^12.2.0", "markdown-it": "^12.2.0",
"markdown-it-task-lists": "^2.1.1",
"markdown-it-link-attributes": "^3.0.0", "markdown-it-link-attributes": "^3.0.0",
"markdown-it-task-checkbox": "^1.0.6",
"moment": "^2.29.1", "moment": "^2.29.1",
"nextcloud-vue-collections": "^0.9.0", "nextcloud-vue-collections": "^0.9.0",
"p-queue": "^6.6.2", "p-queue": "^6.6.2",

View File

@@ -74,7 +74,7 @@
<script> <script>
import MarkdownIt from 'markdown-it' import MarkdownIt from 'markdown-it'
import MarkdownItTaskLists from 'markdown-it-task-lists' import MarkdownItTaskCheckbox from 'markdown-it-task-checkbox'
import MarkdownItLinkAttributes from 'markdown-it-link-attributes' import MarkdownItLinkAttributes from 'markdown-it-link-attributes'
import AttachmentList from './AttachmentList' import AttachmentList from './AttachmentList'
import { Actions, ActionButton, Modal } from '@nextcloud/vue' import { Actions, ActionButton, Modal } from '@nextcloud/vue'
@@ -85,7 +85,7 @@ import { mapState, mapGetters } from 'vuex'
const markdownIt = new MarkdownIt({ const markdownIt = new MarkdownIt({
linkify: true, linkify: true,
}) })
markdownIt.use(MarkdownItTaskLists, { enabled: true, label: true, labelAfter: true }) markdownIt.use(MarkdownItTaskCheckbox, { disabled: false, idPrefix: 'task-item-', ulClass: 'contains-task-list' })
markdownIt.use(MarkdownItLinkAttributes, { markdownIt.use(MarkdownItLinkAttributes, {
attrs: { attrs: {