From dccc6c09d085b51c7ef35a8a38e75e8b2557773e Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Sun, 24 Jan 2016 11:15:14 -0600 Subject: [PATCH] fix rollup es6, it doesn't need babel transpiling --- grunt/rollup.config.js | 5 +---- grunt/rollup.docs.iife.config.js | 14 ++++++++------ grunt/rollup.es6.config.js | 9 +++++---- grunt/rollup.iife.config.js | 11 +++++++---- grunt/rollup.umd.config.js | 13 +++++++------ package.json | 1 + 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/grunt/rollup.config.js b/grunt/rollup.config.js index 30d0af90..f58c36d3 100644 --- a/grunt/rollup.config.js +++ b/grunt/rollup.config.js @@ -1,10 +1,7 @@ -import babel from 'rollup-plugin-babel'; - //var external = Object.keys( require( './package.json' ).dependencies ); export default { entry: 'js/src/index.js', - sourceMap: true, - plugins: [babel()] + sourceMap: true //external: external }; diff --git a/grunt/rollup.docs.iife.config.js b/grunt/rollup.docs.iife.config.js index 807d92a8..bbd5f021 100644 --- a/grunt/rollup.docs.iife.config.js +++ b/grunt/rollup.docs.iife.config.js @@ -1,8 +1,10 @@ import config from './rollup.config.js'; +import extend from 'extend' +import babel from 'rollup-plugin-babel'; -config.format = 'iife'; -config.entry = 'docs/assets/js/src/index.js', - -config.dest = 'docs/dist/js/docs.iife.js'; - -export default config; +export default extend(true, config, { + plugins: [babel()], + format: 'iife', + entry: 'docs/assets/js/src/index.js', + dest: 'docs/dist/js/docs.iife.js' +}) diff --git a/grunt/rollup.es6.config.js b/grunt/rollup.es6.config.js index 1dc5f319..6a368003 100644 --- a/grunt/rollup.es6.config.js +++ b/grunt/rollup.es6.config.js @@ -1,6 +1,7 @@ import config from './rollup.config.js'; +import extend from 'extend' -config.format = 'es6'; -config.dest = 'dist/js/bootstrap-material-design.es6.js'; - -export default config; +export default extend(true, config, { + format: 'es6', + dest: 'dist/js/bootstrap-material-design.es6.js' +}) diff --git a/grunt/rollup.iife.config.js b/grunt/rollup.iife.config.js index 03b762b7..375abf50 100644 --- a/grunt/rollup.iife.config.js +++ b/grunt/rollup.iife.config.js @@ -1,6 +1,9 @@ import config from './rollup.config.js'; +import extend from 'extend' +import babel from 'rollup-plugin-babel'; -config.format = 'iife'; -config.dest = 'dist/js/bootstrap-material-design.iife.js'; - -export default config; +export default extend(true, config, { + plugins: [babel()], + format: 'iife', + dest: 'dist/js/bootstrap-material-design.iife.js' +}) diff --git a/grunt/rollup.umd.config.js b/grunt/rollup.umd.config.js index 0f254f2f..52dd296a 100644 --- a/grunt/rollup.umd.config.js +++ b/grunt/rollup.umd.config.js @@ -1,8 +1,9 @@ - import config from './rollup.config.js'; +import extend from 'extend' +import babel from 'rollup-plugin-babel'; -config.format = 'umd'; -//config.moduleName = 'bootstrapMaterialDesign'; -config.dest = 'dist/js/bootstrap-material-design.umd.js'; - -export default config; +export default extend(true, config, { + plugins: [babel()], + format: 'umd', + dest: 'dist/js/bootstrap-material-design.umd.js' +}) diff --git a/package.json b/package.json index 8931db61..633d808d 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "load-grunt-tasks": "~3.3.0", "markdown-it": "^5.0.0", "mq4-hover-shim": "^0.3.0", + "node-extend": "^0.2.0", "npm-shrinkwrap": "^200.1.0", "rollup": "^0.25", "rollup-plugin-babel": "^2.3",