From 2b26bbe78a1a2b8b427963a6c44c3853efdb737e Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 6 Mar 2020 03:52:12 +0200
Subject: Fix: img tag did not allow width and height. Removed swipebox from
 markdown editor img tag and updated marked markdown to newest version.

Thanks to hradec and xet7 !

Closes #2956
---
 packages/markdown/marked/package.json | 64 ++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 28 deletions(-)

(limited to 'packages/markdown/marked/package.json')

diff --git a/packages/markdown/marked/package.json b/packages/markdown/marked/package.json
index 43cea559..70c0e16e 100644
--- a/packages/markdown/marked/package.json
+++ b/packages/markdown/marked/package.json
@@ -2,13 +2,14 @@
   "name": "marked",
   "description": "A markdown parser built for speed",
   "author": "Christopher Jeffrey",
-  "version": "0.6.2",
-  "main": "./lib/marked.js",
+  "version": "0.8.0",
+  "main": "./src/marked.js",
   "bin": "./bin/marked",
   "man": "./man/marked.1",
   "files": [
     "bin/",
     "lib/",
+    "src/",
     "man/",
     "marked.min.js"
   ],
@@ -29,41 +30,48 @@
     "html"
   ],
   "devDependencies": {
-    "@markedjs/html-differ": "^2.0.1",
+    "@babel/core": "^7.7.5",
+    "@babel/preset-env": "^7.7.6",
+    "@markedjs/html-differ": "^3.0.0",
     "cheerio": "^1.0.0-rc.3",
-    "commonmark": "0.x",
-    "eslint": "^5.15.1",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-standard": "^4.0.0",
-    "eslint-plugin-vuln-regex-detector": "^1.0.4",
-    "front-matter": "^3.0.1",
-    "glob-to-regexp": "^0.4.0",
-    "jasmine": "^3.3.1",
-    "markdown": "0.x",
-    "markdown-it": "8.x",
-    "node-fetch": "^2.3.0",
-    "uglify-js": "^3.4.9"
+    "commonmark": "0.29.x",
+    "eslint": "^6.7.2",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "front-matter": "^3.0.2",
+    "jasmine": "^3.5.0",
+    "markdown": "0.5.x",
+    "markdown-it": "10.x",
+    "node-fetch": "^2.6.0",
+    "rollup": "^1.27.11",
+    "rollup-plugin-babel": "^4.3.3",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-license": "^0.13.0",
+    "uglify-js": "^3.7.2",
+    "vuln-regex-detector": "^1.3.0"
   },
   "scripts": {
     "test": "jasmine --config=jasmine.json",
+    "test:all": "npm test && npm run test:lint",
     "test:unit": "npm test -- test/unit/**/*-spec.js",
     "test:specs": "npm test -- test/specs/**/*-spec.js",
-    "test:cm": "npm test -- test/specs/commonmark/**/*-spec.js",
-    "test:gfm": "npm test -- test/specs/gfm/**/*-spec.js",
-    "test:marked": "npm test -- test/specs/marked/**/*-spec.js",
-    "test:old": "node test",
     "test:lint": "eslint bin/marked .",
-    "test:redos": "eslint --plugin vuln-regex-detector --rule '\"vuln-regex-detector/no-vuln-regex\": 2' lib/marked.js",
-    "test:node4": "npx node@4 ./node_modules/jasmine/bin/jasmine.js --config=jasmine.json",
-    "bench": "node test --bench",
+    "test:redos": "node test/vuln-regex.js",
+    "test:update": "node test/update-specs.js",
+    "bench": "npm run rollup && node test/bench.js",
     "lint": "eslint --fix bin/marked .",
-    "build": "uglifyjs lib/marked.js -cm  --comments /Copyright/ -o marked.min.js",
-    "preversion": "npm run build && (git diff --quiet || git commit -am 'minify')"
+    "build:reset": "git checkout upstream/master lib/marked.js lib/marked.esm.js marked.min.js",
+    "build": "npm run rollup && npm run minify",
+    "rollup": "npm run rollup:umd && npm run rollup:esm",
+    "rollup:umd": "rollup -c rollup.config.js",
+    "rollup:esm": "rollup -c rollup.config.esm.js",
+    "minify": "uglifyjs lib/marked.js -cm  --comments /Copyright/ -o marked.min.js",
+    "preversion": "npm run build && (git diff --quiet || git commit -am 'build')"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">= 8.16.2"
   }
 }
-- 
cgit v1.2.3-1-g7c22