Refactor OverlayEventBus location

rollup.config.js

@@ -18,6 +18,7 @@ let globalDependencies = {
     'primevue/paginator': 'primevue.paginator',
     'primevue/confirmationeventbus': 'primevue.confirmationeventbus',
     'primevue/toasteventbus': 'primevue.toasteventbus',
+    'primevue/overlayeventbus': 'primevue.overlayeventbus',
     'primevue/useconfirm': 'primevue.useconfirm',
     'primevue/usetoast': 'primevue.usetoast',
     'primevue/progressbar': 'primevue.progressbar',
@@ -113,6 +114,7 @@ function addServices() {
     addEntry('useconfirm', 'UseConfirm.js', 'useconfirm');
     addEntry('toastservice', 'ToastService.js', 'toastservice');
     addEntry('toasteventbus', 'ToastEventBus.js', 'toasteventbus');
+    addEntry('overlayeventbus', 'OverlayEventBus.js', 'overlayeventbus');
     addEntry('usetoast', 'UseToast.js', 'usetoast');
     addEntry('terminalservice', 'TerminalService.js', 'terminalservice');
 }

src/components/autocomplete/AutoComplete.vue

@@ -43,7 +43,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,UniqueComponentId,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,UniqueComponentId,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Button from 'primevue/button';
 import Ripple from 'primevue/ripple';
 

src/components/calendar/Calendar.vue

@@ -133,7 +133,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import InputText from 'primevue/inputtext';
 import Button from 'primevue/button';
 import Ripple from 'primevue/ripple';

src/components/cascadeselect/CascadeSelect.vue

@@ -28,7 +28,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import CascadeSelectSub from './CascadeSelectSub.vue';
 
 export default {

src/components/colorpicker/ColorPicker.vue

@@ -24,7 +24,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 
 export default {
     emits: ['update:modelValue'],

src/components/confirmpopup/ConfirmPopup.vue

@@ -17,7 +17,8 @@
 
 <script>
 import ConfirmationEventBus from 'primevue/confirmationeventbus';
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Button from 'primevue/button';
 
 export default {

src/components/datatable/BodyCell.vue

@@ -31,7 +31,8 @@
 </template>
 
 <script>
-import {DomHandler,ObjectUtils,OverlayEventBus} from 'primevue/utils';
+import {DomHandler,ObjectUtils} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import RowRadioButton from './RowRadioButton.vue';
 import RowCheckbox from './RowCheckbox.vue';
 import Ripple from 'primevue/ripple';

src/components/dropdown/Dropdown.vue

@@ -58,7 +58,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import {FilterService} from 'primevue/api';
 import Ripple from 'primevue/ripple';
 

src/components/menu/Menu.vue

@@ -21,7 +21,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Menuitem from './Menuitem.vue';
 
 export default {

src/components/multiselect/MultiSelect.vue

@@ -93,7 +93,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,ObjectUtils,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import {FilterService} from 'primevue/api';
 import Ripple from 'primevue/ripple';
 

src/components/overlayeventbus/OverlayEventBus.js

@@ -0,0 +1,3 @@
+import {EventBus} from 'primevue/utils';
+
+export default EventBus();

src/components/overlayeventbus/package.json

@@ -0,0 +1,5 @@
+{
+    "main": "./overlayeventbus.cjs.js",
+    "module": "./overlayeventbus.esm.js",
+    "unpkg": "./overlayeventbus.min.js"
+  }

src/components/overlaypanel/OverlayPanel.vue

@@ -14,7 +14,8 @@
 </template>
 
 <script>
-import {UniqueComponentId,DomHandler,ConnectedOverlayScrollHandler,OverlayEventBus} from 'primevue/utils';
+import {UniqueComponentId,DomHandler,ConnectedOverlayScrollHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import Ripple from 'primevue/ripple';
 
 export default {

src/components/password/Password.vue

@@ -20,7 +20,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import InputText from 'primevue/inputtext';
 
 export default {

src/components/tieredmenu/TieredMenu.vue

@@ -9,7 +9,8 @@
 </template>
 
 <script>
-import {ConnectedOverlayScrollHandler,DomHandler,OverlayEventBus} from 'primevue/utils';
+import {ConnectedOverlayScrollHandler,DomHandler} from 'primevue/utils';
+import OverlayEventBus from 'primevue/overlayeventbus';
 import TieredMenuSub from './TieredMenuSub.vue';
 
 export default {

src/components/utils/OverlayEventBus.js

@@ -1,3 +0,0 @@
-import EventBus from './EventBus.js';
-
-export default EventBus();

src/components/utils/Utils.js

@@ -3,6 +3,5 @@ import DomHandler from './DomHandler';
 import ObjectUtils from './ObjectUtils';
 import UniqueComponentId from './UniqueComponentId';
 import EventBus from './EventBus';
-import OverlayEventBus from './OverlayEventBus';
 
-export {ConnectedOverlayScrollHandler,DomHandler,ObjectUtils,UniqueComponentId,EventBus,OverlayEventBus};
+export {ConnectedOverlayScrollHandler,DomHandler,ObjectUtils,UniqueComponentId,EventBus};

vue.config.js

@@ -21,6 +21,7 @@ module.exports = {
                 'primevue/message': path.resolve(__dirname, 'src/components/message/Message.vue'),
                 'primevue/confirmationeventbus': path.resolve(__dirname, 'src/components/confirmationeventbus/ConfirmationEventBus.js'),
                 'primevue/toasteventbus': path.resolve(__dirname, 'src/components/toasteventbus/ToastEventBus.js'),
+                'primevue/overlayeventbus': path.resolve(__dirname, 'src/components/overlayeventbus/OverlayEventBus.js'),
                 'primevue/terminalservice': path.resolve(__dirname, 'src/components/terminalservice/TerminalService.js')
             },
         },