Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

2 files changed, 13 insertions, 8 deletions

diff --git a/app/assets/javascripts/code_navigation/index.js b/app/assets/javascripts/code_navigation/index.js
index 362c26ae065..fa5835245bc 100644
--- a/app/assets/javascripts/code_navigation/index.js
+++ b/app/assets/javascripts/code_navigation/index.js
@@ -1,13 +1,17 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import store from './store';
+import createStore from './store';
 import App from './components/app.vue';
 
-Vue.use(Vuex);
-
 export default initialData => {
   const el = document.getElementById('js-code-navigation');
 
+  if (!el) return null;
+
+  Vue.use(Vuex);
+
+  const store = createStore();
+
   store.dispatch('setInitialData', initialData);
 
   return new Vue({
diff --git a/app/assets/javascripts/code_navigation/store/index.js b/app/assets/javascripts/code_navigation/store/index.js
index fe48f3ac7f5..9b60fc337fe 100644
--- a/app/assets/javascripts/code_navigation/store/index.js
+++ b/app/assets/javascripts/code_navigation/store/index.js
@@ -3,8 +3,9 @@ import createState from './state';
 import actions from './actions';
 import mutations from './mutations';
 
-export default new Vuex.Store({
-  actions,
-  mutations,
-  state: createState(),
-});
+export default () =>
+  new Vuex.Store({
+    actions,
+    mutations,
+    state: createState(),
+  });