Przeglądaj źródła

The builder should copy all files, not only JS.

Piotrek Koszuliński 10 lat temu
rodzic
commit
87b31d2cc9
2 zmienionych plików z 14 dodań i 6 usunięć
  1. 4 4
      dev/tasks/gulp/build/tasks.js
  2. 10 2
      dev/tasks/gulp/build/utils.js

+ 4 - 4
dev/tasks/gulp/build/tasks.js

@@ -74,9 +74,9 @@ module.exports = ( config ) => {
 			 * @returns {Stream}
 			 * @returns {Stream}
 			 */
 			 */
 			ckeditor5( watch ) {
 			ckeditor5( watch ) {
-				const glob = path.join( config.ROOT_DIR, '@(src|tests)', '**', '*.js' );
+				const glob = path.join( config.ROOT_DIR, '@(src|tests)', '**', '*' );
 
 
-				return gulp.src( glob )
+				return gulp.src( glob, { nodir: true } )
 					.pipe( watch ? gulpWatch( glob ) : utils.noop() )
 					.pipe( watch ? gulpWatch( glob ) : utils.noop() )
 					.pipe( utils.wrapCKEditor5Package() );
 					.pipe( utils.wrapCKEditor5Package() );
 			},
 			},
@@ -114,10 +114,10 @@ module.exports = ( config ) => {
 					.filter( ( filePath ) => filePath );
 					.filter( ( filePath ) => filePath );
 
 
 				const streams = dirs.map( ( dirPath ) => {
 				const streams = dirs.map( ( dirPath ) => {
-					const glob = path.join( dirPath, '@(src|tests)', '**', '*.js' );
+					const glob = path.join( dirPath, '@(src|tests)', '**', '*' );
 					// Use parent as a base so we get paths starting with 'ckeditor5-*/src/*' in the stream.
 					// Use parent as a base so we get paths starting with 'ckeditor5-*/src/*' in the stream.
 					const baseDir = path.parse( dirPath ).dir;
 					const baseDir = path.parse( dirPath ).dir;
-					const opts = { base: baseDir };
+					const opts = { base: baseDir, nodir: true };
 
 
 					return gulp.src( glob, opts )
 					return gulp.src( glob, opts )
 						.pipe( watch ? gulpWatch( glob, opts ) : utils.noop() );
 						.pipe( watch ? gulpWatch( glob, opts ) : utils.noop() );

+ 10 - 2
dev/tasks/gulp/build/utils.js

@@ -64,7 +64,9 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 			conversionPipes.push( utils.pickVersionedFile( format ) );
 			conversionPipes.push( utils.pickVersionedFile( format ) );
 
 
 			if ( format != 'esnext' ) {
 			if ( format != 'esnext' ) {
-				const filterCode = gulpFilter( utils.isNotTestFile, { restore: true } );
+				const filterCode = gulpFilter( ( file ) => {
+					return utils.isNotTestFile( file ) && utils.isJSFile( file );
+				}, { restore: true } );
 				const transpileCode = utils.transpile( format, utils.getBabelOptionsForCode( format ) );
 				const transpileCode = utils.transpile( format, utils.getBabelOptionsForCode( format ) );
 				conversionPipes.push(
 				conversionPipes.push(
 					filterCode,
 					filterCode,
@@ -72,7 +74,9 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 					filterCode.restore
 					filterCode.restore
 				);
 				);
 
 
-				const filterTests = gulpFilter( utils.isTestFile, { restore: true } );
+				const filterTests = gulpFilter( ( file ) => {
+					return utils.isTestFile( file ) && utils.isJSFile( file );
+				}, { restore: true } );
 				const transpileTests = utils.transpile( format, utils.getBabelOptionsForTests( format ) );
 				const transpileTests = utils.transpile( format, utils.getBabelOptionsForTests( format ) );
 				conversionPipes.push(
 				conversionPipes.push(
 					filterTests,
 					filterTests,
@@ -266,6 +270,10 @@ require( [ 'tests' ], bender.defer(), function( err ) {
 
 
 	isNotTestFile( file ) {
 	isNotTestFile( file ) {
 		return !utils.isTestFile( file );
 		return !utils.isTestFile( file );
+	},
+
+	isJSFile( file ) {
+		return file.path.endsWith( '.js' );
 	}
 	}
 };
 };