code clear

Author: tower1229

bin/build.js

@@ -175,7 +175,7 @@ const cssNormalOut = function(option) {
 	//  compress:
 	// 	callback
 	// }
-	if (!option || !option.src || !option.dest.split) {
+	if (!option || !option.src || !option.dest || !option.dest.split) {
 		return console.log('cssNormalOut()参数错误！');
 	}
 	if (!option.mapsrc) {
@@ -214,6 +214,26 @@ const cssNormalOut = function(option) {
 		});
 };
 
+const imageMin = function(option){
+	// {
+	// 	src:
+	// 	dest:
+	// 	callback
+	// }
+	if (!option || !option.src || !option.dest || !option.dest.split) {
+		return console.log('imageMin()参数错误！');
+	}
+	gulp.src(option.src)
+		.pipe(changed(option.dest))
+		.pipe(imagemin())
+		.pipe(gulp.dest(option.dest))
+		.on('end', function() {
+			if (typeof(option.callback) === 'function') {
+				option.callback();
+			}
+		});
+};
+
 const scriptLib = function(filePath, callback) {
 	if (!globalConfig.compress) {
 		scriptsNormalOut({
@@ -283,20 +303,14 @@ let script = function(filePath, callback) {
 script.prototype.todoList = [scriptLib, scriptApp];
 
 let image = function(filePath, callback) {
-	gulp.src(globalConfig.paths.imageALL)
-		.pipe(changed(globalConfig.distDir))
-		.pipe(imagemin())
-		.pipe(gulp.dest(globalConfig.distDir));
-
-	gulp.src(globalConfig.paths.image)
-		.pipe(changed(globalConfig.dist.img))
-		.pipe(imagemin())
-		.pipe(gulp.dest(globalConfig.dist.img))
-		.on('end', function() {
-			if (typeof(callback) === 'function') {
-				callback();
-			}
-		});
+	if(!filePath){
+		filePath = globalConfig.paths.imageAll;
+	}
+	imageMin({
+		src: filePath,
+		dest: globalConfig.distDir,
+		callback: callback
+	});
 };
 
 let font = function(file, callback) {

bin/paths.js

@@ -23,8 +23,7 @@ const getPath = function() {
 			scriptConcat: [path.join(userConfig.projectDir, '/lib/seajs/sea.js'), globalConfig.compress ? path.join(userConfig.projectDir, '/seajs.config.js') : '', path.join(userConfig.projectDir, '/lib/seajs/manifest.js'), path.join(userConfig.projectDir, '/lib/seajs/seajs-localcache.js')],
 			scriptApp: [path.join(userConfig.projectDir, '/js/*.{' + types.script + '}')],
 			scriptLib: [path.join(userConfig.projectDir, '/lib/**'), '!' + path.join(userConfig.projectDir, '/lib/seajs/**')],
-			image: [path.join(userConfig.projectDir, '/img/**/*.{' + types.img + '}')],
-			imageALL: [path.join(userConfig.projectDir, '/**/*.{' + types.img + '}'), '!' + path.join(userConfig.projectDir, '/img/**/*.{' + types.img + '}')],
+			imageAll: [path.join(userConfig.projectDir, '/**/*.{' + types.img + '}')],
 			cssMain: ['/css/style.less', '/css/resp-smal.less', '/css/resp-midd.less', '/css/config.less', '/css/responsive.less', '_component/'],
 			cssMainTarget: path.join(globalConfig.projectDir, '/css/style.less'),
 			cssOther: [path.join(userConfig.projectDir, '/**/*.{' + types.css + '}'), '!' + path.join(userConfig.projectDir, '/include/**'), '!' + path.join(userConfig.projectDir, '/css/style.less'), '!' + path.join(userConfig.projectDir, '/css/resp-smal.less'), '!' + path.join(userConfig.projectDir, '/css/resp-midd.less'), '!' + path.join(userConfig.projectDir, '/css/config.less'), '!' + path.join(userConfig.projectDir, '/css/responsive.less')],
@@ -39,7 +38,7 @@ const getPath = function() {
 			css: path.join(userConfig.distDir, './css'),
 			font: path.join(userConfig.distDir, './font'),
 			img: path.join(userConfig.distDir, './img'),
-			html: path.join(userConfig.distDir)
+			html: path.join(userConfig.distDir, './')
 		};
 		return globalConfig;
 	} else {