summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2018-11-21 11:25:41 +0100
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2018-11-21 11:25:41 +0100
commit241dda266ccc0c2499ef360a5b010b750b1a105d (patch)
tree784396fc115cb995fee5f8a90478b9d0856c67ff
parent902ec4a68f0cd3110e5849c3d429ed34ab3e6091 (diff)
Add Handlebars to the development dependencies
Dependencies declared in "package.json" are installed locally, so the call to the handlebars script must be updated accordingly. To ensure that Handlebars is installed before using it the Make step to compile the templates now depends on the step to setup the development environment. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--Makefile4
-rw-r--r--package.json1
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 74cb75876..d869554bd 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ install-npm-deps:
install-npm-deps-dev:
npm install --deps
-build-js-templates:
- handlebars -n OCA.VideoCalls.Admin.Templates js/admin/templates/ -f js/admin/templates.js
+build-js-templates: dev-setup
+ ./node_modules/.bin/handlebars -n OCA.VideoCalls.Admin.Templates js/admin/templates/ -f js/admin/templates.js
dev-setup: install-npm-deps-dev
diff --git a/package.json b/package.json
index e79680966..35e629af0 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"author": "",
"license": "AGPL-3.0",
"devDependencies": {
+ "handlebars": "^4.0.12",
"jasmine": "^2.5.2",
"jasmine-ajax": "^3.2.0",
"jasmine-core": "^2.5.2",