From gitlab at salsa.debian.org Thu Jun 30 10:18:29 2022 From: gitlab at salsa.debian.org (Yadd (@yadd)) Date: Thu, 30 Jun 2022 09:18:29 +0000 Subject: [Pkg-javascript-commits] [Git][js-team/node-marked][pristine-tar] 2 commits: pristine-tar data for node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz Message-ID: <62bd6a6568ac8_3db4565035214b@godard.mail> Yadd pushed to branch pristine-tar at Debian JavaScript Maintainers / node-marked Commits: 7bf5001a by Yadd at 2022-06-30T10:56:18+02:00 pristine-tar data for node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz - - - - - 68e0b82f by Yadd at 2022-06-30T10:56:19+02:00 pristine-tar data for node-marked_4.0.17+ds+~4.0.3.orig.tar.xz - - - - - 4 changed files: - + node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz.delta - + node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz.id - + node-marked_4.0.17+ds+~4.0.3.orig.tar.xz.delta - + node-marked_4.0.17+ds+~4.0.3.orig.tar.xz.id Changes: ===================================== node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz.delta ===================================== Binary files /dev/null and b/node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz.delta differ ===================================== node-marked_4.0.17+ds+~4.0.3.orig-types-marked.tar.xz.id ===================================== @@ -0,0 +1 @@ +6640828eaa06675df0102f1f0ac9573ab5298c76 ===================================== node-marked_4.0.17+ds+~4.0.3.orig.tar.xz.delta ===================================== Binary files /dev/null and b/node-marked_4.0.17+ds+~4.0.3.orig.tar.xz.delta differ ===================================== node-marked_4.0.17+ds+~4.0.3.orig.tar.xz.id ===================================== @@ -0,0 +1 @@ +014be26b9840aa6dc880684681692b8f145b2fb0 View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/compare/13e4287fc2acd9eba64b1e46b9b68de55534e543...68e0b82ff42786a07b8ce67329d8917e19ad7901 -- View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/compare/13e4287fc2acd9eba64b1e46b9b68de55534e543...68e0b82ff42786a07b8ce67329d8917e19ad7901 You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Thu Jun 30 10:18:31 2022 From: gitlab at salsa.debian.org (Yadd (@yadd)) Date: Thu, 30 Jun 2022 09:18:31 +0000 Subject: [Pkg-javascript-commits] [Git][js-team/node-marked] Pushed new tag debian/4.0.17+ds+_4.0.3-1 Message-ID: <62bd6a67c4279_3db40f3835238f@godard.mail> Yadd pushed new tag debian/4.0.17+ds+_4.0.3-1 at Debian JavaScript Maintainers / node-marked -- View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/tree/debian/4.0.17+ds+_4.0.3-1 You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Thu Jun 30 10:18:27 2022 From: gitlab at salsa.debian.org (Yadd (@yadd)) Date: Thu, 30 Jun 2022 09:18:27 +0000 Subject: [Pkg-javascript-commits] [Git][js-team/node-marked][master] 6 commits: New upstream version 4.0.17+ds+~4.0.3 Message-ID: <62bd6a63ae4e2_3db40f383519cd@godard.mail> Yadd pushed to branch master at Debian JavaScript Maintainers / node-marked Commits: 1031b64d by Yadd at 2022-06-30T10:56:18+02:00 New upstream version 4.0.17+ds+~4.0.3 - - - - - d5621c71 by Yadd at 2022-06-30T10:56:19+02:00 Update upstream source from tag 'upstream/4.0.17+ds+_4.0.3' Update to upstream version '4.0.17+ds+~4.0.3' with Debian dir b2d785e705cfcf18fd7fb698ade38e06cc24931f - - - - - 8bdae2fc by Yadd at 2022-06-30T10:59:11+02:00 Fix for js-yaml >= 4 - - - - - 5bfe4dca by Yadd at 2022-06-30T11:01:49+02:00 lintian - - - - - ae527a6b by Yadd at 2022-06-30T11:08:03+02:00 lintian - - - - - 4194870b by Yadd at 2022-06-30T11:16:46+02:00 releasing package node-marked version 4.0.17+ds+~4.0.3-1 - - - - - 16 changed files: - README.md - debian/changelog - debian/source/lintian-overrides - debian/tests/test_modules/front-matter/index.js - docs/INDEX.md - package-lock.json - package.json - src/Tokenizer.js - + test/specs/new/fences_following_list.html - + test/specs/new/fences_following_list.md - + test/specs/new/fences_with_blankline_following_list_0.html - + test/specs/new/fences_with_blankline_following_list_0.md - + test/specs/new/fences_with_blankline_following_list_1.html - + test/specs/new/fences_with_blankline_following_list_1.md - + test/specs/new/heading_following_list.html - + test/specs/new/heading_following_list.md Changes: ===================================== README.md ===================================== @@ -37,9 +37,17 @@ Also read about: ## Installation -**CLI:** `npm install -g marked` +**CLI:** -**In-browser:** `npm install marked` +```sh +npm install -g marked +``` + +**In-browser:** + +```sh +npm install marked +``` ## Usage ===================================== debian/changelog ===================================== @@ -1,10 +1,11 @@ -node-marked (4.0.16+ds+~4.0.3-2) UNRELEASED; urgency=medium +node-marked (4.0.17+ds+~4.0.3-1) unstable; urgency=medium * Team upload - * Replace embeded parse5-sax-parser by link to debian module + * Replace embedded parse5-sax-parser by link to debian module * Update test dependencies (Closes: #1013989) + * New upstream version 4.0.17+ds+~4.0.3 - -- Yadd Thu, 30 Jun 2022 10:55:44 +0200 + -- Yadd Thu, 30 Jun 2022 11:04:17 +0200 node-marked (4.0.16+ds+~4.0.3-1) unstable; urgency=medium ===================================== debian/source/lintian-overrides ===================================== @@ -1,10 +1,5 @@ # Build material -source-is-missing debian/build_modules/rollup-plugin-license/dist/dependency.js -source-is-missing debian/build_modules/rollup-plugin-license/dist/license-plugin.js -source-is-missing debian/build_modules/rollup-plugin-license/dist/person.js -source-contains-prebuilt-javascript-object debian/build_modules/rollup-plugin-license/dist/dependency.js -source-contains-prebuilt-javascript-object debian/build_modules/rollup-plugin-license/dist/license-plugin.js -source-contains-prebuilt-javascript-object debian/build_modules/rollup-plugin-license/dist/person.js +source-is-missing *.html* # False positives -very-long-line-length-in-source-file *.md line * -very-long-line-length-in-source-file *.html line * +very-long-line-length-in-source-file *.md* +very-long-line-length-in-source-file *.html* ===================================== debian/tests/test_modules/front-matter/index.js ===================================== @@ -59,7 +59,7 @@ function parse (string, allowUnsafe) { } } - var loader = allowUnsafe ? parser.load : parser.safeLoad + var loader = allowUnsafe ? parser.load : parser.load var yaml = match[match.length - 1].replace(/^\s+|\s+$/g, '') var attributes = loader(yaml) || {} var body = string.replace(match[0], '') ===================================== docs/INDEX.md ===================================== @@ -25,7 +25,7 @@ These documentation pages are also rendered using marked ?

