Skip to content
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

Make Gruntfile more foolproof #518

Merged
merged 6 commits into from
Dec 22, 2017
Merged

Make Gruntfile more foolproof #518

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1de225c
Add additional clean tasks
jessetan Dec 20, 2017
6878cfd
Clean everything before building
jessetan Dec 20, 2017
5d9e3a5
Do not remove Modernizr during cleaning
jessetan Dec 20, 2017
748a05c
Copy fonts to output on default and build task
jessetan Dec 20, 2017
b663e20
Clean all output before default task
jessetan Dec 20, 2017
fce6005
Merge branch 'master' into grunt-tasks
Blendify Dec 21, 2017
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
8 changes: 5 additions & 3 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ module.exports = function(grunt) {
},
clean: {
build: ["demo_docs/build"],
fonts: ["sphinx_rtd_theme/static/fonts"]
fonts: ["sphinx_rtd_theme/static/fonts"],
css: ["sphinx_rtd_theme/static/css"],
js: ["sphinx_rtd_theme/static/js/*", "!sphinx_rtd_theme/static/js/modernizr.min.js"]
},

watch: {
Expand Down Expand Up @@ -160,6 +162,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-browserify');

grunt.registerTask('fonts', ['clean:fonts','copy:fonts']);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think grunt fonts should be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one, done

grunt.registerTask('default', ['exec:bower_update','clean:build','sass:dev','browserify:dev','exec:build_sphinx','connect','open','watch']);
grunt.registerTask('build', ['exec:bower_update','clean:build','sass:build','browserify:build','exec:build_sphinx']);
grunt.registerTask('default', ['exec:bower_update','clean','copy:fonts','sass:dev','browserify:dev','exec:build_sphinx','connect','open','watch']);
grunt.registerTask('build', ['exec:bower_update','clean','copy:fonts','sass:build','browserify:build','exec:build_sphinx']);
}