From 591e1450cb53f0cef69404695289e0f17bacdb9a Mon Sep 17 00:00:00 2001
From: Dennis Imscher <d.irmscher@obis-concept.de>
Date: Sat, 13 Aug 2016 11:13:43 +0200
Subject: [PATCH 1/2] Concat main.js as last file in gulp config

---
 gulpfile.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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
+});

From 27d11b6e0b77486aa927b8280d713f43ccd6915a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Zwinge?= <rz@psy-grafix.com>
Date: Tue, 13 Sep 2016 12:48:34 +0200
Subject: [PATCH 2/2] Bump to Neos CMS 2.3

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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
+}