Merge branch '6.0' into 6.1

* 6.0:
  Improve the diff highlighting for custom webpack plugins

Author: javiereguiluz

frontend/encore/custom-loaders-plugins.rst

@@ -57,9 +57,9 @@ to use the `IgnorePlugin`_ (see `moment/moment#2373`_):
           // ...
 
     +     .addPlugin(new webpack.IgnorePlugin({
-              resourceRegExp: /^\.\/locale$/,
-              contextRegExp: /moment$/,
-          }))
+    +         resourceRegExp: /^\.\/locale$/,
+    +         contextRegExp: /moment$/,
+    +     }))
       ;
 
 .. _`handlebars-loader`: https://github.com/pcardune/handlebars-loader