diff --git a/html/.gitignore b/html/.gitignore index db5625f..1cd38a0 100644 --- a/html/.gitignore +++ b/html/.gitignore @@ -46,4 +46,4 @@ jspm_packages # Yarn Integrity file .yarn-integrity -js/bundle.js \ No newline at end of file +dist/ \ No newline at end of file diff --git a/html/gulpfile.js b/html/gulpfile.js index 206af58..ab63079 100644 --- a/html/gulpfile.js +++ b/html/gulpfile.js @@ -1,23 +1,20 @@ -var gulp = require('gulp'), - fs = require("fs"), - browserify = require('browserify'), - inlinesource = require('gulp-inline-source'); +const gulp = require('gulp'), + inlinesource = require('gulp-inline-source'), + webpack = require('webpack-stream'); -gulp.task('browserify', function () { - return browserify('./js/app.js') - .transform("babelify", { - presets: ["env"], - global: true, - ignore: /\/node_modules\/(?!zmodem.js\/)/ - }) - .bundle() - .pipe(fs.createWriteStream("./js/bundle.js")); +gulp.task('webpack', function() { + return gulp.src([ + 'js/app.js', + 'sass/app.scss' + ]) + .pipe(webpack(require('./webpack.config.js'))) + .pipe(gulp.dest('dist/')); }); -gulp.task('inlinesource', ['browserify'], function () { +gulp.task('inlinesource', ['webpack'], function () { return gulp.src('index.html') .pipe(inlinesource()) - .pipe(gulp.dest('../src')); + .pipe(gulp.dest('../src/')); }); gulp.task('default', ['inlinesource']); \ No newline at end of file diff --git a/html/index.html b/html/index.html index 2a9142f..21b97a1 100644 --- a/html/index.html +++ b/html/index.html @@ -5,9 +5,7 @@