diff --git a/ui/src/composables/private.use-portal/use-portal.js b/ui/src/composables/private.use-portal/use-portal.js index f442fd59951..69f585708ac 100644 --- a/ui/src/composables/private.use-portal/use-portal.js +++ b/ui/src/composables/private.use-portal/use-portal.js @@ -3,7 +3,7 @@ import { h, ref, onUnmounted, Teleport } from 'vue' import { createComponent } from '../../utils/private.create/create.js' import { noop } from '../../utils/event/event.js' import { addFocusWaitFlag, removeFocusWaitFlag } from '../../utils/private.focus/focus-manager.js' -import { createGlobalNode, removeGlobalNode } from '../../utils/private.global/global-nodes.js' +import { createGlobalNode, removeGlobalNode } from '../../utils/private.config/nodes.js' import { portalProxyList } from '../../utils/private.portal/portal.js' import { injectProp } from '../../utils/private.inject-obj-prop/inject-obj-prop.js' diff --git a/ui/src/install-quasar.js b/ui/src/install-quasar.js index 32a209a7248..715d980249c 100644 --- a/ui/src/install-quasar.js +++ b/ui/src/install-quasar.js @@ -9,7 +9,7 @@ import Lang from './plugins/lang/Lang.js' import IconSet from './plugins/icon-set/IconSet.js' import { quasarKey } from './utils/private.symbols/symbols.js' -import { globalConfig, globalConfigIsFrozen, freezeGlobalConfig } from './utils/private.global/global-config.js' +import { globalConfig, globalConfigIsFrozen, freezeGlobalConfig } from './utils/private.config/instance-config.js' import { isObject } from './utils/is/is.js' /** diff --git a/ui/src/plugins/app-fullscreen/AppFullscreen.js b/ui/src/plugins/app-fullscreen/AppFullscreen.js index b149518373d..e21b45c5abf 100644 --- a/ui/src/plugins/app-fullscreen/AppFullscreen.js +++ b/ui/src/plugins/app-fullscreen/AppFullscreen.js @@ -1,5 +1,5 @@ import { createReactivePlugin } from '../../utils/private.create/create.js' -import { changeGlobalNodesTarget } from '../../utils/private.global/global-nodes.js' +import { changeGlobalNodesTarget } from '../../utils/private.config/nodes.js' const prefixes = {} diff --git a/ui/src/plugins/bottom-sheet/BottomSheet.js b/ui/src/plugins/bottom-sheet/BottomSheet.js index dae8155bcae..65fe9847afc 100644 --- a/ui/src/plugins/bottom-sheet/BottomSheet.js +++ b/ui/src/plugins/bottom-sheet/BottomSheet.js @@ -1,5 +1,5 @@ import BottomSheet from './component/BottomSheetComponent.js' -import globalDialog from '../../utils/private.global/global-dialog.js' +import globalDialog from '../../utils/private.dialog/create-dialog.js' export default { install ({ $q, parentApp }) { diff --git a/ui/src/plugins/bottom-sheet/BottomSheet.json b/ui/src/plugins/bottom-sheet/BottomSheet.json index c4d9058e758..808c5302b1c 100644 --- a/ui/src/plugins/bottom-sheet/BottomSheet.json +++ b/ui/src/plugins/bottom-sheet/BottomSheet.json @@ -1,5 +1,5 @@ { - "mixins": [ "utils/private.global/global-dialog" ], + "mixins": [ "utils/private.dialog/create-dialog" ], "meta": { "docsUrl": "https://v2.quasar.dev/quasar-plugins/bottom-sheet" diff --git a/ui/src/plugins/dialog/Dialog.js b/ui/src/plugins/dialog/Dialog.js index 8938c8b145a..ae74f507bfb 100644 --- a/ui/src/plugins/dialog/Dialog.js +++ b/ui/src/plugins/dialog/Dialog.js @@ -1,5 +1,5 @@ import DialogPlugin from './component/DialogPluginComponent.js' -import globalDialog from '../../utils/private.global/global-dialog.js' +import globalDialog from '../../utils/private.dialog/create-dialog.js' export default { install ({ $q, parentApp }) { diff --git a/ui/src/plugins/dialog/Dialog.json b/ui/src/plugins/dialog/Dialog.json index 426cb0e66ba..5781c12a147 100644 --- a/ui/src/plugins/dialog/Dialog.json +++ b/ui/src/plugins/dialog/Dialog.json @@ -1,5 +1,5 @@ { - "mixins": [ "utils/private.global/global-dialog" ], + "mixins": [ "utils/private.dialog/create-dialog" ], "meta": { "docsUrl": "https://v2.quasar.dev/quasar-plugins/dialog" diff --git a/ui/src/plugins/loading-bar/LoadingBar.js b/ui/src/plugins/loading-bar/LoadingBar.js index 1a6204e5a0b..8dc46882719 100644 --- a/ui/src/plugins/loading-bar/LoadingBar.js +++ b/ui/src/plugins/loading-bar/LoadingBar.js @@ -5,7 +5,7 @@ import { createChildApp } from '../../install-quasar.js' import { createReactivePlugin } from '../../utils/private.create/create.js' import { noop } from '../../utils/event/event.js' -import { createGlobalNode } from '../../utils/private.global/global-nodes.js' +import { createGlobalNode } from '../../utils/private.config/nodes.js' import { isObject } from '../../utils/is/is.js' const barRef = ref(null) diff --git a/ui/src/plugins/loading/Loading.js b/ui/src/plugins/loading/Loading.js index d322f0a2fd6..bd5940f225f 100644 --- a/ui/src/plugins/loading/Loading.js +++ b/ui/src/plugins/loading/Loading.js @@ -5,7 +5,7 @@ import QSpinner from '../../components/spinner/QSpinner.js' import { createChildApp } from '../../install-quasar.js' import { createReactivePlugin } from '../../utils/private.create/create.js' -import { createGlobalNode, removeGlobalNode } from '../../utils/private.global/global-nodes.js' +import { createGlobalNode, removeGlobalNode } from '../../utils/private.config/nodes.js' import preventScroll from '../../utils/scroll/prevent-scroll.js' import { isObject } from '../../utils/is/is.js' diff --git a/ui/src/plugins/notify/Notify.js b/ui/src/plugins/notify/Notify.js index 8e8935f77bb..5396d7e2ed4 100644 --- a/ui/src/plugins/notify/Notify.js +++ b/ui/src/plugins/notify/Notify.js @@ -9,7 +9,7 @@ import { createChildApp } from '../../install-quasar.js' import { createComponent } from '../../utils/private.create/create.js' import { noop } from '../../utils/event/event.js' -import { createGlobalNode } from '../../utils/private.global/global-nodes.js' +import { createGlobalNode } from '../../utils/private.config/nodes.js' import { isObject } from '../../utils/is/is.js' let uid = 0 diff --git a/ui/src/utils/private.global/global-config.js b/ui/src/utils/private.config/instance-config.js similarity index 100% rename from ui/src/utils/private.global/global-config.js rename to ui/src/utils/private.config/instance-config.js diff --git a/ui/src/utils/private.global/global-config.test.js b/ui/src/utils/private.config/instance-config.test.js similarity index 95% rename from ui/src/utils/private.global/global-config.test.js rename to ui/src/utils/private.config/instance-config.test.js index 671a034115d..0624dfd4866 100644 --- a/ui/src/utils/private.global/global-config.test.js +++ b/ui/src/utils/private.config/instance-config.test.js @@ -1,7 +1,7 @@ import { describe, test, expect } from 'vitest' import { mount, config } from '@vue/test-utils' -import { globalConfig, globalConfigIsFrozen, freezeGlobalConfig } from './global-config.js' +import { globalConfig, globalConfigIsFrozen, freezeGlobalConfig } from './instance-config.js' // We override Quasar install so we have a custom $q.config const quasarVuePlugin = config.global.plugins.find(entry => entry.name === 'Quasar') @@ -12,7 +12,7 @@ function mountWithConfig (config) { mount({ template: '
' }) } -describe('[globalConfig API]', () => { +describe('[instanceConfig API]', () => { describe('[Variables]', () => { describe('[(variable)globalConfig]', () => { test('is defined correctly', () => { diff --git a/ui/src/utils/private.global/global-nodes.js b/ui/src/utils/private.config/nodes.js similarity index 95% rename from ui/src/utils/private.global/global-nodes.js rename to ui/src/utils/private.config/nodes.js index a3c99b21b84..7e49aeb1af4 100644 --- a/ui/src/utils/private.global/global-nodes.js +++ b/ui/src/utils/private.config/nodes.js @@ -1,4 +1,4 @@ -import { globalConfig } from '../private.global/global-config.js' +import { globalConfig } from '../private.config/instance-config.js' const nodesList = [] const portalTypeList = [] diff --git a/ui/src/utils/private.global/global-nodes.test.js b/ui/src/utils/private.config/nodes.test.js similarity index 96% rename from ui/src/utils/private.global/global-nodes.test.js rename to ui/src/utils/private.config/nodes.test.js index 67588177532..22bd96cd3fc 100644 --- a/ui/src/utils/private.global/global-nodes.test.js +++ b/ui/src/utils/private.config/nodes.test.js @@ -1,7 +1,7 @@ import { describe, test, expect, afterEach } from 'vitest' -import { createGlobalNode, removeGlobalNode, changeGlobalNodesTarget } from './global-nodes.js' -import { globalConfig } from './global-config.js' +import { createGlobalNode, removeGlobalNode, changeGlobalNodesTarget } from './nodes.js' +import { globalConfig } from './instance-config.js' let el = null @@ -14,7 +14,7 @@ afterEach(() => { } }) -describe('[globalNodes API]', () => { +describe('[nodes API]', () => { describe('[Functions]', () => { describe('[(function)createGlobalNode]', () => { test('createGlobalNode(id)', () => { diff --git a/ui/src/utils/private.global/global-dialog.js b/ui/src/utils/private.dialog/create-dialog.js similarity index 97% rename from ui/src/utils/private.global/global-dialog.js rename to ui/src/utils/private.dialog/create-dialog.js index 169e0cbeb1a..ff6ef516f10 100644 --- a/ui/src/utils/private.global/global-dialog.js +++ b/ui/src/utils/private.dialog/create-dialog.js @@ -1,7 +1,7 @@ import { h, ref, nextTick } from 'vue' import { createChildApp } from '../../install-quasar.js' -import { createGlobalNode, removeGlobalNode } from '../private.global/global-nodes.js' +import { createGlobalNode, removeGlobalNode } from '../private.config/nodes.js' const ssrAPI = { onOk: () => ssrAPI, diff --git a/ui/src/utils/private.global/global-dialog.json b/ui/src/utils/private.dialog/create-dialog.json similarity index 100% rename from ui/src/utils/private.global/global-dialog.json rename to ui/src/utils/private.dialog/create-dialog.json