Changeset 43327

Timestamp:

05/29/2018 02:20:44 PM (8 years ago)

Author:

azaozz

Message:

Build tools: Grunt:

• Normalize filepath in the the watch event.
• Throw a warning when watch fails to process a file because the destination path cannot be determined.

Fixes #44262.

File:

• trunk/Gruntfile.js (modified) (4 diffs)

trunk/Gruntfile.js

@@ -1356 +1356 @@
          * so that only the changed files are updated.
          */
-        grunt.event.on('watch', function( action, filepath, target ) {
+        grunt.event.on( 'watch', function( action, filepath, target ) {
                 var src;
 
@@ -1363 +1363 @@
                         return;
                 }
+
+                // Normalize filepath for Windows.
+                filepath = filepath.replace( /\\/g, '/' );
 
                 // If the target is a file in the restructured js src.
@@ -1393 +1396 @@
                                         grunt.config( [ 'copy', 'includes-js', 'files' ] )
                                 );
+
                                 for ( dest in configs ) {
                                         // If a file in the mapping matches then set the variables for our dynamic tasks.
-                                        if ( configs.hasOwnProperty( dest ) && configs[ dest ][0] === './' + filepath ) {
+                                        if ( dest && configs.hasOwnProperty( dest ) && configs[ dest ][0] === './' + filepath ) {
                                                 files[ dest ] = configs[ dest ];
                                                 src = [ path.relative( BUILD_DIR, dest ) ];
@@ -1420 +1424 @@
                 }
 
+                if ( ! src ) {
+                        grunt.warn( 'Failed to determine the destination file.' );
+                        return;
+                }
+
                 if ( action === 'deleted' ) {
                         // Clean up only those files that were deleted.