Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 951c835

Browse files
committed
meta: merge node/master into node-chakracore/master
Merge a27e6d7 as of 2018-02-27 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: Seth Brenith <[email protected]>
2 parents 2552d1c + a27e6d7 commit 951c835

30 files changed

+772
-286
lines changed

Diff for: Makefile

+11-8
Original file line numberDiff line numberDiff line change
@@ -1056,15 +1056,18 @@ lint-md-clean:
10561056
$(RM) -r tools/remark-preset-lint-node/node_modules
10571057
$(RM) tools/.*mdlintstamp
10581058

1059-
.PHONY: lint-md-build
1060-
lint-md-build:
1061-
@if [ ! -d tools/remark-cli/node_modules ]; then \
1062-
echo "Markdown linter: installing remark-cli into tools/"; \
1063-
cd tools/remark-cli && $(call available-node,$(run-npm-install)) fi
1064-
@if [ ! -d tools/remark-preset-lint-node/node_modules ]; then \
1065-
echo "Markdown linter: installing remark-preset-lint-node into tools/"; \
1066-
cd tools/remark-preset-lint-node && $(call available-node,$(run-npm-install)) fi
1059+
tools/remark-cli/node_modules: tools/remark-cli/package.json
1060+
@echo "Markdown linter: installing remark-cli into tools/"
1061+
@cd tools/remark-cli && $(call available-node,$(run-npm-install))
1062+
1063+
tools/remark-preset-lint-node/node_modules: \
1064+
tools/remark-preset-lint-node/package.json
1065+
@echo "Markdown linter: installing remark-preset-lint-node into tools/"
1066+
@cd tools/remark-preset-lint-node && $(call available-node,$(run-npm-install))
10671067

1068+
.PHONY: lint-md-build
1069+
lint-md-build: tools/remark-cli/node_modules \
1070+
tools/remark-preset-lint-node/node_modules
10681071

10691072
.PHONY: lint-md
10701073
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")

Diff for: doc/api/deprecations.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,10 @@ explicitly via error event handlers set on the domain instead.
162162
<a id="DEP0013"></a>
163163
### DEP0013: fs asynchronous function without callback
164164

165-
Type: Runtime
165+
Type: End-of-Life
166166

167-
Calling an asynchronous function without a callback is deprecated.
167+
Calling an asynchronous function without a callback throws a `TypeError`
168+
REPLACEME onwards. Refer: [PR 12562](https://github.com/nodejs/node/pull/12562)
168169

169170
<a id="DEP0014"></a>
170171
### DEP0014: fs.read legacy String interface
@@ -882,7 +883,7 @@ Type: Runtime
882883
883884
Users of `MakeCallback` that add the `domain` property to carry context,
884885
should start using the `async_context` variant of `MakeCallback` or
885-
`CallbackScope`, or the the high-level `AsyncResource` class.
886+
`CallbackScope`, or the high-level `AsyncResource` class.
886887
887888
<a id="DEP0098"></a>
888889
### DEP0098: AsyncHooks Embedder AsyncResource.emit{Before,After} APIs

0 commit comments

Comments
 (0)