Permalink
Browse files

Bump and build 3.1.0 (#3231)

* Bump and build 3.1.0

* fix build
  • Loading branch information...
1 parent 22d1554 commit c1d41d73c60ad117b285fd7495b4c1801ca1873d @denar90 denar90 committed with ahumphreys87 Oct 13, 2016
Showing with 431 additions and 340 deletions.
  1. +1 −1 bower.json
  2. +2 −2 gulp/build.js
  3. +419 −329 lib/backbone.marionette.js
  4. +1 −1 lib/backbone.marionette.js.map
  5. +3 −3 lib/backbone.marionette.min.js
  6. +1 −1 lib/backbone.marionette.min.js.map
  7. +4 −3 package.json
View
@@ -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",
View
@@ -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
})
]
Oops, something went wrong.

0 comments on commit c1d41d7

Please sign in to comment.