Merge remote-tracking branch 'upstream/master'

Gruntfile.js

@@ -27,7 +27,9 @@ module.exports = function(grunt) {
 				options: {
 					syntax: require('postcss-scss'),
 					processors: [
-						require('postcss-flexbugs-fixes')
+						require('postcss-flexbugs-fixes'),
+						require('postcss-line-height-px-to-unitless'),
+						require('postcss-gradient-transparency-fix')
 					]
 				},
 				src: 'sass/**/*.scss'
@@ -36,14 +38,14 @@ module.exports = function(grunt) {
 				options: {
 					processors: [
 						require('postcss-import'),
+						require('postcss-assets'),
 						require('postcss-color-rgba-fallback'),
-						require('postcss-easings'),
 						require('postcss-focus'),
-						require('postcss-assets'),
+						require('postcss-will-change'),
 						require('autoprefixer')({
 							cascade: true,
 							flexbox: false
-						}),
+						})
 					]
 				},
 				src: 'build/**/*.css'
@@ -53,8 +55,7 @@ module.exports = function(grunt) {
 		sass: {
 			options: {
 				style: 'expanded',
-				precision: 3,
-				sourcemap: 'none'
+				precision: 3
 			},
 			build: {
 				files: {
@@ -75,11 +76,16 @@ module.exports = function(grunt) {
 			}
 		},
 
+		shell: {
+			prettier: {
+				command: 'prettier --use-tabs --single-quote --parser=flow --write js/**/*.js'
+			}
+		},
+
 		concat: {
 			build: {
 				src: [
 					'bower_components/include-media-export/include-media.js',
-					'bower_components/js-cookie/src/js.cookie.js',
 					'bower_components/vanilla-fitvids/dist/fitvids.js',
 					'js/scripts.js'
 				],
@@ -97,8 +103,7 @@ module.exports = function(grunt) {
 
 		uglify: {
 			options: {
-				preserveComments: 'some',
-				sourceMap: false
+				preserveComments: 'some'
 			},
 			build: {
 				files: {
@@ -166,6 +171,7 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-concat');
 	grunt.loadNpmTasks('grunt-contrib-imagemin');
 	grunt.loadNpmTasks('grunt-contrib-jshint');
+	grunt.loadNpmTasks('grunt-shell');
 	grunt.loadNpmTasks('grunt-sass');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-watch');
@@ -176,6 +182,6 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-postcss');
 
 	grunt.registerTask('default', ['clean', 'imagemin', 'sass', 'concat', 'postcss:css', 'watch']);
-	grunt.registerTask('build', ['clean', 'imagemin', 'csscomb', 'postcss:scss', 'sass', 'jshint', 'concat', 'uglify', 'postcss:css', 'csso']);
+	grunt.registerTask('build', ['clean', 'imagemin', 'csscomb', 'postcss:scss', 'sass', 'jshint', 'shell', 'concat', 'uglify', 'postcss:css', 'csso']);
 
 };