Skip to content

Commit

Permalink
Merging 3.2.5 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dioslaska committed Nov 6, 2017
1 parent c350dc5 commit cc24c95
Show file tree
Hide file tree
Showing 45 changed files with 4,528 additions and 411 deletions.
25 changes: 25 additions & 0 deletions grunt/bump.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
options: {
files: [
'package.json',
'packages/angular/package.json',
'packages/angularjs/package.json',
'packages/javascript/package.json',
'packages/jquery/package.json',
'packages/knockout/package.json',
'packages/react/package.json'
],
updateConfigs: [],
commit: false,
commitMessage: 'Release v%VERSION%',
commitFiles: [
'package.json'
],
createTag: false,
tagName: 'v%VERSION%',
tagMessage: 'Version %VERSION%',
push: false,
pushTo: 'upstream',
gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d'
}
};
7 changes: 6 additions & 1 deletion grunt/rollup.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ module.exports = {
moduleName: 'mobiscroll',
format: 'umd',
context: 'this',
banner: '/* eslint-disable */',
onwarn(warning) {
if (warning.code === 'UNUSED_EXTERNAL_IMPORT') {
return;
Expand All @@ -77,7 +78,11 @@ module.exports = {
babel({
plugins: ['external-helpers']
}),
uglify()
uglify({
output: {
comments: /eslint-disable/
}
})
]
},
files: {
Expand Down
Loading

0 comments on commit cc24c95

Please sign in to comment.