diff --git a/composer.json b/composer.json index 1c2a49a..25b4c59 100644 --- a/composer.json +++ b/composer.json @@ -14,12 +14,12 @@ "description": "A Neos CMS package with a Swiper node type", "license": ["MIT"], "require": { - "typo3/neos": "~2.2.0", - "typo3/neos-nodetypes": "~2.2.0" + "typo3/neos": "~2.3.0", + "typo3/neos-nodetypes": "~2.3.0" }, "autoload": { "psr-0": { "ObisConcept\\NeosSwiper": "Classes" } } -} \ No newline at end of file +} diff --git a/gulpfile.js b/gulpfile.js index 29c3291..e45c3ca 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -16,7 +16,7 @@ var gulp = require('gulp'), gulp.task('build-css', function() { gutil.log('Generate css files ...'); - + var onError = function(err) { notify.onError({ title: 'Gulp', @@ -51,7 +51,7 @@ gulp.task('build-css', function() { gulp.task('build-js', function() { gutil.log('Generate js files ...'); - + var onError = function(err) { notify.onError({ title: 'Gulp', @@ -61,11 +61,12 @@ gulp.task('build-js', function() { })(err); this.emit('end'); }; - + // Website js files gulp.src([ - 'Resources/Private/Assets/JavaScript/**', - '!' + 'Resources/Private/Assets/JavaScript/backend.js' + 'Resources/Private/Assets/JavaScript/**/!(main)*.js', + '!' + 'Resources/Private/Assets/JavaScript/backend.js', + 'Resources/Private/Assets/JavaScript/main.js' ]) .pipe(plumber({errorHandler: onError})) .pipe(sourcemaps.init()) @@ -93,7 +94,7 @@ gulp.task('build-js', function() { // Create default task gulp.task('default', function() { - + gulp.src('Resources/Private/Assets/Styles/**/*.scss', {read: false}) .pipe(watch('Resources/Private/Assets/Styles/**/*.scss', function() { gulp.start('build-css'); @@ -108,4 +109,4 @@ gulp.task('default', function() { 'message': 'JavaScript files were generated' })); -}); \ No newline at end of file +});