From 3a183d924c36b51108660567587ae50d98fa5b68 Mon Sep 17 00:00:00 2001 From: Ted Yavuzkurt Date: Sun, 7 Jan 2018 18:12:34 -0800 Subject: [PATCH] Rewrite Makefile using NPS Scripts. Closes #2352 Addresses #2352 --- package-scripts.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package-scripts.js b/package-scripts.js index 0f8b5ee9cb..5a9802376e 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -102,6 +102,10 @@ module.exports = { buildDocs: 'nps prebuildDocs && bundle exec jekyll build --source ./docs --destination ./docs/_site --config ./docs/_config.yml --safe --drafts && nps postbuildDocs', postbuildDocs: 'buildProduction docs/_site/index.html --outroot docs/_dist --canonicalroot https://mochajs.org/ --optimizeimages --svgo --inlinehtmlimage 9400 --inlinehtmlscript 0 --asyncscripts && cp docs/_headers docs/_dist/_headers && node scripts/netlify-headers.js >> docs/_dist/_headers', prewatchDocs: 'node scripts/docs-update-toc.js', +<<<<<<< HEAD watchDocs: 'nps prewatchDocs && bundle exec jekyll serve --source ./docs --destination ./docs/_site --config ./docs/_config.yml --safe --drafts --watch' +======= + watchDocs: 'nps prewatchDocs && bundle exec jekyll serve --source ./docs --destination ./docs/_site --config ./docs/_config.yml --safe --drafts --watch', +>>>>>>> 7c830a6... Rewrite Makefile using NPS Scripts. Closes #2352 } };