Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - add webpack and remove gulp #3668

Draft
wants to merge 1 commit into
base: ng
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
package-lock.json

.venv
# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14.16.0
16 changes: 8 additions & 8 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ var sass_config = {
]
}

gulp.task('bower', function() {
gulp.task('bower', function() {
return bower()
.pipe(gulp.dest(config.bowerDir))
.pipe(gulp.dest(config.bowerDir))
});

gulp.task('scss', function() {
Expand All @@ -41,19 +41,19 @@ gulp.task('scss', function() {
.pipe(gulp.dest(config.staticRoot + 'css/'))
});

gulp.task('css', function() {
gulp.task('css', function() {
var vendorFiles = [
'bower_components/normalize.css/normalize.css',
'bower_components/foundation-datepicker/css/foundation-datepicker.css',
'bower_components/angular-loading-bar/build/loading-bar.min.css',
];
return gulp.src(vendorFiles)
.pipe(gulp.dest(config.vendorRoot + 'css/'));
return gulp.src(vendorFiles)
.pipe(gulp.dest(config.vendorRoot + 'css/'));
});

gulp.task('fonts', function() {
return gulp.src('bower_components/fontawesome/fonts/*.*')
.pipe(gulp.dest(config.vendorRoot + 'fonts/'));
gulp.task('fonts', function() {
return gulp.src('bower_components/fontawesome/fonts/*.*')
.pipe(gulp.dest(config.vendorRoot + 'fonts/'));
});

gulp.task('js', function(){
Expand Down
Loading