@todesktop/shared 7.188.65 → 7.188.67

package/lib/plugin.d.ts

@@ -1,4 +1,4 @@
-declare type AjvJSONSchemaType = object;
+type AjvJSONSchemaType = object;
 export interface DesktopAppPlugin {
     /**
      * Configuration gathered from the todesktop plugin.
@@ -11,28 +11,28 @@ export interface DesktopAppPlugin {
      */
     package: string;
 }
-export declare type ToDesktopPlugin = {
+export type ToDesktopPlugin = {
     namespace: string;
     version: number;
     main?: string;
     preload?: string;
     preferences?: PluginPreferences;
 };
-export declare type PluginPreferences = {
+export type PluginPreferences = {
     [id: string]: PluginPreference;
 };
-export declare type PluginPreference = NumberSpec | TextSpec | CheckboxSpec;
-export declare type TextSpec = PreferenceSpec<'text', {
+export type PluginPreference = NumberSpec | TextSpec | CheckboxSpec;
+export type TextSpec = PreferenceSpec<'text', {
     validator?: AjvJSONSchemaType;
     value?: string;
     placeholder?: string;
 }>;
-export declare type NumberSpec = PreferenceSpec<'number', {
+export type NumberSpec = PreferenceSpec<'number', {
     validator?: AjvJSONSchemaType;
     value?: number;
     placeholder?: number;
 }>;
-export declare type CheckboxSpec = PreferenceSpec<'checkbox', {
+export type CheckboxSpec = PreferenceSpec<'checkbox', {
     validator?: AjvJSONSchemaType;
     value?: boolean;
 }>;

package/lib/toDesktop.d.ts

@@ -1,6 +1,6 @@
 import { BaseApp, Schemable } from './base';
 import { IAppBuilderLib } from './desktopify';
-export declare type IUploadFileStatus = 'error' | 'success' | 'done' | 'uploading' | 'removed';
+export type IUploadFileStatus = 'error' | 'success' | 'done' | 'uploading' | 'removed';
 export interface IUploadFile {
     uid: string;
     size: number;
@@ -25,7 +25,7 @@ export interface IAppIcon {
     appId: string;
     icon: IHueIcon;
 }
-export declare type IAppIcons = IAppIcon[];
+export type IAppIcons = IAppIcon[];
 export interface IAppWindowOptions {
     startInFullscreenMode: boolean;
     isResizable: boolean;

package/lib/translation.d.ts

@@ -1,2 +1,2 @@
-export declare type ValidTranslationKeys = 'updateNotification.title' | 'updateNotification.body';
-export declare type ValidTranslationLanguages = 'default';
+export type ValidTranslationKeys = 'updateNotification.title' | 'updateNotification.body';
+export type ValidTranslationLanguages = 'default';

package/lib/validations.d.ts

@@ -5,9 +5,9 @@ export declare const appTitleValidation: yup.StringSchema;
 export declare const forceVersionValidation: yup.StringSchema;
 export declare const iconValidation: yup.StringSchema;
 export declare const urlValidation: yup.StringSchema;
-export declare const urlValidationForm: yup.ObjectSchema<yup.Shape<object, {
+export declare const urlValidationForm: yup.ObjectSchema<{
     url: string;
-}>>;
+}>;
 export declare const heightValidation: yup.NumberSchema;
 export declare const widthValidation: yup.NumberSchema;
 export declare const internalAppRegexValidation: yup.StringSchema;
@@ -51,4 +51,4 @@ export declare const appConfigValidation: yup.ObjectSchema<{
         publishedVersions: any;
     };
 }>;
-export declare const shouldMinimizeToTrayIsActive: <Plugin_1 = DesktopAppPlugin>(desktopApp: DesktopifyApp2<Plugin_1>) => boolean;
+export declare const shouldMinimizeToTrayIsActive: <Plugin = DesktopAppPlugin>(desktopApp: DesktopifyApp2<Plugin>) => boolean;

package/lib/validations.js

@@ -133,6 +133,7 @@ exports.appConfigValidation = yup.object({
     })
         .required(),
 });
-exports.shouldMinimizeToTrayIsActive = (desktopApp) => {
+const shouldMinimizeToTrayIsActive = (desktopApp) => {
     return desktopApp.trays.some((t) => t.leftClick.role === 'toggleMenu' || t.rightClick.role === 'toggleMenu');
 };
+exports.shouldMinimizeToTrayIsActive = shouldMinimizeToTrayIsActive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todesktop/shared",
-  "version": "7.188.65",
+  "version": "7.188.67",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -26,14 +26,17 @@
     "yup": "^0.26.10"
   },
   "devDependencies": {
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.9.1",
     "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
     "app-builder-lib": "^22.10.4",
-    "eslint": "^8.43.0",
+    "eslint": "^9.9.1",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
+    "globals": "^15.9.0",
     "prettier": "^2.8.8",
-    "typescript": "^3.9.10"
+    "typescript": "^5.5.4"
   }
 }

package/src/base.ts

@@ -268,12 +268,7 @@ export interface BaseApp extends Schemable {
   // this property is dynamically resolved at queueBuild in cloud functions
   parentApp?: BaseApp;
   parent?: { id: string; relationshipToParent: string } | null;
-  subscription?: {
-    status: string;
-    subscriptionId: string;
-    itemId: string;
-    planId: string;
-  };
+  subscription?: Subscription;
 
   // artifacts
   shouldCreate32BitWindowsArtifacts?: boolean;
@@ -304,3 +299,14 @@ export interface BaseApp extends Schemable {
     shouldPinToVersion?: boolean;
   };
 }
+
+export type Subscription = {
+  status: string;
+  subscriptionId: string;
+  itemId: string;
+  planId: string;
+
+  // todo: remove optional qualifier once we complete migration
+  productId?: string;
+  priceId?: string;
+};