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

Update all dependencies 🌴 #79

Merged
merged 5 commits into from
May 14, 2016
Merged
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ before_script:
- psql -c 'create database lux_test;' -U postgres
- touch test/test-app/db/lux_test_test.sqlite
- cd test/test-app && npm install && cd ../../
- npm install -g eslint babel-eslint
- npm link

env:
Expand Down
10 changes: 1 addition & 9 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import gulp from 'gulp';
import babel from 'gulp-babel';
import mocha from 'gulp-mocha';
import eslint from 'gulp-eslint';
import uglify from 'gulp-uglify';

import rmrf from './src/packages/cli/utils/rmrf';
Expand All @@ -10,20 +9,13 @@ gulp.task('clean', () => {
return rmrf('dist');
});

gulp.task('build', ['lint', 'clean'], () => {
gulp.task('build', ['clean'], () => {
return gulp.src('src/**/*.js')
.pipe(babel())
.pipe(uglify())
.pipe(gulp.dest('dist'));
});

gulp.task('lint', () => {
return gulp.src('src/**/*.js')
.pipe(eslint())
.pipe(eslint.format())
.pipe(eslint.failAfterError());
});

gulp.task('test', ['build'], () => {
return gulp.src([
'test/helper.js',
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
"lux": "bin/lux"
},
"scripts": {
"build": "npm run lint && gulp build",
"lint": "eslint ./src/**",
"start": "lux serve",
"test": "gulp test"
"test": "npm run lint && gulp test"
},
"author": "Zachary Golba",
"license": "MIT",
Expand All @@ -34,7 +36,6 @@
"babel-preset-es2015": "6.6.0",
"babel-preset-stage-1": "6.5.0",
"chai": "3.5.0",
"eslint": "2.8.0",
"gulp": "3.9.1",
"gulp-babel": "6.1.2",
"gulp-eslint": "2.0.0",
Expand Down