From db4a2f9c8332119e35f3b888ebb25ed5360f46d5 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Wed, 1 Feb 2017 10:34:26 +0100 Subject: [PATCH] [web] Run webpack with gulp. --- web/gulpfile.js | 2 +- web/package.json | 1 + web/webpack.config.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/gulpfile.js b/web/gulpfile.js index 63f6fa7e8ad..7fc226da26c 100644 --- a/web/gulpfile.js +++ b/web/gulpfile.js @@ -33,7 +33,7 @@ gulp.task('scss', () => { gulp.task('webpack', () => { return gulp.src(pkg.main) - .pipe($.webpack_stream()) + .pipe($.webpack_stream( require('./webpack.config.js') )) .pipe(gulp.dest(pkg.paths.dist.js)); }); diff --git a/web/package.json b/web/package.json index e1e2000c14c..8827a69b941 100644 --- a/web/package.json +++ b/web/package.json @@ -6,6 +6,7 @@ "author": "Lars Bilke", "license": "BSD", "scripts": { + "hugo": "hugo -w --disableRSS", "build": "webpack", "build:release": "export NODE_ENV=production && webpack -p", "start": "webpack-dev-server --content-base ./public" diff --git a/web/webpack.config.js b/web/webpack.config.js index b1acb055462..aaafcbae3af 100644 --- a/web/webpack.config.js +++ b/web/webpack.config.js @@ -17,7 +17,7 @@ module.exports = { plugins: plugins, entry: pkg.paths.src.js + '/app.js', output: { - path: pkg.paths.dist.js, + // path: pkg.paths.dist.js, // does not work with webpack-stream filename: 'bundle.js', }, module: { -- GitLab