quasar 2.21.1 → 2.21.2

package/dist/types/feature-flag.d.ts

@@ -50,6 +50,13 @@ export type IsFeatureEnabled<
 export type HasStore<T, U = {}> = IsFeatureEnabled<"store", T, U>;
 
 export type HasSsr<T, U = {}> = IsFeatureEnabled<"ssr", T, U>;
+export type HasSsg<T, U = {}> = IsFeatureEnabled<"ssg", T, U>;
+export type HasSsrOrSsg<T, U = {}> = true extends QuasarFeatureFlags[
+  | "ssr"
+  | "ssg"]
+  ? T
+  : U;
+
 export type HasPwa<T, U = {}> = IsFeatureEnabled<"pwa", T, U>;
 export type HasCapacitor<T, U = {}> = IsFeatureEnabled<"capacitor", T, U>;
 export type HasCordova<T, U = {}> = IsFeatureEnabled<"cordova", T, U>;

package/dist/types/globals.d.ts

@@ -1,5 +1,5 @@
 import { QuasarIconSet } from "./icon-set";
-import { HasBex, HasCapacitor, HasCordova, HasSsr } from "./feature-flag";
+import { HasBex, HasCapacitor, HasCordova, HasSsrOrSsg } from "./feature-flag";
 import { QuasarLanguage } from "./lang";
 
 // We cannot reference directly Capacitor/Cordova types
@@ -27,7 +27,7 @@ export interface GlobalQuasarLanguage extends QuasarLanguageInstance {
 export interface GlobalQuasarLanguageSingleton
   extends
     Pick<GlobalQuasarLanguage, "isoName" | "nativeName" | "getLocale">,
-    HasSsr<
+    HasSsrOrSsg<
       { set(lang: QuasarLanguage, ssrContext: any): void },
       { set(lang: QuasarLanguage): void }
     > {
@@ -41,7 +41,7 @@ export interface GlobalQuasarIconSet extends QuasarIconSet {
 export interface GlobalQuasarIconSetSingleton
   extends
     QuasarIconSet,
-    HasSsr<
+    HasSsrOrSsg<
       // QSsrContext interface depends on q/app, making it available into UI package adds complexity without any real benefit
       { set(iconSet: QuasarIconSet, ssrContext: any): void },
       { set(iconSet: QuasarIconSet): void }
@@ -72,7 +72,7 @@ export interface QVueGlobals
     HasCapacitor<{ capacitor: any }>,
     HasBex<{ bex: GlobalsTypesHolder["bex"] }>,
     HasCordova<{ cordova: GlobalsTypesHolder["cordova"] }>,
-    HasSsr<
+    HasSsrOrSsg<
       { iconMapFn?: GlobalQuasarIconMapFn; onSSRHydrated?: () => void },
       { iconMapFn: GlobalQuasarIconMapFn }
     >,