@todesktop/shared 7.184.26 → 7.184.27

package/lib/desktopify2.d.ts

@@ -196,7 +196,7 @@ export interface DesktopifyAppWindow {
      */
     file?: string;
 }
-export interface DesktopifyApp2 {
+export interface DesktopifyApp2<Plugin = DesktopAppPlugin> {
     /**
      *  Used as appUserModelId on windows
      */
@@ -353,7 +353,7 @@ export interface DesktopifyApp2 {
     /**
      * An array of plugin modules. Can work with semver specificity
      */
-    plugins?: (DesktopAppPlugin | string)[];
+    plugins?: (Plugin | string)[];
     /**
      * The app's windows
      */
@@ -413,12 +413,12 @@ export interface DesktopifyApp2 {
      */
     shouldProtectContent?: boolean;
 }
-export interface IApp2 extends BaseApp {
-    desktopApp: DesktopifyApp2;
+export interface IApp2<Plugin = DesktopAppPlugin> extends BaseApp {
+    desktopApp: DesktopifyApp2<Plugin>;
     desktopAppOverrides?: {
-        linux?: Partial<DesktopifyApp2>;
-        mac?: Partial<DesktopifyApp2>;
-        windows?: Partial<DesktopifyApp2>;
+        linux?: Partial<DesktopifyApp2<Plugin>>;
+        mac?: Partial<DesktopifyApp2<Plugin>>;
+        windows?: Partial<DesktopifyApp2<Plugin>>;
     };
 }
 export {};

package/lib/validations.d.ts

@@ -1,5 +1,6 @@
 import * as yup from 'yup';
-import { DesktopifyApp2 } from '.';
+import { DesktopifyApp2 } from './desktopify2';
+import { DesktopAppPlugin } from './plugin';
 export declare const appTitleValidation: yup.StringSchema;
 export declare const forceVersionValidation: yup.StringSchema;
 export declare const iconValidation: yup.StringSchema;
@@ -50,4 +51,4 @@ export declare const appConfigValidation: yup.ObjectSchema<{
         publishedVersions: any;
     };
 }>;
-export declare const shouldMinimizeToTrayIsActive: (desktopApp: DesktopifyApp2) => boolean;
+export declare const shouldMinimizeToTrayIsActive: <Plugin_1 = DesktopAppPlugin>(desktopApp: DesktopifyApp2<Plugin_1>) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todesktop/shared",
-  "version": "7.184.26",
+  "version": "7.184.27",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/src/desktopify2.ts

@@ -322,7 +322,7 @@ export interface DesktopifyAppWindow {
 }
 // TODO: Look into hasMinHeight, etc
 
-export interface DesktopifyApp2 {
+export interface DesktopifyApp2<Plugin = DesktopAppPlugin> {
   /**
    *  Used as appUserModelId on windows
    */
@@ -481,7 +481,7 @@ export interface DesktopifyApp2 {
   /**
    * An array of plugin modules. Can work with semver specificity
    */
-  plugins?: (DesktopAppPlugin | string)[];
+  plugins?: (Plugin | string)[];
   /**
    * The app's windows
    */
@@ -545,13 +545,13 @@ export interface DesktopifyApp2 {
   shouldProtectContent?: boolean;
 }
 
-export interface IApp2 extends BaseApp {
+export interface IApp2<Plugin = DesktopAppPlugin> extends BaseApp {
   // Be careful when coercing to `IApp2` that we always check for `desktopApp` first
-  desktopApp: DesktopifyApp2;
+  desktopApp: DesktopifyApp2<Plugin>;
 
   desktopAppOverrides?: {
-    linux?: Partial<DesktopifyApp2>;
-    mac?: Partial<DesktopifyApp2>;
-    windows?: Partial<DesktopifyApp2>;
+    linux?: Partial<DesktopifyApp2<Plugin>>;
+    mac?: Partial<DesktopifyApp2<Plugin>>;
+    windows?: Partial<DesktopifyApp2<Plugin>>;
   };
 }

package/src/validations.ts

@@ -1,7 +1,8 @@
 import * as yup from 'yup';
 import * as semver from 'semver';
 import * as isRegex from 'is-regex';
-import { DesktopifyApp2 } from '.';
+import { DesktopifyApp2 } from './desktopify2';
+import { DesktopAppPlugin } from './plugin';
 export const appTitleValidation = yup
   .string()
   .label('App title')
@@ -174,7 +175,9 @@ export const appConfigValidation = yup.object({
     .required(),
 });
 
-export const shouldMinimizeToTrayIsActive = (desktopApp: DesktopifyApp2) => {
+export const shouldMinimizeToTrayIsActive = <Plugin = DesktopAppPlugin>(
+  desktopApp: DesktopifyApp2<Plugin>
+) => {
   return desktopApp.trays.some(
     (t) =>
       t.leftClick.role === 'toggleMenu' || t.rightClick.role === 'toggleMenu'