Skip to content

fix: Waves concat order #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2021
Merged

fix: Waves concat order #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 34 additions & 63 deletions Gruntfile.js
View file
Open in desktop
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