Skip to content

Commit 6e8e886

Browse files
author
Benjamin E. Coe
authored
Merge branch 'master' into fix-38790
2 parents 3db9132 + c5cc3d4 commit 6e8e886

File tree

2,807 files changed

+32407
-95423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,807 files changed

+32407
-95423
lines changed

.github/SUPPORT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616

1717
* [Questions tagged 'node.js' on Stack Overflow](https://stackoverflow.com/questions/tagged/node.js)
1818
* [#nodejs](https://openjs-foundation.slack.com/archives/CK9Q4MB53) channel on the OpenJS Foundation Slack ([join here](https://slack-invite.openjsf.org/))
19-
* [#node.js channel on chat.freenode.net](https://webchat.freenode.net?channels=node.js&uio=d4)
19+
* [#node.js channel on libera.chat](https://web.libera.chat?channels=node.js&uio=d4)
2020
* [Node.js Slack Community](https://node-js.slack.com/)
2121
* To register: [nodeslackers.com](https://www.nodeslackers.com/)
2222

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@ release.
3232
</tr>
3333
<tr>
3434
<td valign="top">
35-
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.2.0">16.2.0</a></b><br/>
35+
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.3.0">16.3.0</a></b><br/>
36+
<a href="doc/changelogs/CHANGELOG_V16.md#16.2.0">16.2.0</a><br/>
3637
<a href="doc/changelogs/CHANGELOG_V16.md#16.1.0">16.1.0</a><br/>
3738
<a href="doc/changelogs/CHANGELOG_V16.md#16.0.0">16.0.0</a><br/>
3839
</td>
3940
<td valign="top">
40-
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.16.1">14.16.1</a></b><br/>
41+
<b><a href="doc/changelogs/CHANGELOG_V14.md#14.17.1">14.17.1</a></b><br/>
42+
<a href="doc/changelogs/CHANGELOG_V14.md#14.17.0">14.17.0</a><br/>
43+
<a href="doc/changelogs/CHANGELOG_V14.md#14.16.1">14.16.1</a><br/>
4144
<a href="doc/changelogs/CHANGELOG_V14.md#14.16.0">14.16.0</a><br/>
4245
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.5">14.15.5</a><br/>
4346
<a href="doc/changelogs/CHANGELOG_V14.md#14.15.4">14.15.4</a><br/>

Makefile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ test-valgrind: all
338338
test-check-deopts: all
339339
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --check-deopts parallel sequential
340340

341-
DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.js doc/api/addons.md
341+
DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.mjs doc/api/addons.md
342342

343343
ifeq ($(OSTYPE),aix)
344344
DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
@@ -589,12 +589,12 @@ test-doc: doc-only lint-md ## Builds, lints, and verifies the docs.
589589
else \
590590
$(PYTHON) tools/test.py $(PARALLEL_ARGS) doctool; \
591591
fi
592-
$(NODE) tools/doc/checkLinks.js .
592+
$(NODE) tools/doc/checkLinks.mjs .
593593

594594
.PHONY: test-doc-ci
595595
test-doc-ci: doc-only
596596
$(PYTHON) tools/test.py --shell $(NODE) $(TEST_CI_ARGS) $(PARALLEL_ARGS) doctool
597-
$(NODE) tools/doc/checkLinks.js .
597+
$(NODE) tools/doc/checkLinks.mjs .
598598

599599
test-known-issues: all
600600
$(PYTHON) tools/test.py $(PARALLEL_ARGS) known_issues
@@ -736,33 +736,33 @@ run-npm-ci = $(PWD)/$(NPM) ci
736736

737737
LINK_DATA = out/doc/apilinks.json
738738
VERSIONS_DATA = out/previous-doc-versions.json
739-
gen-api = tools/doc/generate.js --node-version=$(FULLVERSION) \
739+
gen-api = tools/doc/generate.mjs --node-version=$(FULLVERSION) \
740740
--apilinks=$(LINK_DATA) $< --output-directory=out/doc/api \
741741
--versions-file=$(VERSIONS_DATA)
742-
gen-apilink = tools/doc/apilinks.js $(LINK_DATA) $(wildcard lib/*.js)
742+
gen-apilink = tools/doc/apilinks.mjs $(LINK_DATA) $(wildcard lib/*.js)
743743

744-
$(LINK_DATA): $(wildcard lib/*.js) tools/doc/apilinks.js | out/doc
744+
$(LINK_DATA): $(wildcard lib/*.js) tools/doc/apilinks.mjs | out/doc
745745
$(call available-node, $(gen-apilink))
746746

747747
# Regenerate previous versions data if the current version changes
748-
$(VERSIONS_DATA): CHANGELOG.md src/node_version.h tools/doc/versions.js
749-
$(call available-node, tools/doc/versions.js $@)
748+
$(VERSIONS_DATA): CHANGELOG.md src/node_version.h tools/doc/versions.mjs
749+
$(call available-node, tools/doc/versions.mjs $@)
750750

751-
out/doc/api/%.json out/doc/api/%.html: doc/api/%.md tools/doc/generate.js \
752-
tools/doc/markdown.js tools/doc/html.js tools/doc/json.js \
753-
tools/doc/apilinks.js $(VERSIONS_DATA) | $(LINK_DATA) out/doc/api
751+
out/doc/api/%.json out/doc/api/%.html: doc/api/%.md tools/doc/generate.mjs \
752+
tools/doc/markdown.mjs tools/doc/html.mjs tools/doc/json.mjs \
753+
tools/doc/apilinks.mjs $(VERSIONS_DATA) | $(LINK_DATA) out/doc/api
754754
$(call available-node, $(gen-api))
755755

756-
out/doc/api/all.html: $(apidocs_html) tools/doc/allhtml.js \
757-
tools/doc/apilinks.js | out/doc/api
758-
$(call available-node, tools/doc/allhtml.js)
756+
out/doc/api/all.html: $(apidocs_html) tools/doc/allhtml.mjs \
757+
tools/doc/apilinks.mjs | out/doc/api
758+
$(call available-node, tools/doc/allhtml.mjs)
759759

760-
out/doc/api/all.json: $(apidocs_json) tools/doc/alljson.js | out/doc/api
761-
$(call available-node, tools/doc/alljson.js)
760+
out/doc/api/all.json: $(apidocs_json) tools/doc/alljson.mjs | out/doc/api
761+
$(call available-node, tools/doc/alljson.mjs)
762762

763763
.PHONY: out/doc/api/stability
764-
out/doc/api/stability: out/doc/api/all.json tools/doc/stability.js | out/doc/api
765-
$(call available-node, tools/doc/stability.js)
764+
out/doc/api/stability: out/doc/api/all.json tools/doc/stability.mjs | out/doc/api
765+
$(call available-node, tools/doc/stability.mjs)
766766

767767
.PHONY: docopen
768768
docopen: out/doc/api/all.html

deps/npm/.eslintrc.json

Lines changed: 0 additions & 214 deletions
This file was deleted.

deps/npm/.npmignore

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)