diff --git a/package-lock.json b/package-lock.json index a93483094..65ec69e6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,9 @@ "hyper-json": "~1.4.0", "jquery": "3.6.0", "json.sortify": "~2.1.0", - "jszip": "3.7.1", + "jszip": "3.10.1", "localforage": "^1.5.2", - "marked": "^1.1.0", + "marked": "^4.3.0", "mathjax": "3.0.5", "netflux-websocket": "^1.0.0", "nthen": "0.1.8", @@ -2449,14 +2449,14 @@ } }, "node_modules/jszip": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", - "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "dependencies": { "lie": "~3.3.0", "pako": "~1.0.2", "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" + "setimmediate": "^1.0.5" } }, "node_modules/jszip/node_modules/isarray": { @@ -2656,14 +2656,14 @@ } }, "node_modules/marked": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", - "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", + "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", "bin": { - "marked": "bin/marked" + "marked": "bin/marked.js" }, "engines": { - "node": ">= 8.16.2" + "node": ">= 12" } }, "node_modules/mathjax": { @@ -3333,17 +3333,6 @@ "node": ">=0.10.0" } }, - "node_modules/prompt-choices/node_modules/set-value": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.3.tgz", - "integrity": "sha512-Xsn/XSatoVOGBbp5hs3UylFDs5Bi9i+ArpVJKdHPniZHoEgRniXTqHWrWrGQ0PbEClVT6WtfnBwR8CAHC9sveg==", - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=6.0" - } - }, "node_modules/prompt-choices/node_modules/shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -3702,19 +3691,10 @@ "node": ">=0.10.0" } }, - "node_modules/set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/set-value": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.0.1.tgz", "integrity": "sha512-ayATicCYPVnlNpFmjq2/VmVwhoCQA9+13j8qWp044fmFE3IFphosPtRM+0CJ5xoIx5Uy52fCcwg3XeH2pHbbPQ==", - "dev": true, "funding": [ "https://github.com/sponsors/jonschlinkert", "https://paypal.me/jonathanschlinkert", @@ -3727,6 +3707,11 @@ "node": ">=11.0" } }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -6441,14 +6426,14 @@ } }, "jszip": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz", - "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==", + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "requires": { "lie": "~3.3.0", "pako": "~1.0.2", "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" + "setimmediate": "^1.0.5" }, "dependencies": { "isarray": { @@ -6621,9 +6606,9 @@ } }, "marked": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", - "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", + "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==" }, "mathjax": { "version": "3.0.5", @@ -7156,13 +7141,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-6.0.0.tgz", "integrity": "sha512-Wu1VHeILBK8KAWJUAiSZQX94GmOE45Rg6/538fKwiloUu21KncEkYGPqob2oSZ5mUT73vLGrHQjKw3KMPwfDzg==" }, - "set-value": { - "version": "https://registry.npmjs.org/set-value/-/set-value-3.0.3.tgz", - "integrity": "sha512-Xsn/XSatoVOGBbp5hs3UylFDs5Bi9i+ArpVJKdHPniZHoEgRniXTqHWrWrGQ0PbEClVT6WtfnBwR8CAHC9sveg==", - "requires": { - "is-plain-object": "^2.0.4" - } - }, "shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -7458,20 +7436,19 @@ "to-object-path": "^0.3.0" } }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" - }, "set-value": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.0.1.tgz", "integrity": "sha512-ayATicCYPVnlNpFmjq2/VmVwhoCQA9+13j8qWp044fmFE3IFphosPtRM+0CJ5xoIx5Uy52fCcwg3XeH2pHbbPQ==", - "dev": true, "requires": { "is-plain-object": "^2.0.4" } }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", diff --git a/package.json b/package.json index fa19f1b7a..1a613fae7 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,11 @@ "hyper-json": "~1.4.0", "jquery": "3.6.0", "json.sortify": "~2.1.0", - "jszip": "3.7.1", + "jszip": "3.10.1", "dragula": "3.7.2", "html2canvas": "^1.4.0", "localforage": "^1.5.2", - "marked": "^1.1.0", + "marked": "^4.3.0", "mathjax": "3.0.5", "open-sans-fontface": "^1.4.0", "rangy": "~1.3.0", diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js index 2404dd4f3..082964778 100644 --- a/www/common/diffMarked.js +++ b/www/common/diffMarked.js @@ -180,7 +180,7 @@ define([ renderer: restrictedMd ? restrictedRenderer : renderer, }); noHeadingId = noId; - var r = Marked(md, { + var r = Marked.parse(md, { sanitize: sanitize, headerIds: !noId, gfm: true, diff --git a/www/kanban/inner.js b/www/kanban/inner.js index e6e3acf1b..e3f0efd43 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -15,7 +15,6 @@ define([ '/common/text-cursor.js', '/common/diffMarked.js', '/components/chainpad/chainpad.dist.js', - '/components/marked/marked.min.js', 'cm/lib/codemirror', '/kanban/jkanban_cp.js', '/kanban/export.js', @@ -49,7 +48,6 @@ define([ TextCursor, DiffMd, ChainPad, - Marked, CodeMirror, jKanban, Export) diff --git a/www/profile/inner.js b/www/profile/inner.js index 5005042e2..3336f6eb2 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -479,7 +479,7 @@ define([ }); }; var refreshDescription = function (data) { - var val = Marked(data.description || ""); + var val = Marked.parse(data.description || ""); APP.$description.html(val); APP.$description.off('click'); APP.$description.click(function (e) {