Usage

-### Warning: ? Marked does not [sanitize](/using_advanced#options) the output HTML. Please use a sanitize library, like [DOMPurify](https://github.com/cure53/DOMPurify) (recommended), [sanitize-html](https://github.com/apostrophecms/sanitize-html) or [insane](https://github.com/bevacqua/insane) on the *output* HTML! ? +### Warning: ? Marked does not [sanitize](/using_advanced#options) the output HTML. If you are processing potentially unsafe strings, it's important to filter for possible XSS attacks. Some filtering options include [DOMPurify](https://github.com/cure53/DOMPurify) (recommended), [js-xss](https://github.com/leizongmin/js-xss), [sanitize-html](https://github.com/apostrophecms/sanitize-html) and [insane](https://github.com/bevacqua/insane) on the *output* HTML! ? ``` DOMPurify.sanitize(marked.parse(``)); ===================================== package-lock.json ===================================== The diff for this file was not included because it is too large. ===================================== package.json ===================================== @@ -2,7 +2,7 @@ "name": "marked", "description": "A markdown parser built for speed", "author": "Christopher Jeffrey", - "version": "4.0.16", + "version": "4.0.17", "type": "module", "main": "./lib/marked.cjs", "module": "./lib/marked.esm.js", @@ -42,8 +42,8 @@ "html" ], "devDependencies": { - "@babel/core": "^7.17.10", - "@babel/preset-env": "^7.17.10", + "@babel/core": "^7.18.2", + "@babel/preset-env": "^7.18.2", "@markedjs/html-differ": "^4.0.2", "@rollup/plugin-babel": "^5.3.1", "@rollup/plugin-commonjs": "^22.0.0", @@ -52,23 +52,23 @@ "@semantic-release/github": "^8.0.4", "@semantic-release/npm": "^9.0.1", "@semantic-release/release-notes-generator": "^10.0.3", - "cheerio": "^1.0.0-rc.10", + "cheerio": "^1.0.0-rc.11", "commonmark": "0.30.0", - "eslint": "^8.15.0", + "eslint": "^8.17.0", "eslint-config-standard": "^17.0.0", "eslint-plugin-import": "^2.26.0", - "eslint-plugin-n": "^15.2.0", + "eslint-plugin-n": "^15.2.1", "eslint-plugin-promise": "^6.0.0", "front-matter": "^4.0.2", "highlight.js": "^11.5.1", "jasmine": "^4.1.0", "markdown-it": "13.0.1", - "node-fetch": "^3.2.4", - "rollup": "^2.73.0", - "rollup-plugin-license": "^2.7.0", - "semantic-release": "^19.0.2", + "node-fetch": "^3.2.5", + "rollup": "^2.75.5", + "rollup-plugin-license": "^2.8.0", + "semantic-release": "^19.0.3", "titleize": "^3.0.0", - "uglify-js": "^3.15.5", + "uglify-js": "^3.16.0", "vuln-regex-detector": "^1.3.0" }, "scripts": { ===================================== src/Tokenizer.js ===================================== @@ -226,6 +226,7 @@ export class Tokenizer { if (!endEarly) { const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))`); const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`); + const fencesBeginRegex = new RegExp(`^( {0,${Math.min(3, indent - 1)}})(\`\`\`|~~~)`); // Check if following lines should be included in List Item while (src) { @@ -237,6 +238,16 @@ export class Tokenizer { line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, ' '); } + // End list item if found code fences + if (fencesBeginRegex.test(line)) { + break; + } + + // End list item if found start of new heading + if (this.rules.block.heading.test(line)) { + break; + } + // End list item if found start of new bullet if (nextBulletRegex.test(line)) { break; ===================================== test/specs/new/fences_following_list.html ===================================== @@ -0,0 +1,7 @@ +
    +
  1. abcd
  2. +
