Skip to content

Commit

Permalink
Shifted Sass Build to Gulp Build instead of Node-sass-middleware whic…
Browse files Browse the repository at this point in the history
…h is deprecated
  • Loading branch information
limmabean committed Dec 9, 2021
1 parent c75600c commit b3f5142
Show file tree
Hide file tree
Showing 4 changed files with 978 additions and 1,300 deletions.
14 changes: 13 additions & 1 deletion gulpfile.js
Expand Up @@ -14,6 +14,7 @@ var sourcemaps = require('gulp-sourcemaps');
var plumber = require('gulp-plumber');
var livereload = require('gulp-livereload');
var jsoncombine = require('gulp-jsoncombine');
var sass = require('gulp-sass')(require('sass'));
var path = require('path');
var _ = require('lodash');
var merge = require('merge-stream');
Expand All @@ -35,6 +36,8 @@ var paths = {
'public/angular/**/*.html',
'!public/angular/js/app.min.js'
],
sass: 'public/angular/sass/app.scss',
css: 'public/angular/css/',
translations: 'public/angular/translations/',
translationsEmail: 'lib/translations/'
};
Expand Down Expand Up @@ -83,6 +86,10 @@ gulp.task('angular', function() {
return pipes.buildAngular();
});

gulp.task('sass', function() {
return pipes.buildStyles();
});

// Reload browser
gulp.task('angular.watch', function() {
livereload.listen();
Expand Down Expand Up @@ -123,11 +130,16 @@ pipes.debugTranslations = function(dirname) {
.pipe(gulp.dest(dirname));
};

pipes.buildStyles = function() {
return gulp.src(paths.sass)
.pipe(sass.sync().on('error', sass.logError))
.pipe(gulp.dest(paths.css));
}
gulp.task('debugTranslations', function() {
var stream1 = pipes.debugTranslations(paths.translations);
var stream2 = pipes.debugTranslations(paths.translationsEmail);
return merge(stream1, stream2);
});

gulp.task('build', gulp.parallel('debugTranslations', 'angular'));
gulp.task('build', gulp.parallel('debugTranslations', 'angular', 'sass'));
//TO DO: Code updated assuming the purpose is to run multiple tasks in parallel. Need to Verify this.
3 changes: 2 additions & 1 deletion lib/api.js
Expand Up @@ -14,7 +14,6 @@ var mailer = require('./mailer.js');
var _ = require("underscore");
var readLineSync = require('readline-sync');
var { version: packageVersion } = require("../package.json");

// Extend global error class
require('./error');

Expand Down Expand Up @@ -232,6 +231,8 @@ setTimeout(function() {
// Add CRON job for updating CrowdTangle List
app.use(require('./cron/ct-list-update'));



// The API explorer is a client-side thing so it's loaded as static.
app.use('/explorer', express.static(path.join(__dirname, '../public/explorer')));

Expand Down

0 comments on commit b3f5142

Please sign in to comment.