@forge/manifest 2.6.0-next.13 → 2.6.0-next.17

package/out/schema/manifest.d.ts

@@ -124,6 +124,10 @@ export interface Connect {
    * A key for the remote, which other modules can refer to. Must be unique within the manifest and have a maximum of 23 characters.
    */
   remote?: string;
+  /**
+   * The type of authentication used to communicate with tenant APIs
+   */
+  authentication?: 'jwt' | 'oauth2';
 }
 export interface ConnectModules {
   lifecycle?: [
@@ -298,6 +302,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -309,6 +316,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -317,6 +327,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -328,6 +341,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -338,6 +354,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -349,6 +368,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -357,6 +379,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -368,6 +393,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -450,6 +478,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -461,6 +492,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -469,6 +503,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -480,6 +517,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -492,6 +532,9 @@ export interface Modules {
           icon?: string;
           route: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -504,6 +547,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -514,6 +560,9 @@ export interface Modules {
           icon?: string;
           route: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -526,6 +575,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -536,6 +588,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -546,6 +601,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -554,6 +612,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -564,6 +625,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -574,6 +638,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -584,6 +651,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -592,6 +662,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -602,6 +675,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -614,6 +690,9 @@ export interface Modules {
           icon?: string;
           route: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
         }
       | {
@@ -625,6 +704,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
         }
     ),
@@ -634,6 +716,9 @@ export interface Modules {
           icon?: string;
           route: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
         }
       | {
@@ -645,6 +730,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
         }
     )[]
@@ -1283,6 +1371,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1294,12 +1383,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1310,6 +1401,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1318,7 +1410,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1329,6 +1423,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     ),
     ...(
@@ -1338,6 +1433,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1349,12 +1445,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1365,6 +1463,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1373,7 +1472,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1384,6 +1485,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     )[]
   ];
@@ -1395,6 +1497,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1406,12 +1509,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1422,6 +1527,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1430,7 +1536,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1441,6 +1549,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     ),
     ...(
@@ -1450,6 +1559,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1461,12 +1571,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1477,6 +1589,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1485,7 +1598,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1496,6 +1611,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     )[]
   ];
@@ -1507,6 +1623,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1518,12 +1635,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1534,6 +1653,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1542,7 +1662,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1553,6 +1675,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     ),
     ...(
@@ -1562,6 +1685,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1573,12 +1697,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1589,6 +1715,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1597,7 +1724,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1608,6 +1737,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     )[]
   ];
