From 792f02f9b535593d1e76600de533f4c6865a5113 Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Mon, 13 May 2024 22:57:53 +0100
Subject: [PATCH] Theming API: Update `Theme` export

---
 components/lib/base/style/BaseStyle.js         | 2 +-
 components/lib/basecomponent/BaseComponent.vue | 2 +-
 components/lib/basedirective/BaseDirective.js  | 2 +-
 components/lib/config/PrimeVue.js              | 2 +-
 components/lib/themes/actions/updatePreset.js  | 2 +-
 components/lib/themes/actions/usePreset.js     | 2 +-
 components/lib/themes/helpers/dt.js            | 3 +--
 components/lib/themes/helpers/t.js             | 3 +--
 components/lib/themes/helpers/toVariables.js   | 2 +-
 components/lib/themes/index.js                 | 2 +-
 modules/nuxt-primevue/module.js                | 2 +-
 11 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/components/lib/base/style/BaseStyle.js b/components/lib/base/style/BaseStyle.js
index 09ede7df8..590979d73 100644
--- a/components/lib/base/style/BaseStyle.js
+++ b/components/lib/base/style/BaseStyle.js
@@ -1,4 +1,4 @@
-import Theme, { dt } from 'primevue/themes';
+import { Theme, dt } from 'primevue/themes';
 import { useStyle } from 'primevue/usestyle';
 import { ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index 3b021489e..a31fedd9c 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -1,7 +1,7 @@
 <script>
 import Base from 'primevue/base';
 import BaseStyle from 'primevue/base/style';
-import Theme, { ThemeService } from 'primevue/themes';
+import { Theme, ThemeService } from 'primevue/themes';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import { mergeProps } from 'vue';
 import BaseComponentStyle from './style/BaseComponentStyle';
diff --git a/components/lib/basedirective/BaseDirective.js b/components/lib/basedirective/BaseDirective.js
index a3f91a1c9..f80f07885 100644
--- a/components/lib/basedirective/BaseDirective.js
+++ b/components/lib/basedirective/BaseDirective.js
@@ -1,7 +1,7 @@
 import Base from 'primevue/base';
 import BaseStyle from 'primevue/base/style';
 import PrimeVueService from 'primevue/service';
-import Theme, { ThemeService } from 'primevue/themes';
+import { Theme, ThemeService } from 'primevue/themes';
 import { ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import { mergeProps } from 'vue';
 
diff --git a/components/lib/config/PrimeVue.js b/components/lib/config/PrimeVue.js
index 937c651b1..b9b50a06e 100644
--- a/components/lib/config/PrimeVue.js
+++ b/components/lib/config/PrimeVue.js
@@ -1,6 +1,6 @@
 import { FilterMatchMode } from 'primevue/api';
 import PrimeVueService from 'primevue/service';
-import Theme, { ThemeService } from 'primevue/themes';
+import { Theme, ThemeService } from 'primevue/themes';
 import { inject, reactive, ref, watch } from 'vue';
 
 export const defaultOptions = {
diff --git a/components/lib/themes/actions/updatePreset.js b/components/lib/themes/actions/updatePreset.js
index ab8490cb9..b4b328d2e 100644
--- a/components/lib/themes/actions/updatePreset.js
+++ b/components/lib/themes/actions/updatePreset.js
@@ -1,4 +1,4 @@
-import Theme, { SharedUtils } from 'primevue/themes';
+import { SharedUtils, Theme } from 'primevue/themes';
 
 export default (...presets) => {
     const newPreset = SharedUtils.object.mergeKeys(Theme.getPreset(), ...presets);
diff --git a/components/lib/themes/actions/usePreset.js b/components/lib/themes/actions/usePreset.js
index cb22d6e61..4ac4ef676 100644
--- a/components/lib/themes/actions/usePreset.js
+++ b/components/lib/themes/actions/usePreset.js
@@ -1,4 +1,4 @@
-import Theme from 'primevue/themes';
+import { Theme } from 'primevue/themes';
 
 export default (...presets) => {
     const newPreset = SharedUtils.object.mergeKeys(...presets);
diff --git a/components/lib/themes/helpers/dt.js b/components/lib/themes/helpers/dt.js
index 393c22b61..1e5d1eebc 100644
--- a/components/lib/themes/helpers/dt.js
+++ b/components/lib/themes/helpers/dt.js
@@ -1,5 +1,4 @@
-import { SharedUtils } from 'primevue/themes';
-import Theme from 'primevue/themes/config';
+import { SharedUtils, Theme } from 'primevue/themes';
 
 export const $dt = (tokenPath) => {
     const theme = Theme.getTheme();
diff --git a/components/lib/themes/helpers/t.js b/components/lib/themes/helpers/t.js
index 175a2761b..1cad63caa 100644
--- a/components/lib/themes/helpers/t.js
+++ b/components/lib/themes/helpers/t.js
@@ -1,5 +1,4 @@
-import { SharedUtils } from 'primevue/themes';
-import Theme from 'primevue/themes/config';
+import { SharedUtils, Theme } from 'primevue/themes';
 
 export const $t = (theme = {}) => {
     let { preset: _preset, options: _options } = theme;
diff --git a/components/lib/themes/helpers/toVariables.js b/components/lib/themes/helpers/toVariables.js
index 5c683f164..268ce3490 100644
--- a/components/lib/themes/helpers/toVariables.js
+++ b/components/lib/themes/helpers/toVariables.js
@@ -1,4 +1,4 @@
-import Theme, { SharedUtils } from 'primevue/themes';
+import { SharedUtils, Theme } from 'primevue/themes';
 
 export default function (theme, options = {}) {
     const VARIABLE = Theme.defaults.variable;
diff --git a/components/lib/themes/index.js b/components/lib/themes/index.js
index a39c3063b..2764c409b 100644
--- a/components/lib/themes/index.js
+++ b/components/lib/themes/index.js
@@ -1,5 +1,5 @@
 export * from 'primevue/themes/actions';
-export { default } from 'primevue/themes/config';
+export { default as Theme } from 'primevue/themes/config';
 export * from 'primevue/themes/helpers';
 export { default as ThemeService } from 'primevue/themes/service';
 export * from 'primevue/themes/utils';
diff --git a/modules/nuxt-primevue/module.js b/modules/nuxt-primevue/module.js
index cc0ada2ce..d0f3c4e74 100644
--- a/modules/nuxt-primevue/module.js
+++ b/modules/nuxt-primevue/module.js
@@ -55,7 +55,7 @@ export default defineNuxtModule({
 ${registered.styles.map((style) => `import ${style.as} from '${style.from}';`).join('\n')}
 ${
     hasTheme
-        ? `import Theme from 'primevue/themes';
+        ? `import { Theme } from 'primevue/themes';
 import ${importTheme.as} from '${importTheme.from}';\n`
         : ''
 }