Bump and build 3.1.0 (#3231)

* Bump and build 3.1.0 * fix build
marionettejs · Oct 13, 2016 · c1d41d7 · c1d41d7
1 parent 22d1554
commit c1d41d7
Show file tree

Hide file tree

Showing 7 changed files with 431 additions and 340 deletions.
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description": "The Backbone Framework",
   "homepage": "http://marionettejs.org",
   "main": "./lib/backbone.marionette.js",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "keywords": [
     "backbone",
     "framework",

diff --git a/gulp/build.js b/gulp/build.js
@@ -10,7 +10,7 @@ import runSequence from 'run-sequence';
 import { rollup } from 'rollup';
 import babel from 'rollup-plugin-babel';
 import json from 'rollup-plugin-json';
-import preset from 'babel-preset-es2015-rollup';
+import preset from 'babel-preset-es2015';
 
 import banner from  './_banner';
 import {name} from '../package.json';
@@ -40,7 +40,7 @@ function bundle(opts) {
       json(),
       babel({
         sourceMaps: true,
-        presets: [ preset ],
+        presets: [['es2015', {modules: false}]],
         babelrc: false
       })
     ]