Merge pull request #1113 from nextcloud/backport/1112/stable26

[stable26] fix: Properly import the ActivityTab dynamically
nextcloud · Mar 9, 2023 · f5b9955 · f5b9955
2 parents 2a58e76 + cfdce6f
commit f5b9955
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/js/activity-sidebar.js b/js/activity-sidebar.js
diff --git a/js/activity-sidebar.js.map b/js/activity-sidebar.js.map
diff --git a/src/sidebar.js b/src/sidebar.js
@@ -31,7 +31,6 @@ __webpack_nonce__ = btoa(OC.requestToken);
 __webpack_public_path__ = OC.linkTo('activity', 'js/');
 
 // Init Activity tab component
-let ActivityTab = null
 let ActivityTabView = null
 let ActivityTabInstance = null
 const activityTab = new OCA.Files.Sidebar.Tab({
@@ -40,7 +39,7 @@ const activityTab = new OCA.Files.Sidebar.Tab({
 	icon: 'icon-activity',
 
 	async mount(el, fileInfo, context) {
-		ActivityTab = await import(/* webpackPreload: true */ './views/ActivityTab.vue')
+		const { default: ActivityTab } = await import(/* webpackPreload: true */ './views/ActivityTab.vue')
 		ActivityTabView = ActivityTabView ?? Vue.extend(ActivityTab)
 		if (ActivityTabInstance) {
 			ActivityTabInstance.$destroy()
@@ -65,7 +64,7 @@ const activityTab = new OCA.Files.Sidebar.Tab({
 window.addEventListener('DOMContentLoaded', async function() {
 	if (OCA.Files && OCA.Files.Sidebar) {
 		OCA.Files.Sidebar.registerTab(activityTab)
-		ActivityTab = await import(/* webpackPreload: true */ './views/ActivityTab.vue')
+		const { default: ActivityTab } = await import(/* webpackPreload: true */ './views/ActivityTab.vue')
 		ActivityTabView = ActivityTabView ?? Vue.extend(ActivityTab)
 	}
 })