tools: fix gitignore for tools/doc/

PR-URL: https://github.com/nodejs/node/pull/17224
Fixes: https://github.com/nodejs/node/issues/17216
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

5 files changed, 36 insertions, 46 deletions

diff --git a/tools/doc/node_modules/.bin/marked b/tools/doc/node_modules/.bin/marked
deleted file mode 120000
index a8d872e9dc..0000000000
--- a/tools/doc/node_modules/.bin/marked
+++ /dev/null
@@ -1 +0,0 @@
-../marked/bin/marked
\ No newline at end of file
diff --git a/tools/doc/node_modules/marked/lib/marked.js b/tools/doc/node_modules/marked/lib/marked.js
index 03251f3c58..32521d9934 100644
--- a/tools/doc/node_modules/marked/lib/marked.js
+++ b/tools/doc/node_modules/marked/lib/marked.js
@@ -1094,7 +1094,8 @@ function escape(html, encode) {
 }
 
 function unescape(html) {
-  return html.replace(/&([#\w]+);/g, function(_, n) {
+	// explicitly match decimal, hex, and named HTML entities
+  return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) {
     n = n.toLowerCase();
     if (n === 'colon') return ':';
     if (n.charAt(0) === '#') {
diff --git a/tools/doc/node_modules/marked/package.json b/tools/doc/node_modules/marked/package.json
index d631092cb8..81ab0639d2 100644
--- a/tools/doc/node_modules/marked/package.json
+++ b/tools/doc/node_modules/marked/package.json
@@ -1,38 +1,27 @@
 {
-  "_args": [
-    [
-      "marked",
-      "/Users/firedfox/git/node/tools/doc"
-    ]
-  ],
-  "_from": "marked@latest",
-  "_id": "marked@0.3.5",
-  "_inCache": true,
-  "_installable": true,
+  "_from": "marked@^0.3.5",
+  "_id": "marked@0.3.6",
+  "_inBundle": false,
+  "_integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=",
   "_location": "/marked",
-  "_nodeVersion": "0.12.7",
-  "_npmUser": {
-    "email": "chjjeffrey@gmail.com",
-    "name": "chjj"
-  },
-  "_npmVersion": "2.13.2",
   "_phantomChildren": {},
   "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "marked@^0.3.5",
     "name": "marked",
-    "raw": "marked",
-    "rawSpec": "",
-    "scope": null,
-    "spec": "latest",
-    "type": "tag"
+    "escapedName": "marked",
+    "rawSpec": "^0.3.5",
+    "saveSpec": null,
+    "fetchSpec": "^0.3.5"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz",
-  "_shasum": "4113a15ac5d7bca158a5aae07224587b9fa15b94",
-  "_shrinkwrap": null,
-  "_spec": "marked",
-  "_where": "/Users/firedfox/git/node/tools/doc",
+  "_resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+  "_shasum": "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7",
+  "_spec": "marked@^0.3.5",
+  "_where": "/mnt/d/code/node-github-desktop/tools/doc",
   "author": {
     "name": "Christopher Jeffrey"
   },
@@ -42,7 +31,8 @@
   "bugs": {
     "url": "http://github.com/chjj/marked/issues"
   },
-  "dependencies": {},
+  "bundleDependencies": false,
+  "deprecated": false,
   "description": "A markdown parser built for speed",
   "devDependencies": {
     "gulp": "^3.8.11",
@@ -51,12 +41,6 @@
     "markdown": "*",
     "showdown": "*"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "4113a15ac5d7bca158a5aae07224587b9fa15b94",
-    "tarball": "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz"
-  },
-  "gitHead": "88ce4df47c4d994dc1b1df1477a21fb893e11ddc",
   "homepage": "https://github.com/chjj/marked",
   "keywords": [
     "markdown",
@@ -65,19 +49,11 @@
   ],
   "license": "MIT",
   "main": "./lib/marked.js",
-  "maintainers": [
-    {
-      "email": "chjjeffrey@gmail.com",
-      "name": "chjj"
-    }
-  ],
   "man": [
     "./man/marked.1"
   ],
   "name": "marked",
-  "optionalDependencies": {},
   "preferGlobal": true,
-  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/chjj/marked.git"
@@ -91,5 +67,5 @@
     "markup",
     "html"
   ],
-  "version": "0.3.5"
+  "version": "0.3.6"
 }
diff --git a/tools/doc/package-lock.json b/tools/doc/package-lock.json
new file mode 100644
index 0000000000..67bdbe87fa
--- /dev/null
+++ b/tools/doc/package-lock.json
@@ -0,0 +1,13 @@
+{
+  "name": "node-doc-generator",
+  "version": "0.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "marked": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc="
+    }
+  }
+}
diff --git a/tools/doc/package.json b/tools/doc/package.json
index 15b8531e1f..d33943eacd 100644
--- a/tools/doc/package.json
+++ b/tools/doc/package.json
@@ -7,10 +7,11 @@
     "node": ">=6"
   },
   "dependencies": {
-    "marked": "^0.3.5",
+    "marked": "^0.3.5"
+  },
+  "devDependencies": {
     "js-yaml": "^3.5.2"
   },
-  "devDependencies": {},
   "optionalDependencies": {},
   "bin": "./generate.js"
 }