1 files changed, 3 insertions, 33 deletions
diff --git a/app/assets/javascripts/mr_notes/index.js b/app/assets/javascripts/mr_notes/index.js
index c32a1f4c2ac..a202923bd21 100644
--- a/app/assets/javascripts/mr_notes/index.js
+++ b/app/assets/javascripts/mr_notes/index.js
@@ -1,12 +1,8 @@
-import Vue from 'vue';
-import store from '~/mr_notes/stores';
 import initCherryPickCommitModal from '~/projects/commit/init_cherry_pick_commit_modal';
 import initRevertCommitModal from '~/projects/commit/init_revert_commit_modal';
-import initDiffsApp from '../diffs';
-import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
+import { initMrStateLazyLoad } from '~/mr_notes/init';
 import MergeRequest from '../merge_request';
-import DiscussionCounter from '../notes/components/discussion_counter.vue';
-import initNotesApp from './init_notes';
+import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
 
 export default function initMrNotes() {
   resetServiceWorkersPublicPath();
@@ -17,36 +13,10 @@ export default function initMrNotes() {
     action: mrShowNode.dataset.mrAction,
   });
 
-  initDiffsApp(store);
-  initNotesApp();
+  initMrStateLazyLoad();
 
   document.addEventListener('merged:UpdateActions', () => {
     initRevertCommitModal('i_code_review_post_merge_submit_revert_modal');
     initCherryPickCommitModal('i_code_review_post_merge_submit_cherry_pick_modal');
   });
-
-  requestIdleCallback(() => {
-    const el = document.getElementById('js-vue-discussion-counter');
-
-    if (el) {
-      const { blocksMerge } = el.dataset;
-
-      // eslint-disable-next-line no-new
-      new Vue({
-        el,
-        name: 'DiscussionCounter',
-        components: {
-          DiscussionCounter,
-        },
-        store,
-        render(createElement) {
-          return createElement('discussion-counter', {
-            props: {
-              blocksMerge: blocksMerge === 'true',
-            },
-          });
-        },
-      });
-    }
-  });
 }