Implemented paths, reorganized things

Breaks backwards compatibility with older versions of the config

Author: robneu

config/grunt/clean.js

@@ -2,58 +2,42 @@
 module.exports = {
 	css: {
 		src: [
-			'css/'
+			'<%= paths.css %>'
 		]
 	},
 	dist: {
 		src: [
 			'<%= paths.dist %>'
 		]
 	},
-	docs: {
-		src: [
-			'<%= paths.docs %>'
-		]
-	},
 	fonts: {
 		src: [
-			'fonts/'
+			'<%= paths.fonts %>'
 		]
 	},
 	php: {
 		src: [
 			'includes/vendor/'
 		]
 	},
-	logs: {
-		src: [
-			'logs/'
-		]
-	},
-	tmp: {
-		src: [
-			'<%= paths.tmp %>'
-		]
-	},
 	js: {
 		src: [
-			'js/'
+			'<%= paths.js %>'
 		]
 	},
 	images: {
 		src: [
-			'images/'
+			'<%= paths.images %>'
 		]
 	},
 	languages: {
 		src: [
-			'languages/'
+			'<%= paths.languages %>'
 		]
 	},
 	style: {
 		src: [
-			'style*.*',
-			'<%= paths.tmp %>style*.*'
+			'style*.*'
 		]
 	},
 	screenshot: {

config/grunt/compress.js

@@ -15,9 +15,7 @@ module.exports = {
 					'!assets/**',
 					'!config/**',
 					'!dist/**',
-					'!logs/**',
 					'!node_modules/**',
-					'!tmp/**',
 					'!*.sublime*',
 					'!.DS_Store',
 					'!.gitattributes',
@@ -45,8 +43,6 @@ module.exports = {
 					'!node_modules/**',
 					'!.sass-cache/**',
 					'!dist/**',
-					'!logs/**',
-					'!tmp/**',
 					'!*.sublime*',
 					'!.DS_Store'
 				], // Take this...

config/grunt/cssmin.js

@@ -1,24 +1,17 @@
 // https://github.com/gruntjs/grunt-contrib-cssmin
 module.exports = {
-	theme: {
-		expand: true,
-		cwd: '<%= paths.tmp %>',
-		src: [
-			'*.css',
-			'!*.min.css'
-		],
-		dest: '<%= paths.tmp %>',
-		ext: '.min.css',
-		extDot: 'last'
+	style: {
+		src: 'style.css',
+		dest: 'style.min.css'
 	},
 	vendor: {
 		expand: true,
-		cwd: 'css/',
+		cwd: '<%= paths.css %>',
 		src: [
 			'*.css',
 			'!*.min.css'
 		],
-		dest: 'css/',
+		dest: '<%= paths.css %>',
 		ext: '.min.css',
 		extDot: 'last'
 	}

config/grunt/imagemin.js

@@ -4,9 +4,9 @@ module.exports = {
 		files: [
 			{
 				expand: true,
-				cwd: '<%= paths.authorAssets %>images/',
+				cwd: '<%= paths.imagesSrc %>',
 				src: [ '**/*.{png,jpg,jpeg,gif,svg}' ],
-				dest: '<%= paths.tmp %>images/'
+				dest: '<%= paths.images %>'
 			}
 		]
 	}

config/grunt/postcss.js

@@ -42,11 +42,11 @@ module.exports = {
 		]
 	},
 	style: {
-		src: '<%= paths.tmp %>style.css',
-		dest: '<%= paths.tmp %>style.css'
+		src: 'style.css',
+		dest: 'style.css'
 	},
 	editorStyle: {
-		src: '<%= paths.tmp %>editor-style.css',
-		dest: '<%= paths.tmp %>editor-style.css'
+		src: '<%= paths.css %>editor-style.css',
+		dest: '<%= paths.css %>editor-style.css'
 	}
 };

config/grunt/rtlcss.js

@@ -8,7 +8,7 @@ module.exports = {
 		map: true
 	},
 	style: {
-		src: '<%= paths.tmp %>style.css',
-		dest: '<%= paths.tmp %>style-rtl.css'
+		src: 'style.css',
+		dest: 'style-rtl.css'
 	}
 };

config/grunt/sass.js

@@ -5,11 +5,11 @@ module.exports = {
 		outputStyle: 'expanded'
 	},
 	style: {
-		src: '<%= paths.authorAssets %>scss/style.scss',
-		dest: '<%= paths.tmp %>style.css'
+		src: '<%= paths.cssSrc %>style.scss',
+		dest: 'style.css'
 	},
 	editorStyle: {
-		src: '<%= paths.authorAssets %>scss/editor-style.scss',
-		dest: '<%= paths.tmp %>editor-style.css'
+		src: '<%= paths.cssSrc %>editor-style.scss',
+		dest: '<%= paths.css %>editor-style.css'
 	}
 };

config/grunt/uglify.js

@@ -3,7 +3,7 @@ module.exports = {
 	theme: {
 		options: {
 			sourceMap: true,
-			sourceMapName: 'js/theme.js.map',
+			sourceMapName: '<%= paths.js %>theme.js.map',
 			sourceMapIncludeSources: true,
 			mangle: true,
 			compress: true,
@@ -12,12 +12,12 @@ module.exports = {
 		files: [
 			{
 				expand: true,
-				cwd: 'js/',
+				cwd: '<%= paths.js %>',
 				src: [
 					'*.js',
 					'!*.min.js'
 				],
-				dest: 'js/',
+				dest: '<%= paths.js %>',
 				ext: '.min.js',
 				extDot: 'last'
 			}

config/grunt/version.js

@@ -24,7 +24,7 @@ module.exports = {
 			prefix: '\\s+\\*\\s+Version:\\s+'
 		},
 		src: [
-			'<%= paths.authorAssets %>scss/style.scss'
+			'<%= paths.cssSrc %>style.scss'
 		]
 	}
 };

config/grunt/watch.js

@@ -13,7 +13,7 @@ module.exports = {
 	},
 	images: {
 		files: [
-			'<%= paths.authorAssets %>images/**/*'
+			'<%= paths.imagesSrc %>**/*'
 		],
 		tasks: [
 			'build:images'
@@ -33,7 +33,7 @@ module.exports = {
 			'sass:style',
 			'postcss:style',
 			'rtlcss:style',
-			'cssmin:theme',
+			'cssmin:style',
 			'copy:css'
 		]
 	}