@@ -1619,6 +1749,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1630,12 +1761,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1646,6 +1779,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1654,7 +1788,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1665,6 +1801,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     ),
     ...(
@@ -1674,6 +1811,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           resource: string;
@@ -1685,12 +1823,14 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           pages: {
             title: string;
             route: string;
             icon?: string;
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1701,6 +1841,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
       | {
           sections: {
@@ -1709,7 +1850,9 @@ export interface Modules {
               title: string;
               route: string;
               icon?: string;
+              [k: string]: unknown;
             }[];
+            [k: string]: unknown;
           }[];
           resource: string;
           resourceUploadId?: string;
@@ -1720,6 +1863,7 @@ export interface Modules {
           icon?: string;
           layout?: 'basic' | 'native';
           key: ModuleKeySchema;
+          [k: string]: unknown;
         }
     )[]
   ];
@@ -2202,7 +2346,7 @@ export interface Modules {
         | 'TIME_TRACKING'
         | 'other'
         | 'OTHER';
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -2224,7 +2368,7 @@ export interface Modules {
         | 'TIME_TRACKING'
         | 'other'
         | 'OTHER';
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -2332,7 +2476,7 @@ export interface Modules {
       name?: I18NProperty20;
       weight?: number;
       iconUrl?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       url?: string;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2341,7 +2485,7 @@ export interface Modules {
       name?: I18NProperty20;
       weight?: number;
       iconUrl?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       url?: string;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2352,7 +2496,7 @@ export interface Modules {
       name?: I18NProperty21;
       weight?: number;
       description?: I18NProperty22;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2364,7 +2508,7 @@ export interface Modules {
       name?: I18NProperty21;
       weight?: number;
       description?: I18NProperty22;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2377,7 +2521,7 @@ export interface Modules {
     {
       name?: I18NProperty23;
       description?: I18NProperty24;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       url?: string;
       configurable?: boolean;
       thumbnailUrl?: string;
@@ -2387,7 +2531,7 @@ export interface Modules {
     ...{
       name?: I18NProperty23;
       description?: I18NProperty24;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       url?: string;
       configurable?: boolean;
       thumbnailUrl?: string;
@@ -2446,7 +2590,7 @@ export interface Modules {
       name?: I18NProperty30;
       conditions?: (SingleCondition | CompositeCondition)[];
       target?: IssuePageTargetWebPanel;
-      contentPresentConditions?: (CompositeCondition | SingleCondition)[];
+      contentPresentConditions?: (SingleCondition | CompositeCondition)[];
       jiraNativeAppsEnabled?: boolean;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2457,7 +2601,7 @@ export interface Modules {
       name?: I18NProperty30;
       conditions?: (SingleCondition | CompositeCondition)[];
       target?: IssuePageTargetWebPanel;
-      contentPresentConditions?: (CompositeCondition | SingleCondition)[];
+      contentPresentConditions?: (SingleCondition | CompositeCondition)[];
       jiraNativeAppsEnabled?: boolean;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2489,7 +2633,7 @@ export interface Modules {
     {
       name?: I18NProperty33;
       weight?: number;
-      conditions?: (SingleCondition2 | CompositeCondition2)[];
+      conditions?: (CompositeCondition2 | SingleCondition2)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2500,7 +2644,7 @@ export interface Modules {
     ...{
       name?: I18NProperty33;
       weight?: number;
-      conditions?: (SingleCondition2 | CompositeCondition2)[];
+      conditions?: (CompositeCondition2 | SingleCondition2)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2581,7 +2725,7 @@ export interface Modules {
     {
       name?: I18NProperty38;
       weight?: number;
-      conditions?: (SingleCondition3 | CompositeCondition4)[];
+      conditions?: (CompositeCondition4 | SingleCondition3)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2592,7 +2736,7 @@ export interface Modules {
     ...{
       name?: I18NProperty38;
       weight?: number;
-      conditions?: (SingleCondition3 | CompositeCondition4)[];
+      conditions?: (CompositeCondition4 | SingleCondition3)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2686,7 +2830,7 @@ export interface Modules {
       name?: I18NProperty44;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2698,7 +2842,7 @@ export interface Modules {
       name?: I18NProperty44;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2823,7 +2967,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2838,7 +2982,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2886,7 +3030,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -2896,7 +3040,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -2939,7 +3083,7 @@ export interface Modules {
       name?: I18NProperty55;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2951,7 +3095,7 @@ export interface Modules {
       name?: I18NProperty55;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3004,7 +3148,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (CompositeCondition6 | SingleCondition4)[];
+      conditions?: (SingleCondition4 | CompositeCondition6)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -3022,7 +3166,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (CompositeCondition6 | SingleCondition4)[];
+      conditions?: (SingleCondition4 | CompositeCondition6)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -3035,7 +3179,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3050,7 +3194,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3100,7 +3244,7 @@ export interface Modules {
       name?: I18NProperty63;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition7 | SingleCondition5)[];
+      conditions?: (SingleCondition5 | CompositeCondition7)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3112,7 +3256,7 @@ export interface Modules {
       name?: I18NProperty63;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition7 | SingleCondition5)[];
+      conditions?: (SingleCondition5 | CompositeCondition7)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3921,10 +4065,47 @@ export interface Icon3 {
  *
  */
 export interface WebItemTarget {
-  options?: DialogOptions | DialogModuleOptions | InlineDialogOptions;
+  options?: InlineDialogOptions | DialogOptions | DialogModuleOptions;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Options for an inline dialog target
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "inlinedialog",
+ *         "options": {
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface InlineDialogOptions {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -4050,43 +4231,6 @@ export interface DialogModuleOptions {
   key: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Options for an inline dialog target
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "inlinedialog",
- *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface InlineDialogOptions {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -5085,37 +5229,6 @@ export interface I18NProperty33 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition2 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -5194,10 +5307,41 @@ export interface CompositeCondition2 {
  *
  */
 export interface CompositeCondition3 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition2 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -5390,37 +5534,6 @@ export interface I18NProperty38 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition3 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -5499,10 +5612,41 @@ export interface CompositeCondition4 {
  *
  */
 export interface CompositeCondition5 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition3 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6251,10 +6395,37 @@ export interface Icon10 {
  *
  */
 export interface WebItemTarget1 {
-  options?: DialogOptions2 | DialogModuleOptions1 | InlineDialogOptions1;
+  options?: DialogModuleOptions1 | DialogOptions2 | InlineDialogOptions1;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "dialogmodule",
+ *         "options": {
+ *           "key": "dialog-module-key"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface DialogModuleOptions1 {
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6353,33 +6524,6 @@ export interface I18NProperty58 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "dialogmodule",
- *         "options": {
- *           "key": "dialog-module-key"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface DialogModuleOptions1 {
-  key: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6441,6 +6585,37 @@ export interface I18NProperty59 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition4 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6482,37 +6657,6 @@ export interface CompositeCondition6 {
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition4 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6867,6 +7011,37 @@ export interface I18NProperty63 {
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Single Conditions are either provided by the host application. See the complete documentation of
+ *  [Conditions](../../conditions/) for more information.
+ *
+ *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
+ *  This is useful where you want to show the section if a certain condition is not satisfied.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
+ *     }
+ *
+ *
+ *
+ */
+export interface SingleCondition5 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -6908,37 +7083,6 @@ export interface CompositeCondition7 {
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
-/**
- *
- *
- * Single Conditions are either provided by the host application. See the complete documentation of
- *  [Conditions](../../conditions/) for more information.
- *
- *  To invert a condition, add the attribute ``invert="true"`` to the condition element.
- *  This is useful where you want to show the section if a certain condition is not satisfied.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "condition": "user_is_logged_in",
- *       "invert": false
- *     }
- *
- *
- *
- */
-export interface SingleCondition5 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -8312,137 +8456,57 @@ export interface Icon16 {
  *
  *
  */
-export interface I18NProperty74 {
-  value: string;
-  i18n?: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defining a Macro Property panel allows you to add a hidden iframe to your macro's
- *  property panel. The iframe is loaded as soon as the property panel is opened.
- *
- *  In order to persist custom data using your property panel, use the Javascript
- *  <a href="../../jsapi/confluence/">Confluence API</a>.
- *  For example:
- *
- *     AP.require(["confluence"], function (confluence) {
- *         var macroParams = {
- *             myParameter: value
- *         };
- *         confluence.saveMacro(macroParams);
- *     });
- *
- *  In order to retrieve the custom data again when the property panel is opened, use `confluence.getMacroData` (see
- *  <a href="../../jsapi/confluence/">Confluence API</a>):
- *
- *     AP.require("confluence", function (confluence) {
- *         var macroData = confluence.getMacroData(function(macroParams) {
- *             doSomethingWith(macroParams.myParameter);
- *         });
- *     });
- *
- *  Dialogs may also be created. Use `dialog.create` (see
- *  <a href="../../jsapi/dialog/">Dialog API</a>):
- *
- *     AP.require('dialog', function(dialog) {
- *         dialog.create({
- *             key: 'my-module-key',
- *             width: '500px',
- *             height: '200px',
- *             chrome: true
- *         }).on("close", callbackFunc);
- *     });
- *
- *
- */
-export interface MacroPropertyPanel {
-  controls?: (TextControl | ButtonControl | ToggleGroup | ControlGroup)[];
-  cacheable?: boolean;
-  url: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a text field which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "button",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-control-0"
- *     }
- *
- *
- *
- */
-export interface TextControl {
-  macroParameter: string;
-  type: 'text' | 'TEXT';
-  key: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a button which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "button",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-control-0"
- *     }
- *
- *
- *
- */
-export interface ButtonControl {
-  label: I18NProperty75;
-  type: 'button' | 'BUTTON';
-  key: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
- *  and value in multiple places if you like, but identical keys must have identical values.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "value": "My text"
- *     }
- *
- *
- *
- */
-export interface I18NProperty75 {
+export interface I18NProperty74 {
   value: string;
   i18n?: string;
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Defining a Macro Property panel allows you to add a hidden iframe to your macro's
+ *  property panel. The iframe is loaded as soon as the property panel is opened.
+ *
+ *  In order to persist custom data using your property panel, use the Javascript
+ *  <a href="../../jsapi/confluence/">Confluence API</a>.
+ *  For example:
+ *
+ *     AP.require(["confluence"], function (confluence) {
+ *         var macroParams = {
+ *             myParameter: value
+ *         };
+ *         confluence.saveMacro(macroParams);
+ *     });
+ *
+ *  In order to retrieve the custom data again when the property panel is opened, use `confluence.getMacroData` (see
+ *  <a href="../../jsapi/confluence/">Confluence API</a>):
+ *
+ *     AP.require("confluence", function (confluence) {
+ *         var macroData = confluence.getMacroData(function(macroParams) {
+ *             doSomethingWith(macroParams.myParameter);
+ *         });
+ *     });
+ *
+ *  Dialogs may also be created. Use `dialog.create` (see
+ *  <a href="../../jsapi/dialog/">Dialog API</a>):
+ *
+ *     AP.require('dialog', function(dialog) {
+ *         dialog.create({
+ *             key: 'my-module-key',
+ *             width: '500px',
+ *             height: '200px',
+ *             chrome: true
+ *         }).on("close", callbackFunc);
+ *     });
+ *
+ *
+ */
+export interface MacroPropertyPanel {
+  controls?: (ToggleGroup | ControlGroup | TextControl | ButtonControl1)[];
+  cacheable?: boolean;
+  url: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -8513,7 +8577,7 @@ export interface ToggleGroup {
  */
 export interface ToggleButtonControl {
   macroParameterValue: string;
-  label: I18NProperty76;
+  label: I18NProperty75;
   type: 'togglebutton' | 'TOGGLEBUTTON';
   key: string;
   [k: string]: unknown;
@@ -8537,7 +8601,7 @@ export interface ToggleButtonControl {
  *
  *
  */
-export interface I18NProperty76 {
+export interface I18NProperty75 {
   value: string;
   i18n?: string;
   [k: string]: unknown;
@@ -8579,10 +8643,90 @@ export interface I18NProperty76 {
  *
  */
 export interface ControlGroup {
-  controls: ButtonControl1[];
+  controls: ButtonControl[];
   type: 'group' | 'GROUP';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Defines a button which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "button",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-control-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface ButtonControl {
+  label: I18NProperty76;
+  type: 'button' | 'BUTTON';
+  key: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Represents a string that can be resolved via a localization properties file. You can use the same `i18n Property` key
+ *  and value in multiple places if you like, but identical keys must have identical values.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "value": "My text"
+ *     }
+ *
+ *
+ *
+ */
+export interface I18NProperty76 {
+  value: string;
+  i18n?: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a text field which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "button",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-control-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface TextControl {
+  macroParameter: string;
+  type: 'text' | 'TEXT';
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -50729,10 +50873,74 @@ export interface I18NProperty91 {
  *
  */
 export interface WebItemTarget2 {
-  options?: DialogOptions4 | DialogModuleOptions2 | InlineDialogOptions2;
+  options?: InlineDialogOptions2 | DialogModuleOptions2 | DialogOptions4;
   type?: 'page' | 'PAGE' | 'dialog' | 'DIALOG' | 'inlinedialog' | 'INLINEDIALOG' | 'dialogmodule' | 'DIALOGMODULE';
   [k: string]: unknown;
 }
+/**
+ *
+ *
+ * Options for an inline dialog target
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "inlinedialog",
+ *         "options": {
+ *           "onHover": true,
+ *           "offsetX": "30px",
+ *           "offsetY": "20px"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface InlineDialogOptions2 {
+  offsetX?: string;
+  offsetY?: string;
+  width?: string;
+  onTop?: boolean;
+  showDelay?: number;
+  closeOthers?: boolean;
+  persistent?: boolean;
+  onHover?: boolean;
+  isRelativeToMouse?: boolean;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ *
+ *  <h3>Example</h3>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "target": {
+ *         "type": "dialogmodule",
+ *         "options": {
+ *           "key": "dialog-module-key"
+ *         }
+ *       }
+ *     }
+ *
+ *
+ *
+ */
+export interface DialogModuleOptions2 {
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -50831,70 +51039,6 @@ export interface I18NProperty92 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "dialogmodule",
- *         "options": {
- *           "key": "dialog-module-key"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface DialogModuleOptions2 {
-  key: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Options for an inline dialog target
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "target": {
- *         "type": "inlinedialog",
- *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
- *         }
- *       }
- *     }
- *
- *
- *
- */
-export interface InlineDialogOptions2 {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
-  [k: string]: unknown;
-}
 /**
  *
  *