Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/mail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Lindner <mail@steffen-lindner.de>2017-08-27 18:08:05 +0300
committerChristoph Wurst <ChristophWurst@users.noreply.github.com>2017-08-27 18:08:05 +0300
commit3b43d41d8c473adc96a6ea2262286eafd8fae867 (patch)
tree5277ab9402c72aa19b745d3ce402da73226f73f5 /Makefile
parent4fa5bc2d476249d4cf8be9fb532d5e4f8f83175e (diff)
WIP Move to Webpack3 (#468)
* Add init webpack config * Replace text! with raw-loader! * Add ignore for build.js and remove build.js * Ship build.js to browser, include shim modules * Add handlebars loader * Remove vendor dir, remove bower * Add source-map * Make karma work with webpack, more or less Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> * Properly load hb templates by webpack Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> * Remove debug logging * Use modules for view helpers and properly declare dependencies Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> * Fix jquery.autosize Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> * Declare global functions Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> * Always install dev deps Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6a3e92d96..72509bab8 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ clean:
composer.phar:
curl -sS https://getcomposer.org/installer | php
-install-deps: install-composer-deps install-npm-deps
+install-deps: install-composer-deps install-npm-deps-dev
install-composer-deps: composer.phar
php composer.phar install
@@ -33,7 +33,7 @@ install-npm-deps-dev:
npm install --deps
optimize-js: install-npm-deps
- ./node_modules/requirejs/bin/r.js -o build/build.js
+ ./node_modules/webpack/bin/webpack.js --config js/webpack.config.js
dev-setup: install-composer-deps install-npm-deps-dev