Skip to content

Commit

Permalink
fix: breaking dependencies (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobiah authored Jun 8, 2018
1 parent 9bf8bba commit 73177c6
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 66 deletions.
74 changes: 32 additions & 42 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,42 @@ const cleanCss = require('gulp-clean-css');
const del = require('del');
const hashsum = require('gulp-hashsum');

gulp.task('clean-js', () => {
return del([
'./public/js/main.js',
'./public/js/maps.js',
'./public/js/updaters.js',
'./public/js/utilities.js',
'./public/sums.json',
]);
});
gulp.task('clean-js', () => del([
'./public/js/main.js',
'./public/js/maps.js',
'./public/js/updaters.js',
'./public/js/utilities.js',
'./public/sums.json',
]));

gulp.task('clean-css', () => {
return del([
'./public/css/main.css',
'./public/css/main.night.css',
'./public/css/main.retro.css',
'./public/css/main.eidolon.css',
'./public/css/common.css',
]);
});
gulp.task('clean-css', () => del([
'./public/css/main.css',
'./public/css/main.night.css',
'./public/css/main.retro.css',
'./public/css/main.eidolon.css',
'./public/css/common.css',
]));

gulp.task('pack-js', () => {
return gulp.src(['assets/js/*.js'])
.pipe(minify({
ext: {
min: '.js',
},
noSource: true,
}))
.pipe(gulp.dest('public/js'));
});
gulp.task('pack-js', () => gulp.src(['assets/js/*.js'])
.pipe(minify({
ext: {
min: '.js',
},
noSource: true,
}))
.pipe(gulp.dest('public/js')));

gulp.task('pack-css', () => {
return gulp.src(['./assets/css/*.css'])
.pipe(cleanCss())
.pipe(gulp.dest('./public/css'));
});
gulp.task('pack-css', () => gulp.src(['./assets/css/*.css'])
.pipe(cleanCss())
.pipe(gulp.dest('./public/css')));

gulp.task('hash', () => {
return gulp.src(['public/js/**/*.js', 'public/css/**/*.css'])
.pipe(hashsum({
dest: 'public',
json: true,
force: true,
filename: 'sums.json',
}));
});
gulp.task('hash', () => gulp.src(['public/js/**/*.js', 'public/css/**/*.css'])
.pipe(hashsum({
dest: 'public',
json: true,
force: true,
filename: 'sums.json',
})));

gulp.task('default', gulp.series('clean-js', 'clean-css', 'pack-css', 'pack-js'));

Expand Down
58 changes: 36 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
},
"devDependencies": {
"eslint-config-airbnb": "^16.1.0",
"eslint-import-resolver-node": "^0.3.2",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0",
Expand Down
8 changes: 6 additions & 2 deletions routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ winston.level = process.env.LOG_LEVEL || 'error'; // default to error, we don't

router.get('/', (req, res) => {
winston.info(`Received ${req.method} request for ${req.originalUrl} from ${req.connection.remoteAddress}`);
res.render('index', {title: 'Index', trackables, planets, components, sums});
res.render('index', {
title: 'Index', trackables, planets, components, sums,
});
});

router.get('/timer', (req, res) => {
winston.info(`Received ${req.method} request for ${req.originalUrl} from ${req.connection.remoteAddress}`);
res.render('index', {title: 'Timers', trackables, planets, components, sums});
res.render('index', {
title: 'Timers', trackables, planets, components, sums,
});
});

router.get('/map', (req, res) => {
Expand Down

0 comments on commit 73177c6

Please sign in to comment.