+
if {
+
+}
+
===================================== test/specs/new/fences_following_list.md ===================================== @@ -0,0 +1,5 @@ +1. abcd +``` +if { +} +``` ===================================== test/specs/new/fences_with_blankline_following_list_0.html ===================================== @@ -0,0 +1,23 @@ +
    +
  1. code with blankline
  2. +
+
if {
+
+}
+
+
    +
  1. code and text
  2. +
+
if {
+
+}
+
+

text after fenced code block.

+
    +
  1. tilde
  2. +
+
if {
+
+
+}
+
===================================== test/specs/new/fences_with_blankline_following_list_0.md ===================================== @@ -0,0 +1,22 @@ +1. code with blankline +``` +if { + +} +``` + +2. code and text +``` +if { + + +} +``` +text after fenced code block. + +3. tilde +~~~ +if { + +} +~~~ ===================================== test/specs/new/fences_with_blankline_following_list_1.html ===================================== @@ -0,0 +1,22 @@ +
    +
  1. code with blankline

    +
    if {
    +
    +}
    +
    +
  2. +
  3. code and text

    +
    if {
    +
    +}
    +
    +

    text after fenced code block.

    +
  4. +
  5. tilde

    +
    if {
    +
    +
    +}
    +
    +
  6. +
===================================== test/specs/new/fences_with_blankline_following_list_1.md ===================================== @@ -0,0 +1,23 @@ +1. code with blankline + ``` + if { + + } + ``` + +2. code and text + ``` + if { + + + } + ``` + text after fenced code block. + +3. tilde + ~~~ + if { + + } + ~~~ + ===================================== test/specs/new/heading_following_list.html ===================================== @@ -0,0 +1,8 @@ +

level1

+

level2

+

level3

+
    +
  • foo=bar
  • +
  • foo2=bar2
  • +
+

level3

