Remove gitlab-ui's modal from global

4 files changed, 18 insertions, 8 deletions

diff --git a/app/assets/javascripts/commons/gitlab_ui.js b/app/assets/javascripts/commons/gitlab_ui.js
index f60665577fe..64a748d29db 100644
--- a/app/assets/javascripts/commons/gitlab_ui.js
+++ b/app/assets/javascripts/commons/gitlab_ui.js
@@ -2,16 +2,12 @@ import Vue from 'vue';
 import {
   GlPagination,
   GlProgressBar,
-  GlModal,
   GlLoadingIcon,
-  GlModalDirective,
   GlTooltipDirective,
 } from '@gitlab-org/gitlab-ui';
 
 Vue.component('gl-pagination', GlPagination);
 Vue.component('gl-progress-bar', GlProgressBar);
-Vue.component('gl-ui-modal', GlModal);
 Vue.component('gl-loading-icon', GlLoadingIcon);
 
-Vue.directive('gl-modal', GlModalDirective);
 Vue.directive('gl-tooltip', GlTooltipDirective);
diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
index 75cb6374ad5..f970a5ebb64 100644
--- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
+++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
@@ -1,8 +1,15 @@
 <script>
 import _ from 'underscore';
 import { s__, sprintf } from '~/locale';
+import { GlModal, GlModalDirective } from '@gitlab-org/gitlab-ui';
 
 export default {
+  components: {
+    GlModal,
+  },
+  directives: {
+    'gl-modal': GlModalDirective,
+  },
   props: {
     deleteWikiUrl: {
       type: String,
@@ -54,7 +61,7 @@ export default {
     >
       {{ __('Delete') }}
     </button>
-    <gl-ui-modal
+    <gl-modal
       :title="title"
       :ok-title="s__('WikiPageConfirmDelete|Delete page')"
       :modal-id="modalId"
@@ -81,6 +88,6 @@ export default {
           name="authenticity_token"
         />
       </form>
-    </gl-ui-modal>
+    </gl-modal>
   </div>
 </template>
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
index 43f0b6651b9..8950ae31627 100644
--- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
+++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
@@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
 import GfmAutoComplete from '~/gfm_auto_complete';
 import { __, s__ } from '~/locale';
 import Api from '~/api';
+import { GlModal } from '@gitlab-org/gitlab-ui';
 import eventHub from './event_hub';
 import EmojiMenuInModal from './emoji_menu_in_modal';
 
@@ -13,6 +14,7 @@ const emojiMenuClass = 'js-modal-status-emoji-menu';
 export default {
   components: {
     Icon,
+    GlModal,
   },
   props: {
     currentEmoji: {
@@ -152,7 +154,7 @@ export default {
 </script>
 
 <template>
-  <gl-ui-modal
+  <gl-modal
     :title="s__('SetStatusModal|Set a status')"
     :modal-id="modalId"
     :ok-title="s__('SetStatusModal|Set status')"
@@ -237,5 +239,5 @@ export default {
         </div>
       </div>
     </div>
-  </gl-ui-modal>
+  </gl-modal>
 </template>
diff --git a/changelogs/unreleased/gl-ui-modal.yml b/changelogs/unreleased/gl-ui-modal.yml
new file mode 100644
index 00000000000..fbdb8260d24
--- /dev/null
+++ b/changelogs/unreleased/gl-ui-modal.yml
@@ -0,0 +1,5 @@
+---
+title: Remove gitlab-ui's modal from global
+merge_request:
+author:
+type: performance