Merge pull request #1 from obisconcept/master

Bump to Neos CMS 2.3
obisconcept · Sep 13, 2016 · 3933421 · 3933421
2 parents 6f27265 + 27d11b6
commit 3933421
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git 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"
         }
     }
-}
+}
diff --git 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'
         }));
 
-});
+});