===================================== test/specs/new/heading_following_list.md ===================================== @@ -0,0 +1,6 @@ +# level1 +## level2 +### level3 +- foo=bar +- foo2=bar2 +### level3 View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/compare/7053cb55cb7311ab4279e78fb32aecec09deeab4...4194870bbc0098bc38b11a217b24048d74cd98b0 -- View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/compare/7053cb55cb7311ab4279e78fb32aecec09deeab4...4194870bbc0098bc38b11a217b24048d74cd98b0 You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Thu Jun 30 10:18:33 2022 From: gitlab at salsa.debian.org (Yadd (@yadd)) Date: Thu, 30 Jun 2022 09:18:33 +0000 Subject: [Pkg-javascript-commits] [Git][js-team/node-marked] Pushed new tag upstream/4.0.17+ds+_4.0.3 Message-ID: <62bd6a695d124_3db40f38352593@godard.mail> Yadd pushed new tag upstream/4.0.17+ds+_4.0.3 at Debian JavaScript Maintainers / node-marked -- View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/tree/upstream/4.0.17+ds+_4.0.3 You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at salsa.debian.org Thu Jun 30 10:18:36 2022 From: gitlab at salsa.debian.org (Yadd (@yadd)) Date: Thu, 30 Jun 2022 09:18:36 +0000 Subject: [Pkg-javascript-commits] [Git][js-team/node-marked][upstream] New upstream version 4.0.17+ds+~4.0.3 Message-ID: <62bd6a6cccc00_3db40f4c352736@godard.mail> Yadd pushed to branch upstream at Debian JavaScript Maintainers / node-marked Commits: 1031b64d by Yadd at 2022-06-30T10:56:18+02:00 New upstream version 4.0.17+ds+~4.0.3 - - - - - 13 changed files: - README.md - docs/INDEX.md - package-lock.json - package.json - src/Tokenizer.js - + test/specs/new/fences_following_list.html - + test/specs/new/fences_following_list.md - + test/specs/new/fences_with_blankline_following_list_0.html - + test/specs/new/fences_with_blankline_following_list_0.md - + test/specs/new/fences_with_blankline_following_list_1.html - + test/specs/new/fences_with_blankline_following_list_1.md - + test/specs/new/heading_following_list.html - + test/specs/new/heading_following_list.md Changes: ===================================== README.md ===================================== @@ -37,9 +37,17 @@ Also read about: ## Installation -**CLI:** `npm install -g marked` +**CLI:** -**In-browser:** `npm install marked` +```sh +npm install -g marked +``` + +**In-browser:** + +```sh +npm install marked +``` ## Usage ===================================== docs/INDEX.md ===================================== @@ -25,7 +25,7 @@ These documentation pages are also rendered using marked ?

Usage

