Merge "mw.widgets.CategoryMultiselectWidget use TagMultiselectWidget"

diff --cc resources/Resources.php
index dea9293,15669e2..b4b921f
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -2627,24 -2605,9 +2627,24 @@@ return 
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 +      'mediawiki.widgets.expiry' => [
 +              'scripts' => [
 +                      'resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.js',
 +              ],
 +              'dependencies' => [
 +                      'oojs-ui-core',
 +                      'oojs-ui-widgets',
 +                      'moment',
 +                      'mediawiki.widgets.datetime'
 +              ],
 +              'skinStyles' => [
 +                      'default' => 'resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.less',
 +              ],
 +              'targets' => [ 'desktop', 'mobile' ],
 +      ],
        'mediawiki.widgets.CategoryMultiselectWidget' => [
                'scripts' => [
-                       'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',
+                       'resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js',
                        'resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js',
                ],
                'dependencies' => [