Merge pull request #1 from obisconcept/master

Bump to Neos CMS 2.3
obisconcept · Sep 13, 2016 · cc05005 · cc05005
2 parents faeb615 + a0f2f3b
commit cc05005
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     "description": "A Neos CMS package to load and submit forms with ajax",
     "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": {

diff --git a/gulpfile.js b/gulpfile.js
@@ -13,7 +13,7 @@ var gulp  = require('gulp'),
 gulp.task('build-js', function() {
 
     gutil.log('Generate js files ...');
-    
+
     var onError = function(err) {
         notify.onError({
             title:    'Gulp',
@@ -23,11 +23,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())
@@ -65,4 +66,4 @@ gulp.task('default', function() {
             'message': 'JavaScript files were generated'
         }));
 
-});
+});