Selaa lähdekoodia

Code refactoring in builder tasks.

Aleksander Nowodzinski 9 vuotta sitten
vanhempi
commit
4e7a827cdf
3 muutettua tiedostoa jossa 15 lisäystä ja 29 poistoa
  1. 7 22
      dev/tasks/build/tasks.js
  2. 7 6
      dev/tasks/build/utils.js
  3. 1 1
      dev/tests/build/utils.js

+ 7 - 22
dev/tasks/build/tasks.js

@@ -20,7 +20,7 @@ module.exports = ( config ) => {
 	const buildDir = path.join( config.ROOT_DIR, config.BUILD_DIR );
 	const themesGlob = path.join( 'theme', '**', '*.scss' );
 	const iconsGlob = path.join( 'theme', 'icons', '*.svg' );
-	const parsedArguments = utils.parseArguments();
+	const args = utils.parseArguments();
 
 	const tasks = {
 		clean: {
@@ -322,34 +322,19 @@ module.exports = ( config ) => {
 
 	gulp.task( 'build:clean:all', tasks.clean.all );
 	gulp.task( 'build:clean:themes', tasks.clean.themes );
-	gulp.task( 'build:clean:js', () => {
-		return tasks.clean.js( parsedArguments );
-	} );
+	gulp.task( 'build:clean:js', () => tasks.clean.js( args ) );
 
 	gulp.task( 'build:themes', ( callback ) => {
 		runSequence( 'build:clean:themes', 'build:icons', 'build:sass', callback );
 	} );
 
-	gulp.task( 'build:sass', () => {
-		return tasks.build.sass( parsedArguments );
-	} );
-
-	gulp.task( 'build:icons', () => {
-		return tasks.build.icons( parsedArguments );
-	} );
-
-	gulp.task( 'build:js', [ 'build:clean:js' ], () => {
-		return tasks.build.js( parsedArguments );
-	} );
+	gulp.task( 'build:sass', () => tasks.build.sass( args ) );
+	gulp.task( 'build:icons', () => tasks.build.icons( args ) );
+	gulp.task( 'build:js', [ 'build:clean:js' ], () => tasks.build.js( args ) );
 
 	// Tasks specific for `gulp docs` builder.
-	gulp.task( 'build:clean:js:esnext', () => {
-		return tasks.clean.js( { formats: [ 'esnext' ] } );
-	} );
-
-	gulp.task( 'build:js:esnext', [ 'build:clean:js:esnext' ], () => {
-		return tasks.build.js( { formats: [ 'esnext' ] } );
-	} );
+	gulp.task( 'build:clean:js:esnext', () => tasks.clean.js( { formats: [ 'esnext' ] } ) );
+	gulp.task( 'build:js:esnext', [ 'build:clean:js:esnext' ], () => tasks.build.js( { formats: [ 'esnext' ] } ) );
 
 	return tasks;
 };

+ 7 - 6
dev/tasks/build/utils.js

@@ -14,7 +14,6 @@ const gulpFilter = require( 'gulp-filter' );
 const multipipe = require( 'multipipe' );
 const PassThrough = require( 'stream' ).PassThrough;
 const through = require( 'through2' );
-
 const fs = require( 'fs' );
 const sass = require( 'node-sass' );
 const del = require( 'del' );
@@ -385,9 +384,11 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 		// in order to workaround https://github.com/paulmillr/chokidar/issues/419.
 		return fs.readdirSync( path.join( rootDir, 'node_modules' ) )
 			// Look for ckeditor5-* directories.
-			.filter( ( fileName ) => fileName.indexOf( 'ckeditor5-' ) === 0 )
+			.filter( fileName => {
+				return fileName.indexOf( 'ckeditor5-' ) === 0;
+			} )
 			// Resolve symlinks and keep only directories.
-			.map( ( fileName ) => {
+			.map( fileName => {
 				let filePath = path.join( rootDir, 'node_modules', fileName );
 				let stat = fs.lstatSync( filePath );
 
@@ -404,7 +405,7 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 				return false;
 			} )
 			// 					...those out.
-			.filter( ( filePath ) => filePath );
+			.filter( filePath => filePath );
 	},
 
 	/**
@@ -547,7 +548,7 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 			},
 			mode: {
 				symbol: {
-					dest: './', // Flatten symbol/
+					dest: './', // Flatten symbol/ folder.
 					inline: true,
 					render: {
 						js: {
@@ -575,7 +576,7 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 			return pipe(
 				transformationStream ? transformationStream( f ) : utils.noop(),
 				gulp.dest( path.join( buildDir, f, 'theme' ) ),
-				utils.noop( ( file ) => {
+				utils.noop( file => {
 					gutil.log( `Output for ${ gutil.colors.cyan( f ) } is '${ gutil.colors.cyan( file.path ) }'.` );
 				} )
 			);

+ 1 - 1
dev/tests/build/utils.js

@@ -708,7 +708,7 @@ describe( 'build-utils', () => {
 		it( 'returns configuration to output JavaScript sprite', () => {
 			const options = utils.getIconSpriteOptions();
 
-			expect( options.mode.symbol.render.js.dest ).to.equal( 'icons.js' );
+			expect( options.mode.symbol.render.js.dest ).to.equal( 'iconmanagermodel.js' );
 		} );
 	} );