From e15a9797e3c8954525164cc0a6a4cd6c959cc27d Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Sat, 24 Nov 2018 21:39:54 +0100 Subject: [PATCH] Include forgotten changes after Wintersmith update This should have been part of the previous commit that updated the Wintersmith dependency. Markdown support is no longer included in Pug itself and should be done by a transformer instead. --- docs/templates/layout.jade | 2 +- package-lock.json | 45 +++++++++++++++++++++++++++++++++----- package.json | 1 + 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/docs/templates/layout.jade b/docs/templates/layout.jade index dff6ebd44..5f5b3e1a3 100644 --- a/docs/templates/layout.jade +++ b/docs/templates/layout.jade @@ -43,7 +43,7 @@ html(lang='en') .container footer p ©Mozilla and individual contributors - :markdown + :markdown-it PDF.js is licensed under [Apache](https://github.com/mozilla/pdf.js/blob/master/LICENSE), documentation is licensed under [CC BY-SA 2.5](http://creativecommons.org/licenses/by-sa/2.5/) diff --git a/package-lock.json b/package-lock.json index c6ca51648..66e83c010 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1424,7 +1424,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -2801,8 +2800,7 @@ "entities": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", - "dev": true + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" }, "env-variable": { "version": "0.0.5", @@ -5496,6 +5494,14 @@ "promise": "^7.0.1" } }, + "jstransformer-markdown-it": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/jstransformer-markdown-it/-/jstransformer-markdown-it-2.1.0.tgz", + "integrity": "sha1-aewwzkUYvtWZezjwJ2SOjChekvc=", + "requires": { + "markdown-it": "^8.0.0" + } + }, "keypress": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz", @@ -5585,6 +5591,14 @@ "resolve": "^1.1.7" } }, + "linkify-it": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz", + "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=", + "requires": { + "uc.micro": "^1.0.1" + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -5896,6 +5910,18 @@ "object-visit": "^1.0.0" } }, + "markdown-it": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", + "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", + "requires": { + "argparse": "^1.0.7", + "entities": "~1.1.1", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + } + }, "marked": { "version": "0.3.19", "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", @@ -5918,6 +5944,11 @@ "inherits": "^2.0.1" } }, + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" + }, "mem": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", @@ -10851,8 +10882,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "ssri": { "version": "5.3.0", @@ -11328,6 +11358,11 @@ } } }, + "uc.micro": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz", + "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==" + }, "uglify-es": { "version": "3.3.9", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", diff --git a/package.json b/package.json index 897d57d0b..fe4ccea32 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "jasmine": "^3.3.0", "jasmine-core": "^3.3.0", "jsdoc": "^3.5.5", + "jstransformer-markdown-it": "^2.1.0", "merge-stream": "^1.0.1", "mkdirp": "^0.5.1", "node-ensure": "^0.0.0",