arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated deps and added 6to5

Browse Source
This commit is contained in:
Tobias Reich 2015-01-29 23:54:25 +01:00
parent c4b61a357d
commit 6bbb46d4bf
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gulpfile.js
View File

@ -15,7 +15,6 @@ var catchError = function(err) {
paths.view = { paths.view = {
js: [ js: [
'bower_components/jQuery/dist/jquery.min.js',
'../src/scripts/_gup.js', '../src/scripts/_gup.js',
'../src/scripts/view/main.js' '../src/scripts/view/main.js'
], ],
@ -23,6 +22,7 @@ paths.view = {
'../src/scripts/build.coffee' '../src/scripts/build.coffee'
], ],
scripts: [ scripts: [
'bower_components/jQuery/dist/jquery.min.js',
'../dist/_view--javascript.js', '../dist/_view--javascript.js',
'../dist/_view--coffee.js' '../dist/_view--coffee.js'
] ]
@ -32,6 +32,8 @@ gulp.task('view--js', function() {
var stream = var stream =
gulp.src(paths.view.js) gulp.src(paths.view.js)
.pipe(plugins['6to5']())
.on('error', catchError)
.pipe(plugins.concat('_view--javascript.js', {newLine: "\n"})) .pipe(plugins.concat('_view--javascript.js', {newLine: "\n"}))
.pipe(gulp.dest('../dist/')); .pipe(gulp.dest('../dist/'));
@ -69,18 +71,18 @@ gulp.task('view--scripts', ['view--js', 'view--coffee'], function() {
paths.main = { paths.main = {
js: [ js: [
'bower_components/jQuery/dist/jquery.min.js',
'bower_components/js-md5/js/md5.min.js',
'bower_components/mousetrap/mousetrap.min.js',
'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
'bower_components/basicContext/dist/basicContext.min.js',
'bower_components/basicModal/dist/basicModal.min.js',
'../src/scripts/*.js' '../src/scripts/*.js'
], ],
coffee: [ coffee: [
'../src/scripts/*.coffee' '../src/scripts/*.coffee'
], ],
scripts: [ scripts: [
'bower_components/jQuery/dist/jquery.min.js',
'bower_components/js-md5/js/md5.min.js',
'bower_components/mousetrap/mousetrap.min.js',
'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js',
'bower_components/basicContext/dist/basicContext.min.js',
'bower_components/basicModal/dist/basicModal.min.js',
'../dist/_main--javascript.js', '../dist/_main--javascript.js',
'../dist/_main--coffee.js' '../dist/_main--coffee.js'
], ],
@ -98,6 +100,8 @@ gulp.task('main--js', function() {
var stream = var stream =
gulp.src(paths.main.js) gulp.src(paths.main.js)
.pipe(plugins['6to5']())
.on('error', catchError)
.pipe(plugins.concat('_main--javascript.js', {newLine: "\n"})) .pipe(plugins.concat('_main--javascript.js', {newLine: "\n"}))
.pipe(gulp.dest('../dist/')); .pipe(gulp.dest('../dist/'));

3
src/package.json
View File

@ -11,11 +11,12 @@
}, },
"devDependencies": { "devDependencies": {
"gulp": "^3.8.10", "gulp": "^3.8.10",
"gulp-6to5": "^3.0.0",
"gulp-autoprefixer": "2.1.0", "gulp-autoprefixer": "2.1.0",
"gulp-coffee": "^2.2.0", "gulp-coffee": "^2.2.0",
"gulp-concat": "^2.4.3", "gulp-concat": "^2.4.3",
"gulp-load-plugins": "^0.8.0", "gulp-load-plugins": "^0.8.0",
"gulp-minify-css": "^0.4.2", "gulp-minify-css": "^0.4.3",
"gulp-rimraf": "^0.1.1", "gulp-rimraf": "^0.1.1",
"gulp-sass": "^1.3.2", "gulp-sass": "^1.3.2",
"gulp-uglify": "^1.1.0" "gulp-uglify": "^1.1.0"