diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 905a0575f..4b3c9ff1a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -709,7 +709,7 @@ "dependencies": { "lru-cache": { "version": "4.0.2", - "from": "lru-cache@>=4.0.1 <5.0.0", + "from": "lru-cache@^4.0.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz" } } @@ -757,7 +757,7 @@ "dependencies": { "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.0.1 <5.0.0", + "from": "object-assign@^4.0.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", "dev": true }, @@ -838,7 +838,7 @@ }, "debug": { "version": "2.6.0", - "from": "debug@2.6.0", + "from": "debug@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz", "dependencies": { "ms": { @@ -1373,7 +1373,7 @@ "dependencies": { "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.1.0 <5.0.0", + "from": "object-assign@^4.1.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" }, "supports-color": { @@ -1475,7 +1475,7 @@ }, "through2": { "version": "0.6.5", - "from": "through2@>=0.6.1 <0.7.0", + "from": "through2@^0.6.1", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "dev": true } @@ -1519,7 +1519,7 @@ }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "from": "minimatch@2 || 3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "dev": true } @@ -1593,7 +1593,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "from": "minimist@>=1.1.0 <2.0.0", + "from": "minimist@^1.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "dev": true } @@ -1631,7 +1631,7 @@ }, "through2": { "version": "0.6.5", - "from": "through2@>=0.6.2 <0.7.0", + "from": "through2@^0.6.2", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "dev": true }, @@ -1677,7 +1677,7 @@ "dependencies": { "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.0.1 <5.0.0", + "from": "object-assign@^4.0.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", "dev": true } @@ -1709,7 +1709,7 @@ }, "minimist": { "version": "1.2.0", - "from": "minimist@>=1.1.0 <2.0.0", + "from": "minimist@^1.1.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "dev": true }, @@ -1838,7 +1838,7 @@ }, "source-map": { "version": "0.4.4", - "from": "source-map@>=0.4.4 <0.5.0", + "from": "source-map@^0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "dev": true } @@ -2177,7 +2177,7 @@ }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0", + "from": "minimatch@2 || 3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "dev": true }, @@ -2622,12 +2622,12 @@ "dependencies": { "minimist": { "version": "1.2.0", - "from": "minimist@>=1.1.3 <2.0.0", + "from": "minimist@^1.1.3", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" }, "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.0.1 <5.0.0", + "from": "object-assign@^4.0.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" } } @@ -2698,7 +2698,7 @@ }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=3.0.2 <4.0.0", + "from": "minimatch@^3.0.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "dev": true }, @@ -2881,7 +2881,7 @@ "dependencies": { "glob": { "version": "7.1.1", - "from": "glob@>=7.0.3 <8.0.0", + "from": "glob@^7.0.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz" }, "graceful-fs": { @@ -2891,7 +2891,7 @@ }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=3.0.2 <4.0.0", + "from": "minimatch@^3.0.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" } } @@ -2910,7 +2910,7 @@ }, "glob": { "version": "7.1.1", - "from": "glob@>=7.0.3 <8.0.0", + "from": "glob@^7.0.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", "dev": true }, @@ -2922,19 +2922,19 @@ }, "lodash": { "version": "4.16.6", - "from": "lodash@>=4.16.4 <4.17.0", + "from": "lodash@~4.16.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.6.tgz", "dev": true }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=3.0.2 <3.1.0", + "from": "minimatch@~3.0.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz", "dev": true }, "nan": { "version": "2.5.0", - "from": "nan@>=2.3.2 <3.0.0", + "from": "nan@^2.3.2", "resolved": "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz", "dev": true } @@ -2995,7 +2995,7 @@ "dependencies": { "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.0.1 <5.0.0", + "from": "object-assign@^4.0.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", "dev": true } @@ -3583,7 +3583,7 @@ "dependencies": { "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.0.1 <5.0.0", + "from": "object-assign@^4.0.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", "dev": true }, @@ -3969,7 +3969,7 @@ "dependencies": { "object-assign": { "version": "4.1.0", - "from": "object-assign@>=4.1.0 <5.0.0", + "from": "object-assign@^4.1.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", "dev": true } @@ -4136,12 +4136,12 @@ "dependencies": { "glob": { "version": "7.1.1", - "from": "glob@>=7.0.5 <8.0.0", + "from": "glob@^7.0.5", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz" }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=3.0.2 <4.0.0", + "from": "minimatch@^3.0.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" } } @@ -4174,7 +4174,7 @@ }, "glob": { "version": "7.1.1", - "from": "glob@>=7.0.0 <8.0.0", + "from": "glob@^7.0.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz" }, "lodash": { @@ -4184,7 +4184,7 @@ }, "minimatch": { "version": "3.0.3", - "from": "minimatch@>=3.0.2 <4.0.0", + "from": "minimatch@^3.0.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" }, "window-size": { @@ -4268,6 +4268,33 @@ } } }, + "showdown": { + "version": "1.6.0", + "from": "showdown@>=1.4.4 <2.0.0", + "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz", + "dependencies": { + "camelcase": { + "version": "3.0.0", + "from": "camelcase@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" + }, + "cliui": { + "version": "3.2.0", + "from": "cliui@>=3.2.0 <4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz" + }, + "yargs": { + "version": "6.6.0", + "from": "yargs@>=6.6.0 <7.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz" + }, + "yargs-parser": { + "version": "4.2.1", + "from": "yargs-parser@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz" + } + } + }, "sigmund": { "version": "1.0.1", "from": "sigmund@>=1.0.0 <1.1.0", @@ -5713,7 +5740,7 @@ "dependencies": { "camelcase": { "version": "3.0.0", - "from": "camelcase@>=3.0.0 <4.0.0", + "from": "camelcase@^3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz" } } diff --git a/package.json b/package.json index 9ef459356..3713122a6 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "proxy-middleware": "^0.13.0", "safetydance": "^0.1.1", "semver": "^4.3.6", + "showdown": "^1.6.0", "split": "^1.0.0", "superagent": "^1.8.3", "supererror": "^0.7.1", diff --git a/src/mailer.js b/src/mailer.js index 89d35dcb8..81e6f5291 100644 --- a/src/mailer.js +++ b/src/mailer.js @@ -44,6 +44,7 @@ var assert = require('assert'), path = require('path'), safe = require('safetydance'), settings = require('./settings.js'), + showdown = require('showdown'), smtpTransport = require('nodemailer-smtp-transport'), users = require('./user.js'), util = require('util'),