diff --git a/Makefile b/Makefile index 8f378b4c9ddf41..36b1a285b4fd59 100644 --- a/Makefile +++ b/Makefile @@ -265,7 +265,6 @@ test: all ## Runs default tests, linters, and builds docs. # can be displayed together $(MAKE) -s build-addons $(MAKE) -s build-addons-napi - $(MAKE) -s test-doc $(MAKE) -s cctest $(MAKE) -s jstest @@ -610,7 +609,8 @@ apidocs_json = $(addprefix out/,$(apidoc_sources:.md=.json)) apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) .PHONY: doc-only -doc-only: $(apidoc_dirs) $(apiassets) ## Builds the docs with the local or the global Node.js binary. +doc-only: tools/doc/node_modules \ + $(apidoc_dirs) $(apiassets) ## Builds the docs with the local or the global Node.js binary. # If it's a source tarball, assets are already in doc/api/assets, # no need to install anything, we have already copied the docs over if [ ! -d doc/api/assets ]; then \ @@ -1070,8 +1070,13 @@ tools/remark-preset-lint-node/node_modules: \ .PHONY: lint-md-build lint-md-build: tools/remark-cli/node_modules \ + tools/doc/node_modules \ tools/remark-preset-lint-node/node_modules +.PHONY: tools/doc/node_modules +tools/doc/node_modules: + @cd tools/doc && $(call available-node,$(run-npm-install)) + .PHONY: lint-md ifneq ("","$(wildcard tools/remark-cli/node_modules/)") diff --git a/test/doctool/test-doctool-html.js b/test/doctool/test-doctool-html.js index a6119c16903a74..c895df087c4bfa 100644 --- a/test/doctool/test-doctool-html.js +++ b/test/doctool/test-doctool-html.js @@ -21,8 +21,8 @@ const toHTML = require('../../tools/doc/html.js'); const testData = [ { file: fixtures.path('sample_document.md'), - html: '
fish
Redfish
array
<Array>Describe Foobar II
in more detail here.' +
'fg(1)' +
'
fish
Redfish
item1
- -text
item1
-text
--world
--world
-
item1
- -text
item1
-text
--world
--world
-
-world
world
code>var a = 1;
<div>hello</div>
- -<span>hello</span>
-``` - -``` bash -$ marked -hello -
-``` - -- - - - -See: https://github.com/evilstreak/markdown-js/issues/27 - -``` bash -$ markdown.js -[![an image](/image)](/link) -^D - -``` - -``` bash -$ marked -[![an image](/image)](/link) -^D - -``` - -- - - - -See: https://github.com/evilstreak/markdown-js/issues/24 - -``` bash -$ markdown.js -> a - -> b - -> c -^D --``` - -``` bash -$ marked -> a - -> b - -> c -^D -a
bundefined> c
-a - -
-b - -
-``` - -- - - - -``` bash -$ markdown.pl -* hello - * world - how - - are - you - - * today -* hi -^D -c -
hello
- -are -you
- -hello
-world -how
-are -you
-today
-