diff --git a/README.md b/README.md
index 7b38c43fe7a63c..ad096cb9616653 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ The open source license grants you the freedom to use Node.js. It does not
guarantee commitments of other people's time. Please be respectful and manage
your expectations.
-## Release Types
+## Release Types
* **Current**: Under active development. Code for the Current release is in the
branch for its major version number (for example,
diff --git a/doc/changelogs/CHANGELOG_V8.md b/doc/changelogs/CHANGELOG_V8.md
index dae53fb97ec425..34dda640b26ad7 100644
--- a/doc/changelogs/CHANGELOG_V8.md
+++ b/doc/changelogs/CHANGELOG_V8.md
@@ -83,7 +83,7 @@ will be supported actively until April 2019 and maintained until December 2019.
- support as and as+ flags in stringToFlags() (Sarat Addepalli) [#18801](https://github.com/nodejs/node/pull/18801)
- emit 'ready' for fs streams and sockets (Sameer Srivastava) [#19408](https://github.com/nodejs/node/pull/19408)
* **http, http2**:
- - add options to http.createServer() (Peter Marton) [#15752](https://github.com/nodejs/node/pull/15752)-
+ - add options to http.createServer() (Peter Marton) [#15752](https://github.com/nodejs/node/pull/15752)-
- add 103 Early Hints status code (Yosuke Furukawa) [#16644](https://github.com/nodejs/node/pull/16644)
- add http fallback options to .createServer (Peter Marton) [#15752](https://github.com/nodejs/node/pull/15752)
* **n-api**:
@@ -250,7 +250,7 @@ will be supported actively until April 2019 and maintained until December 2019.
* [[`e17f05a817`](https://github.com/nodejs/node/commit/e17f05a817)] - **src**: create per-isolate strings after platform setup (Ulan Degenbaev) [#20175](https://github.com/nodejs/node/pull/20175)
* [[`d38ccbb07f`](https://github.com/nodejs/node/commit/d38ccbb07f)] - **src**: use `unordered\_map` for perf marks (Anna Henningsen) [#19558](https://github.com/nodejs/node/pull/19558)
* [[`553e34ef9c`](https://github.com/nodejs/node/commit/553e34ef9c)] - **src**: simplify http2 perf tracking code (Anna Henningsen) [#19470](https://github.com/nodejs/node/pull/19470)
-* [[`67182912d7`](https://github.com/nodejs/node/commit/67182912d7)] - **src**: add "icu::" prefix before ICU symbols (Steven R. Loomis)
+* [[`67182912d7`](https://github.com/nodejs/node/commit/67182912d7)] - **src**: add "icu::" prefix before ICU symbols (Steven R. Loomis)
* [[`2cf263519a`](https://github.com/nodejs/node/commit/2cf263519a)] - **src**: use unique\_ptr for scheduled delayed tasks (Franziska Hinkelmann) [#17083](https://github.com/nodejs/node/pull/17083)
* [[`2148b1921e`](https://github.com/nodejs/node/commit/2148b1921e)] - **src**: use unique\_ptr in platform implementation (Franziska Hinkelmann) [#16970](https://github.com/nodejs/node/pull/16970)
* [[`e9327541e1`](https://github.com/nodejs/node/commit/e9327541e1)] - **src**: cancel pending delayed platform tasks on exit (Anna Henningsen) [#16700](https://github.com/nodejs/node/pull/16700)
diff --git a/tools/lint-md.js b/tools/lint-md.js
index 79391bed3cc41f..03d12efbd270f7 100644
--- a/tools/lint-md.js
+++ b/tools/lint-md.js
@@ -30708,64 +30708,91 @@ var remark = unified_1()
.use(remarkStringify)
.freeze();
-const name = "remark";
-const version$1 = "10.0.0";
-const description = "Markdown processor powered by plugins";
-const license = "MIT";
-const keywords = ["markdown","abstract","syntax","tree","ast","parse","stringify","process"];
-const homepage = "http://remark.js.org";
-const repository = "https://github.com/remarkjs/remark/tree/master/packages/remark";
-const bugs = "https://github.com/remarkjs/remark/issues";
-const author = "Titus Wormer <tituswormer@gmail.com> (http://wooorm.com)";
-const contributors = ["Titus Wormer <tituswormer@gmail.com> (http://wooorm.com)"];
-const files = ["index.js"];
+const _args = [["remark@10.0.0","/Users/daijiro/Developments/node/tools/node-lint-md-cli-rollup"]];
+const _from = "remark@10.0.0";
+const _id = "remark@10.0.0";
+const _inBundle = false;
+const _integrity = "sha512-0fZvVmd9CgDi1qHGsRTyhpJShw60r3/4OSdRpAx+I7CmE8/Jmt829T9KWHpw2Ygw3chRZ26sMorqb8aIolU9tQ==";
+const _location = "/remark";
+const _phantomChildren = {};
+const _requested = {"type":"version","registry":true,"raw":"remark@10.0.0","name":"remark","escapedName":"remark","rawSpec":"10.0.0","saveSpec":null,"fetchSpec":"10.0.0"};
+const _requiredBy = ["/"];
+const _resolved = "https://registry.npmjs.org/remark/-/remark-10.0.0.tgz";
+const _spec = "10.0.0";
+const _where = "/Users/daijiro/Developments/node/tools/node-lint-md-cli-rollup";
+const author = {"name":"Titus Wormer","email":"tituswormer@gmail.com","url":"http://wooorm.com"};
+const bugs = {"url":"https://github.com/remarkjs/remark/issues"};
+const contributors = [{"name":"Titus Wormer","email":"tituswormer@gmail.com","url":"http://wooorm.com"}];
const dependencies = {"remark-parse":"^6.0.0","remark-stringify":"^6.0.0","unified":"^7.0.0"};
+const description = "Markdown processor powered by plugins";
const devDependencies = {"tape":"^4.9.1"};
+const files = ["index.js"];
+const homepage = "http://remark.js.org";
+const keywords = ["markdown","abstract","syntax","tree","ast","parse","stringify","process"];
+const license = "MIT";
+const name = "remark";
+const repository = {"type":"git","url":"https://github.com/remarkjs/remark/tree/master/packages/remark"};
const scripts = {"test":"tape test.js"};
+const version$1 = "10.0.0";
const xo = false;
-const _resolved = "https://registry.npmjs.org/remark/-/remark-10.0.0.tgz";
-const _integrity = "sha512-0fZvVmd9CgDi1qHGsRTyhpJShw60r3/4OSdRpAx+I7CmE8/Jmt829T9KWHpw2Ygw3chRZ26sMorqb8aIolU9tQ==";
-const _from = "remark@10.0.0";
var _package = {
- name: name,
- version: version$1,
- description: description,
- license: license,
- keywords: keywords,
- homepage: homepage,
- repository: repository,
- bugs: bugs,
+ _args: _args,
+ _from: _from,
+ _id: _id,
+ _inBundle: _inBundle,
+ _integrity: _integrity,
+ _location: _location,
+ _phantomChildren: _phantomChildren,
+ _requested: _requested,
+ _requiredBy: _requiredBy,
+ _resolved: _resolved,
+ _spec: _spec,
+ _where: _where,
author: author,
+ bugs: bugs,
contributors: contributors,
- files: files,
dependencies: dependencies,
+ description: description,
devDependencies: devDependencies,
+ files: files,
+ homepage: homepage,
+ keywords: keywords,
+ license: license,
+ name: name,
+ repository: repository,
scripts: scripts,
- xo: xo,
- _resolved: _resolved,
- _integrity: _integrity,
- _from: _from
+ version: version$1,
+ xo: xo
};
var _package$1 = Object.freeze({
- name: name,
- version: version$1,
- description: description,
- license: license,
- keywords: keywords,
- homepage: homepage,
- repository: repository,
- bugs: bugs,
+ _args: _args,
+ _from: _from,
+ _id: _id,
+ _inBundle: _inBundle,
+ _integrity: _integrity,
+ _location: _location,
+ _phantomChildren: _phantomChildren,
+ _requested: _requested,
+ _requiredBy: _requiredBy,
+ _resolved: _resolved,
+ _spec: _spec,
+ _where: _where,
author: author,
+ bugs: bugs,
contributors: contributors,
- files: files,
dependencies: dependencies,
+ description: description,
devDependencies: devDependencies,
+ files: files,
+ homepage: homepage,
+ keywords: keywords,
+ license: license,
+ name: name,
+ repository: repository,
scripts: scripts,
+ version: version$1,
xo: xo,
- _resolved: _resolved,
- _integrity: _integrity,
- _from: _from,
default: _package
});
@@ -30773,7 +30800,7 @@ const name$1 = "node-lint-md-cli-rollup";
const description$1 = "remark packaged for node markdown linting";
const version$2 = "1.0.0";
const devDependencies$1 = {"rollup":"^0.55.5","rollup-plugin-commonjs":"^8.0.2","rollup-plugin-json":"^2.3.1","rollup-plugin-node-resolve":"^3.4.0"};
-const dependencies$1 = {"markdown-extensions":"^1.1.0","remark":"^10.0.0","remark-lint":"^6.0.3","remark-preset-lint-node":"^1.2.0","unified-args":"^6.0.0","unified-engine":"^5.1.0"};
+const dependencies$1 = {"markdown-extensions":"^1.1.0","remark":"^10.0.0","remark-lint":"^6.0.3","remark-preset-lint-node":"^1.3.1","unified-args":"^6.0.0","unified-engine":"^5.1.0"};
const scripts$1 = {"build":"rollup -c","build-node":"npm run build && cp dist/* .."};
var _package$2 = {
name: name$1,
@@ -32692,50 +32719,56 @@ function noAutoLinkWithoutProtocol(tree, file) {
}
}
-var remarkLintNoBlockquoteWithoutCaret = unifiedLintRule('remark-lint:no-blockquote-without-caret', noBlockquoteWithoutCaret);
+var remarkLintNoBlockquoteWithoutMarker = unifiedLintRule(
+ 'remark-lint:no-blockquote-without-marker',
+ noBlockquoteWithoutMarker
+);
+
+var reason$4 = 'Missing marker in blockquote';
-function noBlockquoteWithoutCaret(ast, file) {
- var contents = file.toString();
+function noBlockquoteWithoutMarker(tree, file) {
+ var contents = String(file);
var location = vfileLocation(file);
var last = contents.length;
- unistUtilVisit(ast, 'blockquote', visitor);
+ unistUtilVisit(tree, 'blockquote', visitor);
function visitor(node) {
- var start = unistUtilPosition.start(node).line;
var indent = node.position && node.position.indent;
+ var start;
+ var length;
+ var index;
+ var line;
+ var offset;
+ var character;
+ var pos;
if (unistUtilGenerated(node) || !indent || indent.length === 0) {
- return;
+ return
}
- indent.forEach(eachLine);
+ start = unistUtilPosition.start(node).line;
+ length = indent.length;
+ index = -1;
- function eachLine(column, n) {
- var character;
- var line = start + n + 1;
- var offset = location.toOffset({
- line: line,
- column: column
- }) - 1;
+ while (++index < length) {
+ line = start + index + 1;
+ pos = {line: line, column: indent[index]};
+ offset = location.toOffset(pos) - 1;
while (++offset < last) {
character = contents.charAt(offset);
if (character === '>') {
- return;
+ break
}
/* istanbul ignore else - just for safety */
if (character !== ' ' && character !== '\t') {
- break;
+ file.message(reason$4, pos);
+ break
}
}
-
- file.message('Missing caret in blockquote', {
- line: line,
- column: column
- });
}
}
}
@@ -32745,7 +32778,7 @@ var remarkLintNoDuplicateDefinitions = unifiedLintRule(
noDuplicateDefinitions
);
-var reason$4 = 'Do not use definitions with the same identifier';
+var reason$5 = 'Do not use definitions with the same identifier';
function noDuplicateDefinitions(tree, file) {
var map = {};
@@ -32762,7 +32795,7 @@ function noDuplicateDefinitions(tree, file) {
if (duplicate && duplicate.type) {
file.message(
- reason$4 + ' (' + unistUtilStringifyPosition(unistUtilPosition.start(duplicate)) + ')',
+ reason$5 + ' (' + unistUtilStringifyPosition(unistUtilPosition.start(duplicate)) + ')',
node
);
}
@@ -32787,11 +32820,11 @@ var remarkLintNoFileNameConsecutiveDashes = unifiedLintRule(
noFileNameConsecutiveDashes
);
-var reason$5 = 'Do not use consecutive dashes in a file name';
+var reason$6 = 'Do not use consecutive dashes in a file name';
function noFileNameConsecutiveDashes(tree, file) {
if (file.stem && /-{2,}/.test(file.stem)) {
- file.message(reason$5);
+ file.message(reason$6);
}
}
@@ -32800,11 +32833,11 @@ var remarkLintNoFileNameOuterDashes = unifiedLintRule(
noFileNameOuterDashes
);
-var reason$6 = 'Do not use initial or final dashes in a file name';
+var reason$7 = 'Do not use initial or final dashes in a file name';
function noFileNameOuterDashes(tree, file) {
if (file.stem && /^-|-$/.test(file.stem)) {
- file.message(reason$6);
+ file.message(reason$7);
}
}
@@ -33043,7 +33076,7 @@ function noMultipleToplevelHeadings(tree, file, pref) {
var remarkLintNoShellDollars = unifiedLintRule('remark-lint:no-shell-dollars', noShellDollars);
-var reason$7 = 'Do not use dollar signs before shell-commands';
+var reason$8 = 'Do not use dollar signs before shell-commands';
/* List of shell script file extensions (also used as code
* flags for syntax highlighting on GitHub):
@@ -33089,7 +33122,7 @@ function noShellDollars(tree, file) {
}
}
- file.message(reason$7, node);
+ file.message(reason$8, node);
}
}
}
@@ -33099,21 +33132,21 @@ var remarkLintNoShortcutReferenceImage = unifiedLintRule(
noShortcutReferenceImage
);
-var reason$8 = 'Use the trailing [] on reference images';
+var reason$9 = 'Use the trailing [] on reference images';
function noShortcutReferenceImage(tree, file) {
unistUtilVisit(tree, 'imageReference', visitor);
function visitor(node) {
if (!unistUtilGenerated(node) && node.referenceType === 'shortcut') {
- file.message(reason$8, node);
+ file.message(reason$9, node);
}
}
}
var remarkLintNoTableIndentation = unifiedLintRule('remark-lint:no-table-indentation', noTableIndentation);
-var reason$9 = 'Do not indent table rows';
+var reason$10 = 'Do not indent table rows';
function noTableIndentation(tree, file) {
var contents = String(file);
@@ -33135,14 +33168,14 @@ function noTableIndentation(tree, file) {
);
if (fence.indexOf('|') > 1) {
- file.message(reason$9, row);
+ file.message(reason$10, row);
}
}
}
var remarkLintNoTabs = unifiedLintRule('remark-lint:no-tabs', noTabs);
-var reason$10 = 'Use spaces instead of hard-tabs';
+var reason$11 = 'Use spaces instead of hard-tabs';
function noTabs(tree, file) {
var content = String(file);
@@ -33150,14 +33183,37 @@ function noTabs(tree, file) {
var index = content.indexOf('\t');
while (index !== -1) {
- file.message(reason$10, position(index));
+ file.message(reason$11, position(index));
index = content.indexOf('\t', index + 1);
}
}
+var remarkLintNoTrailingSpaces = unifiedLintRule('remark-lint:no-trailing-spaces', noTrailingSpaces);
+
+/**
+ * Lines that are just space characters are not present in
+ * the AST, which is why we loop through lines manually.
+ */
+
+function noTrailingSpaces(ast, file) {
+ var lines = file.toString().split('\n');
+ for (var i = 0; i < lines.length; i++) {
+ var currentLine = lines[i];
+ var lineIndex = i + 1;
+ if (/\s$/.test(currentLine)) {
+ file.message('Remove trailing whitespace', {
+ position: {
+ start: { line: lineIndex, column: currentLine.length + 1 },
+ end: { line: lineIndex }
+ }
+ });
+ }
+ }
+}
+
var remarkLintNoUnusedDefinitions = unifiedLintRule('remark-lint:no-unused-definitions', noUnusedDefinitions);
-var reason$11 = 'Found unused definition';
+var reason$12 = 'Found unused definition';
function noUnusedDefinitions(tree, file) {
var map = {};
@@ -33171,7 +33227,7 @@ function noUnusedDefinitions(tree, file) {
entry = map[identifier];
if (!entry.used) {
- file.message(reason$11, entry.node);
+ file.message(reason$12, entry.node);
}
}
@@ -33789,7 +33845,7 @@ var plugins$1 = [
],
remarkLintMaximumLineLength,
remarkLintNoAutoLinkWithoutProtocol,
- remarkLintNoBlockquoteWithoutCaret,
+ remarkLintNoBlockquoteWithoutMarker,
remarkLintNoDuplicateDefinitions,
remarkLintNoFileNameArticles,
remarkLintNoFileNameConsecutiveDashes,
@@ -33802,6 +33858,7 @@ var plugins$1 = [
remarkLintNoShortcutReferenceImage,
remarkLintNoTableIndentation,
remarkLintNoTabs,
+ remarkLintNoTrailingSpaces,
remarkLintNoUnusedDefinitions,
remarkLintRuleStyle,
remarkLintTablePipes,
diff --git a/tools/node-lint-md-cli-rollup/package-lock.json b/tools/node-lint-md-cli-rollup/package-lock.json
index e0010d99ef293d..41a5a3085fda46 100644
--- a/tools/node-lint-md-cli-rollup/package-lock.json
+++ b/tools/node-lint-md-cli-rollup/package-lock.json
@@ -1779,7 +1779,7 @@
},
"os-homedir": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"parse-entities": {
@@ -1845,7 +1845,7 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
"path-parse": {
@@ -2143,10 +2143,10 @@
"unist-util-visit": "^1.1.1"
}
},
- "remark-lint-no-blockquote-without-caret": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-caret/-/remark-lint-no-blockquote-without-caret-1.0.0.tgz",
- "integrity": "sha1-gd0i3V8EVOupwqU3u6Jgh0ShrW8=",
+ "remark-lint-no-blockquote-without-marker": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-2.0.2.tgz",
+ "integrity": "sha512-jkfZ4hFiviZttEo7Ac7GZWFgMQ/bdVPfSluLeuf+qwL8sQvR4ClklKJ0Xbkk3cLRjvlGsc8U8uZR8qqH5MSLoA==",
"requires": {
"unified-lint-rule": "^1.0.0",
"unist-util-generated": "^1.1.0",
@@ -2279,6 +2279,14 @@
"vfile-location": "^2.0.1"
}
},
+ "remark-lint-no-trailing-spaces": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/remark-lint-no-trailing-spaces/-/remark-lint-no-trailing-spaces-2.0.0.tgz",
+ "integrity": "sha512-UVb0xAFO5lsa/kRNC/qHOz7GuF91TjW7hk+m8hUircj1Nh53BP9rH24DJ/NVPF1Ve+u5k+pfOTJPqJcvD0zgUw==",
+ "requires": {
+ "unified-lint-rule": "^1.0.2"
+ }
+ },
"remark-lint-no-unused-definitions": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/remark-lint-no-unused-definitions/-/remark-lint-no-unused-definitions-1.0.2.tgz",
@@ -2375,9 +2383,9 @@
}
},
"remark-preset-lint-node": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/remark-preset-lint-node/-/remark-preset-lint-node-1.2.0.tgz",
- "integrity": "sha512-1gcp5BMCIPA9DalVlBva+9s9KaB0mCs3mGaJf3lUvDwqGI2TPTovU/2Nxi4Vr9r2iSo/2qVNyXA0v8JqADU70A==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/remark-preset-lint-node/-/remark-preset-lint-node-1.3.1.tgz",
+ "integrity": "sha512-Mh9eX1ovpnKQiTy9R/BR8ZKkPJrMOHrLn+vRw7SRs1UooiKwIm1KRp1UaDLO6Z3pCCizhH4Bqln5XZTGnMkNaA==",
"requires": {
"remark-lint": "^6.0.0",
"remark-lint-blockquote-indentation": "^1.0.0",
@@ -2396,7 +2404,7 @@
"remark-lint-list-item-indent": "^1.0.3",
"remark-lint-maximum-line-length": "^1.1.0",
"remark-lint-no-auto-link-without-protocol": "^1.0.0",
- "remark-lint-no-blockquote-without-caret": "^1.0.0",
+ "remark-lint-no-blockquote-without-marker": "^2.0.2",
"remark-lint-no-duplicate-definitions": "^1.0.0",
"remark-lint-no-file-name-articles": "^1.0.0",
"remark-lint-no-file-name-consecutive-dashes": "^1.0.0",
@@ -2409,8 +2417,9 @@
"remark-lint-no-shortcut-reference-image": "^1.0.0",
"remark-lint-no-table-indentation": "^1.0.0",
"remark-lint-no-tabs": "^1.0.0",
+ "remark-lint-no-trailing-spaces": "^2.0.0",
"remark-lint-no-unused-definitions": "^1.0.0",
- "remark-lint-prohibited-strings": "^1.0.0",
+ "remark-lint-prohibited-strings": "^1.0.3",
"remark-lint-rule-style": "^1.0.0",
"remark-lint-strong-marker": "^1.0.0",
"remark-lint-table-cell-padding": "^1.0.0",
@@ -2629,7 +2638,7 @@
},
"safe-regex": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"requires": {
"ret": "~0.1.10"
diff --git a/tools/node-lint-md-cli-rollup/package.json b/tools/node-lint-md-cli-rollup/package.json
index 212b3c97f1211f..2efdb6404b3d2b 100644
--- a/tools/node-lint-md-cli-rollup/package.json
+++ b/tools/node-lint-md-cli-rollup/package.json
@@ -12,7 +12,7 @@
"markdown-extensions": "^1.1.0",
"remark": "^10.0.0",
"remark-lint": "^6.0.3",
- "remark-preset-lint-node": "^1.2.0",
+ "remark-preset-lint-node": "^1.3.1",
"unified-args": "^6.0.0",
"unified-engine": "^5.1.0"
},