aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-01-20 13:25:24 -0800
committerChris Rebert <[email protected]>2015-01-20 13:25:24 -0800
commitd9f437f4ecf5d4be8d30219a1ed2a113d65e79d4 (patch)
tree2ef5083ff2dae9602d8a980dcd52a80067a64ddb
parent136058b56271adbc8b4c2deb95d56d2baaad19f2 (diff)
parent92b267f357c43148327e1247ac48c6eabc9891dd (diff)
downloadbootstrap-d9f437f4ecf5d4be8d30219a1ed2a113d65e79d4.tar.xz
bootstrap-d9f437f4ecf5d4be8d30219a1ed2a113d65e79d4.zip
Merge pull request #15619 from twbs/markdown
Change markdown library
-rw-r--r--grunt/bs-lessdoc-parser.js4
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json48
3 files changed, 27 insertions, 27 deletions
diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js
index 63ee65a0e..d6be77452 100644
--- a/grunt/bs-lessdoc-parser.js
+++ b/grunt/bs-lessdoc-parser.js
@@ -6,10 +6,10 @@
*/
'use strict';
-var Remarkable = require('remarkable');
+var Markdown = require('markdown-it');
function markdown2html(markdownString) {
- var md = new Remarkable();
+ var md = new Markdown();
// the slice removes the <p>...</p> wrapper output by Markdown processor
return md.render(markdownString.trim()).slice(3, -5);
diff --git a/package.json b/package.json
index dc736cb28..fb49709b8 100644
--- a/package.json
+++ b/package.json
@@ -57,8 +57,8 @@
"grunt-saucelabs": "~8.5.0",
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~2.0.0",
+ "markdown-it": "^3.0.4",
"npm-shrinkwrap": "^200.0.0",
- "remarkable": "~1.6.0",
"time-grunt": "~1.0.0"
},
"engines": {
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index e9348fd23..d45418ca5 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -3295,6 +3295,30 @@
}
}
},
+ "markdown-it": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-3.0.4.tgz",
+ "dependencies": {
+ "argparse": {
+ "version": "0.1.16",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+ "dependencies": {
+ "underscore": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+ },
+ "underscore.string": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
+ }
+ }
+ },
+ "autolinker": {
+ "version": "0.15.2",
+ "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.15.2.tgz"
+ }
+ }
+ },
"npm-shrinkwrap": {
"version": "200.0.0",
"resolved": "https://registry.npmjs.org/npm-shrinkwrap/-/npm-shrinkwrap-200.0.0.tgz",
@@ -4023,30 +4047,6 @@
}
}
},
- "remarkable": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.6.0.tgz",
- "dependencies": {
- "argparse": {
- "version": "0.1.16",
- "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
- "dependencies": {
- "underscore": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
- },
- "underscore.string": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"
- }
- }
- },
- "autolinker": {
- "version": "0.15.2",
- "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.15.2.tgz"
- }
- }
- },
"time-grunt": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-1.0.0.tgz",