-### Warning: ? Marked does not [sanitize](/using_advanced#options) the output HTML. Please use a sanitize library, like [DOMPurify](https://github.com/cure53/DOMPurify) (recommended), [sanitize-html](https://github.com/apostrophecms/sanitize-html) or [insane](https://github.com/bevacqua/insane) on the *output* HTML! ? +### Warning: ? Marked does not [sanitize](/using_advanced#options) the output HTML. If you are processing potentially unsafe strings, it's important to filter for possible XSS attacks. Some filtering options include [DOMPurify](https://github.com/cure53/DOMPurify) (recommended), [js-xss](https://github.com/leizongmin/js-xss), [sanitize-html](https://github.com/apostrophecms/sanitize-html) and [insane](https://github.com/bevacqua/insane) on the *output* HTML! ? ``` DOMPurify.sanitize(marked.parse(``)); ===================================== package-lock.json ===================================== The diff for this file was not included because it is too large. ===================================== package.json ===================================== @@ -2,7 +2,7 @@ "name": "marked", "description": "A markdown parser built for speed", "author": "Christopher Jeffrey", - "version": "4.0.16", + "version": "4.0.17", "type": "module", "main": "./lib/marked.cjs", "module": "./lib/marked.esm.js", @@ -42,8 +42,8 @@ "html" ], "devDependencies": { - "@babel/core": "^7.17.10", - "@babel/preset-env": "^7.17.10", + "@babel/core": "^7.18.2", + "@babel/preset-env": "^7.18.2", "@markedjs/html-differ": "^4.0.2", "@rollup/plugin-babel": "^5.3.1", "@rollup/plugin-commonjs": "^22.0.0", @@ -52,23 +52,23 @@ "@semantic-release/github": "^8.0.4", "@semantic-release/npm": "^9.0.1", "@semantic-release/release-notes-generator": "^10.0.3", - "cheerio": "^1.0.0-rc.10", + "cheerio": "^1.0.0-rc.11", "commonmark": "0.30.0", - "eslint": "^8.15.0", + "eslint": "^8.17.0", "eslint-config-standard": "^17.0.0", "eslint-plugin-import": "^2.26.0", - "eslint-plugin-n": "^15.2.0", + "eslint-plugin-n": "^15.2.1", "eslint-plugin-promise": "^6.0.0", "front-matter": "^4.0.2", "highlight.js": "^11.5.1", "jasmine": "^4.1.0", "markdown-it": "13.0.1", - "node-fetch": "^3.2.4", - "rollup": "^2.73.0", - "rollup-plugin-license": "^2.7.0", - "semantic-release": "^19.0.2", + "node-fetch": "^3.2.5", + "rollup": "^2.75.5", + "rollup-plugin-license": "^2.8.0", + "semantic-release": "^19.0.3", "titleize": "^3.0.0", - "uglify-js": "^3.15.5", + "uglify-js": "^3.16.0", "vuln-regex-detector": "^1.3.0" }, "scripts": { ===================================== src/Tokenizer.js ===================================== @@ -226,6 +226,7 @@ export class Tokenizer { if (!endEarly) { const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))`); const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`); + const fencesBeginRegex = new RegExp(`^( {0,${Math.min(3, indent - 1)}})(\`\`\`|~~~)`); // Check if following lines should be included in List Item while (src) { @@ -237,6 +238,16 @@ export class Tokenizer { line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, ' '); } + // End list item if found code fences + if (fencesBeginRegex.test(line)) { + break; + } + + // End list item if found start of new heading + if (this.rules.block.heading.test(line)) { + break; + } + // End list item if found start of new bullet if (nextBulletRegex.test(line)) { break; ===================================== test/specs/new/fences_following_list.html ===================================== @@ -0,0 +1,7 @@ +
    +
  1. abcd
  2. +
+
if {
+
+}
+
===================================== test/specs/new/fences_following_list.md ===================================== @@ -0,0 +1,5 @@ +1. abcd +``` +if { +} +``` ===================================== test/specs/new/fences_with_blankline_following_list_0.html ===================================== @@ -0,0 +1,23 @@ +
    +
  1. code with blankline
  2. +
+
if {
+
+}
+
+
    +
  1. code and text
  2. +
+
if {
+
+}
+
+

text after fenced code block.

+
    +
  1. tilde
  2. +
+
if {
+
+
+}
+
===================================== test/specs/new/fences_with_blankline_following_list_0.md ===================================== @@ -0,0 +1,22 @@ +1. code with blankline +``` +if { + +} +``` + +2. code and text +``` +if { + + +} +``` +text after fenced code block. + +3. tilde +~~~ +if { + +} +~~~ ===================================== test/specs/new/fences_with_blankline_following_list_1.html ===================================== @@ -0,0 +1,22 @@ +
    +
  1. code with blankline

    +
    if {
    +
    +}
    +
    +
  2. +
  3. code and text

    +
    if {
    +
    +}
    +
    +

    text after fenced code block.

    +
  4. +
  5. tilde

    +
    if {
    +
    +
    +}
    +
    +
  6. +
===================================== test/specs/new/fences_with_blankline_following_list_1.md ===================================== @@ -0,0 +1,23 @@ +1. code with blankline + ``` + if { + + } + ``` + +2. code and text + ``` + if { + + + } + ``` + text after fenced code block. + +3. tilde + ~~~ + if { + + } + ~~~ + ===================================== test/specs/new/heading_following_list.html ===================================== @@ -0,0 +1,8 @@ +

level1

+

level2

+

level3

+
    +
  • foo=bar
  • +
  • foo2=bar2
  • +
+

level3

===================================== test/specs/new/heading_following_list.md ===================================== @@ -0,0 +1,6 @@ +# level1 +## level2 +### level3 +- foo=bar +- foo2=bar2 +### level3 View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/commit/1031b64d80fa3b116b3cd8a452411ab63c2e1060 -- View it on GitLab: https://salsa.debian.org/js-team/node-marked/-/commit/1031b64d80fa3b116b3cd8a452411ab63c2e1060 You're receiving this email because of your account on salsa.debian.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: