From 350a3e17f5fe410a94794e8b290c763689496401 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Thu, 6 Sep 2018 15:50:27 -0400 Subject: [PATCH] tools: relocate `remark-preset-lint-node` PR-URL: https://github.com/nodejs/node/pull/20109 Reviewed-By: James M Snell Reviewed-By: Gus Caplan Reviewed-By: Ruben Bridgewater --- .remarkrc | 2 +- Makefile | 12 ++++++------ tools/node-lint-md-cli-rollup/.gitignore | 3 ++- .../remark-preset-lint-node/LICENSE | 0 .../remark-preset-lint-node/README.md | 0 .../remark-preset-lint-node/index.js | 0 .../remark-preset-lint-node/package-lock.json | 0 .../remark-preset-lint-node/package.json | 0 8 files changed, 9 insertions(+), 8 deletions(-) rename tools/{ => node-lint-md-cli-rollup}/remark-preset-lint-node/LICENSE (100%) rename tools/{ => node-lint-md-cli-rollup}/remark-preset-lint-node/README.md (100%) rename tools/{ => node-lint-md-cli-rollup}/remark-preset-lint-node/index.js (100%) rename tools/{ => node-lint-md-cli-rollup}/remark-preset-lint-node/package-lock.json (100%) rename tools/{ => node-lint-md-cli-rollup}/remark-preset-lint-node/package.json (100%) diff --git a/.remarkrc b/.remarkrc index 34400ece0dc648..bdffe869098c40 100644 --- a/.remarkrc +++ b/.remarkrc @@ -1,5 +1,5 @@ { "plugins": [ - "./tools/remark-preset-lint-node/" + "./tools/node-lint-md-cli-rollup/remark-preset-lint-node/" ] } diff --git a/Makefile b/Makefile index 21622a24047f68..0c68fe6f4e5584 100644 --- a/Makefile +++ b/Makefile @@ -1058,22 +1058,22 @@ bench-addons-clean: .PHONY: lint-md-clean lint-md-clean: $(RM) -r tools/remark-cli/node_modules - $(RM) -r tools/remark-preset-lint-node/node_modules + $(RM) -r tools/node-lint-md-cli-rollup/remark-preset-lint-node/node_modules $(RM) tools/.*mdlintstamp 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-ci)) -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-ci)) +tools/node-lint-md-cli-rollup/remark-preset-lint-node/node_modules: \ + tools/node-lint-md-cli-rollup/remark-preset-lint-node/package.json + @echo "Markdown linter: installing remark-preset-lint-node" + @cd tools/node-lint-md-cli-rollup/remark-preset-lint-node && $(call available-node,$(run-npm-ci)) .PHONY: lint-md-build lint-md-build: tools/remark-cli/node_modules \ tools/doc/node_modules \ - tools/remark-preset-lint-node/node_modules + tools/node-lint-md-cli-rollup/remark-preset-lint-node/node_modules tools/doc/node_modules: tools/doc/package.json ifeq ($(node_use_openssl),true) diff --git a/tools/node-lint-md-cli-rollup/.gitignore b/tools/node-lint-md-cli-rollup/.gitignore index c85804c964b0e7..ab9ffa17b3a6dd 100644 --- a/tools/node-lint-md-cli-rollup/.gitignore +++ b/tools/node-lint-md-cli-rollup/.gitignore @@ -1,2 +1,3 @@ /node_modules/ -/dist/ \ No newline at end of file +/remark-preset-lint-node/node_modules/ +/dist/ diff --git a/tools/remark-preset-lint-node/LICENSE b/tools/node-lint-md-cli-rollup/remark-preset-lint-node/LICENSE similarity index 100% rename from tools/remark-preset-lint-node/LICENSE rename to tools/node-lint-md-cli-rollup/remark-preset-lint-node/LICENSE diff --git a/tools/remark-preset-lint-node/README.md b/tools/node-lint-md-cli-rollup/remark-preset-lint-node/README.md similarity index 100% rename from tools/remark-preset-lint-node/README.md rename to tools/node-lint-md-cli-rollup/remark-preset-lint-node/README.md diff --git a/tools/remark-preset-lint-node/index.js b/tools/node-lint-md-cli-rollup/remark-preset-lint-node/index.js similarity index 100% rename from tools/remark-preset-lint-node/index.js rename to tools/node-lint-md-cli-rollup/remark-preset-lint-node/index.js diff --git a/tools/remark-preset-lint-node/package-lock.json b/tools/node-lint-md-cli-rollup/remark-preset-lint-node/package-lock.json similarity index 100% rename from tools/remark-preset-lint-node/package-lock.json rename to tools/node-lint-md-cli-rollup/remark-preset-lint-node/package-lock.json diff --git a/tools/remark-preset-lint-node/package.json b/tools/node-lint-md-cli-rollup/remark-preset-lint-node/package.json similarity index 100% rename from tools/remark-preset-lint-node/package.json rename to tools/node-lint-md-cli-rollup/remark-preset-lint-node/package.json