From 2550537fd3fe22d447b7bf7f7e0c43477e0a23f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 09:34:32 -0600 Subject: [PATCH 1/6] chore(deps-dev): Bump node-fetch from 3.0.0 to 3.1.0 (#2287) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 59 ++++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8eddd20510..2f7ff74862 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "highlight.js": "^11.3.1", "jasmine": "^3.10.0", "markdown-it": "12.2.0", - "node-fetch": "^3.0.0", + "node-fetch": "^3.1.0", "rollup": "^2.59.0", "rollup-plugin-license": "^2.6.0", "semantic-release": "^18.0.0", @@ -3008,12 +3008,12 @@ } }, "node_modules/data-uri-to-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz", - "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz", + "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==", "dev": true, "engines": { - "node": ">= 6" + "node": ">= 12" } }, "node_modules/dateformat": { @@ -4115,6 +4115,18 @@ "node": ">= 0.12" } }, + "node_modules/formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dev": true, + "dependencies": { + "fetch-blob": "^3.1.2" + }, + "engines": { + "node": ">=12.20.0" + } + }, "node_modules/from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -5659,13 +5671,14 @@ } }, "node_modules/node-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.0.0.tgz", - "integrity": "sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.1.0.tgz", + "integrity": "sha512-QU0WbIfMUjd5+MUzQOYhenAazakV7Irh1SGkWCsRzBwvm4fAhzEUaHMJ6QLP7gWT6WO9/oH2zhKMMGMuIrDyKw==", "dev": true, "dependencies": { - "data-uri-to-buffer": "^3.0.1", - "fetch-blob": "^3.1.2" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.2", + "formdata-polyfill": "^4.0.10" }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -12802,9 +12815,9 @@ "dev": true }, "data-uri-to-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz", - "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz", + "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==", "dev": true }, "dateformat": { @@ -13613,6 +13626,15 @@ "mime-types": "^2.1.12" } }, + "formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "dev": true, + "requires": { + "fetch-blob": "^3.1.2" + } + }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -14767,13 +14789,14 @@ } }, "node-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.0.0.tgz", - "integrity": "sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.1.0.tgz", + "integrity": "sha512-QU0WbIfMUjd5+MUzQOYhenAazakV7Irh1SGkWCsRzBwvm4fAhzEUaHMJ6QLP7gWT6WO9/oH2zhKMMGMuIrDyKw==", "dev": true, "requires": { - "data-uri-to-buffer": "^3.0.1", - "fetch-blob": "^3.1.2" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.2", + "formdata-polyfill": "^4.0.10" } }, "node-releases": { diff --git a/package.json b/package.json index f6d29998af..6bffdf9f7a 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "highlight.js": "^11.3.1", "jasmine": "^3.10.0", "markdown-it": "12.2.0", - "node-fetch": "^3.0.0", + "node-fetch": "^3.1.0", "rollup": "^2.59.0", "rollup-plugin-license": "^2.6.0", "semantic-release": "^18.0.0", From 83878dc23192bb54d0a16a70ad23d4c718bbc102 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 09:34:50 -0600 Subject: [PATCH 2/6] chore(deps-dev): Bump eslint-plugin-import from 2.25.2 to 2.25.3 (#2289) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f7ff74862..3b50691c8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "commonmark": "0.30.0", "eslint": "^8.2.0", "eslint-config-standard": "^16.0.3", - "eslint-plugin-import": "^2.25.2", + "eslint-plugin-import": "^2.25.3", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.1.1", "front-matter": "^4.0.2", @@ -3550,9 +3550,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.25.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz", - "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==", + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz", + "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==", "dev": true, "dependencies": { "array-includes": "^3.1.4", @@ -3560,9 +3560,9 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.0", + "eslint-module-utils": "^2.7.1", "has": "^1.0.3", - "is-core-module": "^2.7.0", + "is-core-module": "^2.8.0", "is-glob": "^4.0.3", "minimatch": "^3.0.4", "object.values": "^1.1.5", @@ -13301,9 +13301,9 @@ } }, "eslint-plugin-import": { - "version": "2.25.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz", - "integrity": "sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g==", + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz", + "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==", "dev": true, "requires": { "array-includes": "^3.1.4", @@ -13311,9 +13311,9 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.0", + "eslint-module-utils": "^2.7.1", "has": "^1.0.3", - "is-core-module": "^2.7.0", + "is-core-module": "^2.8.0", "is-glob": "^4.0.3", "minimatch": "^3.0.4", "object.values": "^1.1.5", diff --git a/package.json b/package.json index 6bffdf9f7a..68538b028f 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "commonmark": "0.30.0", "eslint": "^8.2.0", "eslint-config-standard": "^16.0.3", - "eslint-plugin-import": "^2.25.2", + "eslint-plugin-import": "^2.25.3", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.1.1", "front-matter": "^4.0.2", From e77f9e31dff836b77492921ed8e19fb24bc4aa20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 09:38:59 -0600 Subject: [PATCH 3/6] chore(deps-dev): Bump rollup from 2.59.0 to 2.60.0 (#2288) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b50691c8c..e5d19c51b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "jasmine": "^3.10.0", "markdown-it": "12.2.0", "node-fetch": "^3.1.0", - "rollup": "^2.59.0", + "rollup": "^2.60.0", "rollup-plugin-license": "^2.6.0", "semantic-release": "^18.0.0", "titleize": "^3.0.0", @@ -9500,9 +9500,9 @@ } }, "node_modules/rollup": { - "version": "2.59.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.59.0.tgz", - "integrity": "sha512-l7s90JQhCQ6JyZjKgo7Lq1dKh2RxatOM+Jr6a9F7WbS9WgKbocyUSeLmZl8evAse7y96Ae98L2k1cBOwWD8nHw==", + "version": "2.60.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.0.tgz", + "integrity": "sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -17556,9 +17556,9 @@ } }, "rollup": { - "version": "2.59.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.59.0.tgz", - "integrity": "sha512-l7s90JQhCQ6JyZjKgo7Lq1dKh2RxatOM+Jr6a9F7WbS9WgKbocyUSeLmZl8evAse7y96Ae98L2k1cBOwWD8nHw==", + "version": "2.60.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.0.tgz", + "integrity": "sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ==", "dev": true, "requires": { "fsevents": "~2.3.2" diff --git a/package.json b/package.json index 68538b028f..dad1c1570e 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "jasmine": "^3.10.0", "markdown-it": "12.2.0", "node-fetch": "^3.1.0", - "rollup": "^2.59.0", + "rollup": "^2.60.0", "rollup-plugin-license": "^2.6.0", "semantic-release": "^18.0.0", "titleize": "^3.0.0", From 6cba7b4b122ddf0dfbb093087327c828977cb561 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Thu, 18 Nov 2021 11:35:18 -0600 Subject: [PATCH 4/6] chore(docs): remove nptable tokenizer from docs (#2293) --- docs/USING_PRO.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/USING_PRO.md b/docs/USING_PRO.md index f0e32cea7d..af4f1986c5 100644 --- a/docs/USING_PRO.md +++ b/docs/USING_PRO.md @@ -212,7 +212,6 @@ console.log(marked.parse('$ latex code $\n\n` other code `')); - **code**(*string* src) - **fences**(*string* src) - **heading**(*string* src) -- **nptable**(*string* src) - **hr**(*string* src) - **blockquote**(*string* src) - **list**(*string* src) From ab2977a3363230df51ccbb2b3f8bf46389c50283 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Fri, 19 Nov 2021 08:07:26 -0600 Subject: [PATCH 5/6] fix: fix cli (#2294) --- bin/marked.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/marked.js b/bin/marked.js index b9e32973bf..1cb819ee12 100644 --- a/bin/marked.js +++ b/bin/marked.js @@ -27,10 +27,16 @@ async function help() { const { dirname, resolve } = await import('path'); const { fileURLToPath } = await import('url'); const __dirname = dirname(fileURLToPath(import.meta.url)); - spawn('man', [resolve(__dirname, '../man/marked.1')], options) - .on('error', async() => { - console.log(await readFile(resolve(__dirname, '../man/marked.1.txt'), 'utf8')); - }); + const helpText = await readFile(resolve(__dirname, '../man/marked.1.txt'), 'utf8'); + + // eslint-disable-next-line promise/param-names + await new Promise(res => { + spawn('man', [resolve(__dirname, '../man/marked.1')], options) + .on('error', () => { + console.log(helpText); + }) + .on('close', res); + }); } async function version() { @@ -149,7 +155,7 @@ async function main(argv) { : marked(data, options); if (output) { - return await writeFile(output, data); + return await writeFile(output, html); } process.stdout.write(html + '\n'); From 0ed66bd9d725c576769e26a4fc11c6f8919b4878 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 19 Nov 2021 14:09:14 +0000 Subject: [PATCH 6/6] chore(release): 4.0.4 [skip ci] ## [4.0.4](https://github.com/markedjs/marked/compare/v4.0.3...v4.0.4) (2021-11-19) ### Bug Fixes * fix cli ([#2294](https://github.com/markedjs/marked/issues/2294)) ([ab2977a](https://github.com/markedjs/marked/commit/ab2977a3363230df51ccbb2b3f8bf46389c50283)) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5d19c51b8..bc8d532807 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "marked", - "version": "4.0.3", + "version": "4.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "4.0.3", + "version": "4.0.4", "license": "MIT", "bin": { "marked": "bin/marked.js" diff --git a/package.json b/package.json index dad1c1570e..ea2b597c52 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "marked", "description": "A markdown parser built for speed", "author": "Christopher Jeffrey", - "version": "4.0.3", + "version": "4.0.4", "type": "module", "main": "./lib/marked.cjs", "module": "./lib/marked.esm.js",