From ca829946084f191472f7c1819c8340a991a7702c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 7 Feb 2017 09:43:25 +0100
Subject: [PATCH] [web] Use local npm installed binaries.
---
scripts/cmake/Find.cmake | 3 ++-
web/README.md | 10 ++++------
web/package.json | 1 +
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 16901c57036..5bf085d3ed8 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -64,7 +64,8 @@ if(CCACHE_FOUND)
endif()
endif(CCACHE_FOUND)
-find_program(VTKJS_CONVERTER vtkDataConverter)
+find_program(VTKJS_CONVERTER vtkDataConverter
+PATHS ${CMAKE_SOURCE_DIR}/web/node_modules/.bin)
######################
### Find libraries ###
diff --git a/web/README.md b/web/README.md
index 97305b92acf..9b142c1016d 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,8 +1,7 @@
## Getting started
- Download [Hugo](https://gohugo.io/#action) and put it in your `PATH`
-- Install gulp-cli globally with `npm install --global gulp-cli`, *OPTIONAL* for SCSS and Javascript
-- Install Node packages with `npm install`, *OPTIONAL* for SCSS and Javascript
+- Install Node packages with `npm install` (or via `yarn`), *OPTIONAL* for SCSS and Javascript
- Install Python packages with `pip install -r requirements.txt`, *OPTIONAL* for getting content from [Contentful](https://app.contentful.com/spaces/4nuqzxntzxks)
## Start servers and watchers
@@ -11,13 +10,12 @@
If you want to modify css or javascript run `gulp` in another terminal:
- gulp
+ npm run gulp
## Build site
(cd import; python import.py) # Optional for fetching content from Contentful
- gulp build
- hugo
+ npm run build
Test by locally serving via [Caddy](https://caddyserver.com):
@@ -28,7 +26,7 @@ Test by locally serving via [Caddy](https://caddyserver.com):
- [Hugo](https://gothugo.com) - Static site generator for technical documentation
- [Contenful](https://www.contentful.com/) - API-based CMS for news, articles, ..
- [flexboxgrid](http://flexboxgrid.com/) - CSS grid
-- [vtk-js](https://kitware.github.io/vtk-js/) - 3D Visualizations
+- [vtk.js](https://kitware.github.io/vtk-js/) - 3D Visualizations
- [webpack](https://webpack.github.io/) - Packaging JavaScript
- [gulp](http://gulpjs.com/) - Automation toolkit
diff --git a/web/package.json b/web/package.json
index ae514f09bc9..44b2b7c422f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -6,6 +6,7 @@
"author": "Lars Bilke",
"license": "BSD",
"scripts": {
+ "gulp": "gulp",
"hugo": "hugo server --disableRSS",
"build": "gulp build && hugo",
"build:release": "export NODE_ENV=production && gulp build && hugo",
--
GitLab