Skip to content

Commit

Permalink
Merge pull request #208 from Smankusors/fix-waves-concat-order
Browse files Browse the repository at this point in the history
fix: Waves concat order
  • Loading branch information
DanielRuf authored Oct 16, 2021
2 parents aa686d1 + d5dccc3 commit 9363a94
Showing 1 changed file with 34 additions and 63 deletions.
97 changes: 34 additions & 63 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,38 @@
const sass = require('sass');

module.exports = function(grunt) {
let concatFile = 'temp/js/materialize_concat.js.map';
const concatFile = 'temp/js/materialize_concat.js.map';
const jsFiles = [
'js/cash.js',
'js/waves.js',
'js/component.js',
'js/global.js',
'js/anime.min.js',
'js/collapsible.js',
'js/dropdown.js',
'js/modal.js',
'js/materialbox.js',
'js/parallax.js',
'js/tabs.js',
'js/tooltip.js',
'js/toasts.js',
'js/sidenav.js',
'js/scrollspy.js',
'js/autocomplete.js',
'js/forms.js',
'js/slider.js',
'js/cards.js',
'js/chips.js',
'js/pushpin.js',
'js/buttons.js',
'js/datepicker.js',
'js/timepicker.js',
'js/characterCounter.js',
'js/carousel.js',
'js/tapTarget.js',
'js/select.js',
'js/range.js'
];

// configure the tasks
let config = {
Expand Down Expand Up @@ -165,37 +196,7 @@ module.exports = function(grunt) {
},
dist: {
// the files to concatenate
src: [
'js/cash.js',
'js/component.js',
'js/global.js',
'js/anime.min.js',
'js/collapsible.js',
'js/dropdown.js',
'js/modal.js',
'js/materialbox.js',
'js/parallax.js',
'js/tabs.js',
'js/tooltip.js',
'js/waves.js',
'js/toasts.js',
'js/sidenav.js',
'js/scrollspy.js',
'js/autocomplete.js',
'js/forms.js',
'js/slider.js',
'js/cards.js',
'js/chips.js',
'js/pushpin.js',
'js/buttons.js',
'js/datepicker.js',
'js/timepicker.js',
'js/characterCounter.js',
'js/carousel.js',
'js/tapTarget.js',
'js/select.js',
'js/range.js'
],
src: jsFiles,
// the location of the resulting JS file
dest: 'temp/js/materialize.js'
},
Expand All @@ -205,37 +206,7 @@ module.exports = function(grunt) {
sourceMap: true,
sourceMapStyle: 'link'
},
src: [
'js/cash.js',
'js/component.js',
'js/global.js',
'js/anime.min.js',
'js/collapsible.js',
'js/dropdown.js',
'js/modal.js',
'js/materialbox.js',
'js/parallax.js',
'js/tabs.js',
'js/tooltip.js',
'js/waves.js',
'js/toasts.js',
'js/sidenav.js',
'js/scrollspy.js',
'js/autocomplete.js',
'js/forms.js',
'js/slider.js',
'js/cards.js',
'js/chips.js',
'js/pushpin.js',
'js/buttons.js',
'js/datepicker.js',
'js/timepicker.js',
'js/characterCounter.js',
'js/carousel.js',
'js/tapTarget.js',
'js/select.js',
'js/range.js'
],
src: jsFiles,
// the location of the resulting JS file
dest: 'temp/js/materialize_concat.js'
}
Expand Down

0 comments on commit 9363a94

Please sign in to comment.