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

Commit

Permalink
meta: merge node/master into node-chakracore/master
Browse files Browse the repository at this point in the history
Merge a27e6d7 as of 2018-02-27
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Seth Brenith <sethb@microsoft.com>
  • Loading branch information
chakrabot committed Feb 28, 2018
2 parents 2552d1c + a27e6d7 commit 951c835
Show file tree
Hide file tree
Showing 30 changed files with 772 additions and 286 deletions.
19 changes: 11 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1056,15 +1056,18 @@ lint-md-clean:
$(RM) -r tools/remark-preset-lint-node/node_modules
$(RM) tools/.*mdlintstamp

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

tools/remark-preset-lint-node/node_modules: \
tools/remark-preset-lint-node/package.json
@echo "Markdown linter: installing remark-preset-lint-node into tools/"
@cd tools/remark-preset-lint-node && $(call available-node,$(run-npm-install))

.PHONY: lint-md-build
lint-md-build: tools/remark-cli/node_modules \
tools/remark-preset-lint-node/node_modules

.PHONY: lint-md
ifneq ("","$(wildcard tools/remark-cli/node_modules/)")
Expand Down
7 changes: 4 additions & 3 deletions doc/api/deprecations.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,10 @@ explicitly via error event handlers set on the domain instead.
<a id="DEP0013"></a>
### DEP0013: fs asynchronous function without callback

Type: Runtime
Type: End-of-Life

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

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

0 comments on commit 951c835

Please sign in to comment.