diff --git a/bower.json b/bower.json index 9798f4f3b..ced53bc48 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,6 @@ "dependencies": { "components-font-awesome": "^4.6.3", "requirejs": "2.3.5", - "marked": "1.1.0", "rangy": "rangy-release#~1.3.0", "json.sortify": "~2.1.0", "hyperjson": "~1.4.0", diff --git a/package-lock.json b/package-lock.json index 0867bb6f2..4b7993d38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,6 +33,7 @@ "jshint": "^2.13.4", "less": "3.7.1", "lesshint": "6.3.7", + "marked": "^1.1.0", "selenium-webdriver": "^3.6.0" }, "funding": { @@ -2692,6 +2693,18 @@ "node": ">=0.10.0" } }, + "node_modules/marked": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", + "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==", + "dev": true, + "bin": { + "marked": "bin/marked" + }, + "engines": { + "node": ">= 8.16.2" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -6841,6 +6854,12 @@ "object-visit": "^1.0.0" } }, + "marked": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", + "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==", + "dev": true + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", diff --git a/package.json b/package.json index 31f53b766..176d0d0c4 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "jshint": "^2.13.4", "less": "3.7.1", "lesshint": "6.3.7", + "marked": "^1.1.0", "selenium-webdriver": "^3.6.0" }, "scripts": { diff --git a/scripts/copy-components.js b/scripts/copy-components.js index b3c5942b7..201d6e64a 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -10,6 +10,7 @@ Fse.mkdirpSync(componentsPath); "tweetnacl", "ckeditor", "codemirror", + "marked", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js index fae2eb4ec..e6c6760af 100644 --- a/www/common/diffMarked.js +++ b/www/common/diffMarked.js @@ -1,7 +1,7 @@ define([ 'jquery', '/api/config', - '/bower_components/marked/marked.min.js', + '/components/marked/marked.min.js', '/common/common-hash.js', '/common/common-util.js', '/common/hyperscript.js', diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 5fd3e0ab0..0cf415ead 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -15,7 +15,7 @@ define([ '/common/text-cursor.js', '/common/diffMarked.js', '/bower_components/chainpad/chainpad.dist.js', - '/bower_components/marked/marked.min.js', + '/components/marked/marked.min.js', 'cm/lib/codemirror', '/kanban/jkanban_cp.js', '/kanban/export.js', diff --git a/www/profile/inner.js b/www/profile/inner.js index 588ba7991..84b5fa619 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -15,7 +15,7 @@ define([ '/common/hyperscript.js', '/customize/messages.js', '/customize/application_config.js', - '/bower_components/marked/marked.min.js', + '/components/marked/marked.min.js', '/common/sframe-common-codemirror.js', 'cm/lib/codemirror',