From 6e28de62f2d7ec2f3c173b6068f80addd013b3d3 Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Fri, 4 Oct 2024 14:12:46 +0100
Subject: [PATCH] Fixed #6524 - Add extend keyword to extend css variables to
 presets

---
 packages/core/src/basecomponent/BaseComponent.vue |  5 +++--
 packages/core/src/basedirective/BaseDirective.js  |  7 ++++---
 packages/core/src/config/PrimeVue.js              |  5 ++++-
 packages/nuxt-module/src/module.ts                | 11 ++++++++---
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/basecomponent/BaseComponent.vue b/packages/core/src/basecomponent/BaseComponent.vue
index 6e1b6e92e..70e56ad79 100644
--- a/packages/core/src/basecomponent/BaseComponent.vue
+++ b/packages/core/src/basecomponent/BaseComponent.vue
@@ -156,14 +156,15 @@ export default {
             isNotEmpty(globalCSS) && BaseStyle.load(globalCSS, { name: 'global', ...this.$styleOptions });
         },
         _loadThemeStyles() {
-            if (this.isUnstyled) return;
+            if (this.isUnstyled || this.$theme === 'none') return;
 
             // common
             if (!Theme.isStyleNameLoaded('common')) {
-                const { primitive, semantic, style } = this.$style?.getCommonTheme?.() || {};
+                const { primitive, semantic, global, style } = this.$style?.getCommonTheme?.() || {};
 
                 BaseStyle.load(primitive?.css, { name: 'primitive-variables', ...this.$styleOptions });
                 BaseStyle.load(semantic?.css, { name: 'semantic-variables', ...this.$styleOptions });
+                BaseStyle.load(global?.css, { name: 'global-variables', ...this.$styleOptions });
                 BaseStyle.loadTheme({ name: 'global-style', ...this.$styleOptions }, style);
 
                 Theme.setLoadedStyleName('common');
diff --git a/packages/core/src/basedirective/BaseDirective.js b/packages/core/src/basedirective/BaseDirective.js
index b1650239d..28b9eb4f3 100644
--- a/packages/core/src/basedirective/BaseDirective.js
+++ b/packages/core/src/basedirective/BaseDirective.js
@@ -81,20 +81,21 @@ const BaseDirective = {
     _loadCoreStyles(instance = {}, useStyleOptions) {
         if (!Base.isStyleNameLoaded(instance.$style?.name) && instance.$style?.name) {
             BaseStyle.loadCSS(useStyleOptions);
-            instance.isUnstyled() && instance.$style?.loadCSS(useStyleOptions);
+            instance.$style?.loadCSS(useStyleOptions);
 
             Base.setLoadedStyleName(instance.$style.name);
         }
     },
     _loadThemeStyles: (instance = {}, useStyleOptions) => {
-        if (instance?.isUnstyled()) return;
+        if (instance?.isUnstyled() || instance?.theme?.() === 'none') return;
 
         // common
         if (!Theme.isStyleNameLoaded('common')) {
-            const { primitive, semantic, style } = instance.$style?.getCommonTheme?.() || {};
+            const { primitive, semantic, global, style } = instance.$style?.getCommonTheme?.() || {};
 
             BaseStyle.load(primitive?.css, { name: 'primitive-variables', ...useStyleOptions });
             BaseStyle.load(semantic?.css, { name: 'semantic-variables', ...useStyleOptions });
+            BaseStyle.load(global?.css, { name: 'global-variables', ...useStyleOptions });
             BaseStyle.loadTheme({ name: 'global-style', ...useStyleOptions }, style);
 
             Theme.setLoadedStyleName('common');
diff --git a/packages/core/src/config/PrimeVue.js b/packages/core/src/config/PrimeVue.js
index ff3ba7ac4..84e5381bf 100644
--- a/packages/core/src/config/PrimeVue.js
+++ b/packages/core/src/config/PrimeVue.js
@@ -193,13 +193,16 @@ export function setupConfig(app, PrimeVue) {
 
     /*** Methods and Services ***/
     const loadCommonTheme = () => {
+        if (PrimeVue.config?.theme === 'none') return;
+
         // common
         if (!Theme.isStyleNameLoaded('common')) {
-            const { primitive, semantic, style } = BaseStyle.getCommonTheme?.() || {};
+            const { primitive, semantic, global, style } = BaseStyle.getCommonTheme?.() || {};
             const styleOptions = { nonce: PrimeVue.config?.csp?.nonce };
 
             BaseStyle.load(primitive?.css, { name: 'primitive-variables', ...styleOptions });
             BaseStyle.load(semantic?.css, { name: 'semantic-variables', ...styleOptions });
+            BaseStyle.load(global?.css, { name: 'global-variables', ...styleOptions });
             BaseStyle.loadTheme({ name: 'global-style', ...styleOptions }, style);
 
             Theme.setLoadedStyleName('common');
diff --git a/packages/nuxt-module/src/module.ts b/packages/nuxt-module/src/module.ts
index 15d6fe0aa..901b1dab8 100644
--- a/packages/nuxt-module/src/module.ts
+++ b/packages/nuxt-module/src/module.ts
@@ -49,7 +49,7 @@ export default defineNuxtModule<ModuleOptions>({
         const resolver = createResolver(import.meta.url);
         const registered = register(moduleOptions);
         const { autoImport, importPT, importTheme, options, loadStyles } = moduleOptions;
-        const hasTheme = (importTheme || options?.theme) && !options?.unstyled;
+        const hasTheme = options?.theme !== 'none' && (importTheme || options?.theme) && !options?.unstyled;
 
         nuxt.options.runtimeConfig.public.primevue = {
             ...moduleOptions,
@@ -114,10 +114,15 @@ const styles = [
 
 ${hasTheme ? `Theme.setTheme(${importTheme?.as} || options?.theme)` : ''}
 
-const themes = [
+const themes = ${
+                options?.theme === 'none'
+                    ? `[]`
+                    : `
+[
     ${`${uniqueRegisteredStyles?.[0].as} && ${uniqueRegisteredStyles?.[0].as}.getCommonThemeStyleSheet ? ${uniqueRegisteredStyles?.[0].as}.getCommonThemeStyleSheet(undefined, styleProps) : ''`},
     ${uniqueRegisteredStyles?.map((item: MetaType) => `${item.as} && ${item.as}.getThemeStyleSheet ? ${item.as}.getThemeStyleSheet(undefined, styleProps) : ''`).join(',')}
-].join('');
+].join('');`
+            }
 
 export { styles, stylesToTop, themes };
 `;