@forge/manifest 2.6.0-next.9 → 3.1.0-next.1

package/out/schema/manifest.d.ts

@@ -72,7 +72,7 @@ export type Scopes = string[];
 export type Scripts = string[];
 export type Styles = 'unsafe-inline'[];
 export type Backend = (string | Remote)[];
-export type Client = string[];
+export type Client = (string | Remote1)[];
 export type Fonts = string[];
 export type Frames = string[];
 export type Navigation = string[];
@@ -82,6 +82,19 @@ export type Scripts1 = string[];
 export type Styles1 = string[];
 export type Resources = HostedResourcesSchema[];
 export type Remotes = RemotesSchema[];
+export type BearerMethodSchema =
+  | ('authorization-header' | 'form-encoded' | 'uri-query')
+  | {
+      type: 'authorization-header' | 'form-encoded' | 'uri-query';
+      /**
+       * Custom authorization header prefix
+       */
+      prefix?: string;
+      /**
+       * Custom Header name or Parameter name (depending on type)
+       */
+      parameter?: string;
+    };
 /**
  * External authentication providers
  */
@@ -124,6 +137,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 +315,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -309,6 +329,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -317,6 +340,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -328,6 +354,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -338,6 +367,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -349,6 +381,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -357,6 +392,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -368,6 +406,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -450,6 +491,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -461,6 +505,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -469,6 +516,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -480,6 +530,9 @@ export interface Modules {
           resource: string;
           resourceUploadId?: string;
           viewportSize?: 'small' | 'medium' | 'large' | 'xlarge';
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -492,6 +545,9 @@ export interface Modules {
           icon?: string;
           route: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -504,6 +560,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -514,6 +573,9 @@ export interface Modules {
           icon?: string;
           route: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -526,6 +588,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -536,6 +601,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -546,6 +614,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -554,6 +625,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -564,6 +638,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -574,6 +651,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -584,6 +664,9 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -592,6 +675,9 @@ export interface Modules {
       | {
           title: string;
           function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -602,11 +688,68 @@ export interface Modules {
           };
           resource: string;
           resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
     )[]
   ];
+  'confluence:globalPage'?: [
+    (
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
+          key: ModuleKeySchema;
+        }
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
+          key: ModuleKeySchema;
+        }
+    ),
+    ...(
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          function: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
+          key: ModuleKeySchema;
+        }
+      | {
+          title: string;
+          icon?: string;
+          route: string;
+          resolver?: {
+            function: string;
+          };
+          resource: string;
+          resourceUploadId?: string;
+          displayConditions?: {
+            [k: string]: unknown;
+          };
+          key: ModuleKeySchema;
+        }
+    )[]
+  ];
   'jira:workflowValidator'?: [
     {
       name: string;
@@ -1236,44 +1379,108 @@ export interface Modules {
   'jira:adminPage'?: [
     (
       | {
+          function: string;
           title: string;
           icon?: string;
-          layout?: 'native' | 'basic';
-          function: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
-          title: string;
-          icon?: string;
-          layout?: 'native' | 'basic';
+          resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
-          resource: string;
-          resourceUploadId?: string;
+          title: string;
+          icon?: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
     ),
     ...(
       | {
+          function: string;
           title: string;
           icon?: string;
-          layout?: 'native' | 'basic';
-          function: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
-          title: string;
-          icon?: string;
-          layout?: 'native' | 'basic';
+          resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
-          resource: string;
-          resourceUploadId?: string;
+          title: string;
+          icon?: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1282,44 +1489,108 @@ export interface Modules {
   'jira:projectPage'?: [
     (
       | {
+          function: string;
           title: string;
           icon?: string;
-          layout?: 'native' | 'basic';
-          function: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
-          title: string;
-          icon?: string;
-          layout?: 'native' | 'basic';
+          resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
-          resource: string;
-          resourceUploadId?: string;
+          title: string;
+          icon?: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
     ),
     ...(
       | {
+          function: string;
           title: string;
           icon?: string;
-          layout?: 'native' | 'basic';
-          function: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
-          title: string;
-          icon?: string;
-          layout?: 'native' | 'basic';
+          resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
-          resource: string;
-          resourceUploadId?: string;
+          title: string;
+          icon?: string;
+          layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1332,17 +1603,50 @@ export interface Modules {
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
           resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1353,17 +1657,50 @@ export interface Modules {
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
           resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1376,17 +1713,50 @@ export interface Modules {
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
           resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1397,17 +1767,50 @@ export interface Modules {
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
       | {
           resource: string;
+          resourceUploadId?: string;
           resolver?: {
             function: string;
           };
           title: string;
           icon?: string;
           layout?: 'basic' | 'native';
+          pages?: {
+            title: string;
+            route: string;
+            icon?: string;
+            [k: string]: unknown;
+          }[];
+          sections?: {
+            header?: string;
+            pages: {
+              title: string;
+              route: string;
+              icon?: string;
+              [k: string]: unknown;
+            }[];
+            [k: string]: unknown;
+          }[];
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1429,7 +1832,6 @@ export interface Modules {
             function: string;
           };
           resource: string;
-          resourceUploadId?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1449,7 +1851,6 @@ export interface Modules {
             function: string;
           };
           resource: string;
-          resourceUploadId?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1473,7 +1874,6 @@ export interface Modules {
           };
           displayConditions?: DisplayConditions;
           resource: string;
-          resourceUploadId?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1495,7 +1895,6 @@ export interface Modules {
           };
           displayConditions?: DisplayConditions;
           resource: string;
-          resourceUploadId?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1517,7 +1916,6 @@ export interface Modules {
             function: string;
           };
           resource: string;
-          resourceUploadId?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1537,7 +1935,6 @@ export interface Modules {
             function: string;
           };
           resource: string;
-          resourceUploadId?: string;
           key: ModuleKeySchema;
           [k: string]: unknown;
         }
@@ -1585,7 +1982,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1600,7 +1997,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1618,7 +2015,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1634,7 +2031,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1648,7 +2045,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -1658,7 +2055,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -1672,7 +2069,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1686,7 +2083,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1728,7 +2125,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1742,7 +2139,7 @@ export interface Modules {
       weight?: number;
       cacheable?: boolean;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1766,7 +2163,7 @@ export interface Modules {
       name?: I18NProperty10;
       location?: string;
       cacheable?: boolean;
-      conditions?: (CompositeCondition1 | SingleCondition1)[];
+      conditions?: (SingleCondition1 | CompositeCondition1)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -1784,7 +2181,7 @@ export interface Modules {
       name?: I18NProperty10;
       location?: string;
       cacheable?: boolean;
-      conditions?: (CompositeCondition1 | SingleCondition1)[];
+      conditions?: (SingleCondition1 | CompositeCondition1)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -1797,7 +2194,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -1812,7 +2209,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2022,7 +2419,7 @@ export interface Modules {
       name?: I18NProperty20;
       weight?: number;
       iconUrl?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       url?: string;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2031,7 +2428,7 @@ export interface Modules {
       name?: I18NProperty20;
       weight?: number;
       iconUrl?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       url?: string;
       key: ModuleKeySchema;
       [k: string]: unknown;
@@ -2042,7 +2439,7 @@ export interface Modules {
       name?: I18NProperty21;
       weight?: number;
       description?: I18NProperty22;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2054,7 +2451,7 @@ export interface Modules {
       name?: I18NProperty21;
       weight?: number;
       description?: I18NProperty22;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2067,7 +2464,7 @@ export interface Modules {
     {
       name?: I18NProperty23;
       description?: I18NProperty24;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       url?: string;
       configurable?: boolean;
       thumbnailUrl?: string;
@@ -2077,7 +2474,7 @@ export interface Modules {
     ...{
       name?: I18NProperty23;
       description?: I18NProperty24;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       url?: string;
       configurable?: boolean;
       thumbnailUrl?: string;
@@ -2111,7 +2508,7 @@ export interface Modules {
     {
       icon?: Icon5;
       name?: I18NProperty27;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       content?: IssueGlanceContentLabel;
       target?: IssueGlanceTargetWebPanel;
       jiraNativeAppsEnabled?: boolean;
@@ -2121,7 +2518,7 @@ export interface Modules {
     ...{
       icon?: Icon5;
       name?: I18NProperty27;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       content?: IssueGlanceContentLabel;
       target?: IssueGlanceTargetWebPanel;
       jiraNativeAppsEnabled?: boolean;
@@ -2376,7 +2773,7 @@ export interface Modules {
       name?: I18NProperty44;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2388,7 +2785,7 @@ export interface Modules {
       name?: I18NProperty44;
       weight?: number;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2455,6 +2852,7 @@ export interface Modules {
     {
       installed?: string;
       disabled?: string;
+      'dare-migration'?: string;
       uninstalled?: string;
       enabled?: string;
       key: ModuleKeySchema;
@@ -2463,6 +2861,7 @@ export interface Modules {
     ...{
       installed?: string;
       disabled?: string;
+      'dare-migration'?: string;
       uninstalled?: string;
       enabled?: string;
       key: ModuleKeySchema;
@@ -2511,7 +2910,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2526,7 +2925,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2544,7 +2943,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2560,7 +2959,7 @@ export interface Modules {
       location?: string;
       cacheable?: boolean;
       supportsNative?: boolean;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2574,7 +2973,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -2584,7 +2983,7 @@ export interface Modules {
       filter?: string;
       excludeBody?: boolean;
       event?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       propertyKeys?: string[];
       url?: string;
       key: ModuleKeySchema;
@@ -2627,7 +3026,7 @@ export interface Modules {
       name?: I18NProperty55;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2639,7 +3038,7 @@ export interface Modules {
       name?: I18NProperty55;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2692,7 +3091,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (SingleCondition4 | CompositeCondition6)[];
+      conditions?: (CompositeCondition6 | SingleCondition4)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     },
@@ -2710,7 +3109,7 @@ export interface Modules {
       name?: I18NProperty59;
       location?: string;
       cacheable?: boolean;
-      conditions?: (SingleCondition4 | CompositeCondition6)[];
+      conditions?: (CompositeCondition6 | SingleCondition4)[];
       key: ModuleKeySchema;
       [k: string]: unknown;
     }[]
@@ -2723,7 +3122,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2738,7 +3137,7 @@ export interface Modules {
       fullPage?: boolean;
       cacheable?: boolean;
       location?: string;
-      conditions?: (SingleCondition | CompositeCondition)[];
+      conditions?: (CompositeCondition | SingleCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2788,7 +3187,7 @@ export interface Modules {
       name?: I18NProperty63;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition7 | SingleCondition5)[];
+      conditions?: (SingleCondition5 | CompositeCondition7)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2800,7 +3199,7 @@ export interface Modules {
       name?: I18NProperty63;
       weight?: number;
       location?: string;
-      conditions?: (CompositeCondition7 | SingleCondition5)[];
+      conditions?: (SingleCondition5 | CompositeCondition7)[];
       params?: {
         [k: string]: unknown;
       };
@@ -2996,7 +3395,7 @@ export interface Modules {
       icon?: Icon18;
       name?: I18NProperty91;
       cacheable?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3012,7 +3411,7 @@ export interface Modules {
       icon?: Icon18;
       name?: I18NProperty91;
       cacheable?: boolean;
-      conditions?: (CompositeCondition | SingleCondition)[];
+      conditions?: (SingleCondition | CompositeCondition)[];
       params?: {
         [k: string]: unknown;
       };
@@ -3194,37 +3593,6 @@ export interface I18NProperty1 {
   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 SingleCondition {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -3262,10 +3630,41 @@ export interface SingleCondition {
  *
  */
 export interface CompositeCondition {
-  conditions?: (ManifestSchema | SingleCondition)[];
+  conditions?: (SingleCondition | ManifestSchema)[];
   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 SingleCondition {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -3609,10 +4008,47 @@ export interface Icon3 {
  *
  */
 export interface WebItemTarget {
-  options?: DialogOptions | InlineDialogOptions | DialogModuleOptions;
+  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;
+}
 /**
  *
  *
@@ -3714,7 +4150,7 @@ export interface I18NProperty9 {
 /**
  *
  *
- * Options for an inline dialog target
+ * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
  *
  *  <h3>Example</h3>
  *
@@ -3724,11 +4160,9 @@ export interface I18NProperty9 {
  *
  *     {
  *       "target": {
- *         "type": "inlinedialog",
+ *         "type": "dialogmodule",
  *         "options": {
- *           "onHover": true,
- *           "offsetX": "30px",
- *           "offsetY": "20px"
+ *           "key": "dialog-module-key"
  *         }
  *       }
  *     }
@@ -3736,22 +4170,15 @@ export interface I18NProperty9 {
  *
  *
  */
-export interface InlineDialogOptions {
-  offsetX?: string;
-  offsetY?: string;
-  width?: string;
-  onTop?: boolean;
-  showDelay?: number;
-  closeOthers?: boolean;
-  persistent?: boolean;
-  onHover?: boolean;
-  isRelativeToMouse?: boolean;
+export interface DialogModuleOptions {
+  key: string;
   [k: string]: unknown;
 }
 /**
  *
  *
- * Options for a web-item targeting a common <a href="../dialog/">dialog module</a>.
+ * 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>
  *
@@ -3760,26 +4187,25 @@ export interface InlineDialogOptions {
  *
  *
  *     {
- *       "target": {
- *         "type": "dialogmodule",
- *         "options": {
- *           "key": "dialog-module-key"
- *         }
- *       }
+ *       "value": "My text"
  *     }
  *
  *
  *
  */
-export interface DialogModuleOptions {
-  key: string;
+export interface I18NProperty10 {
+  value: string;
+  i18n?: 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.
+ * 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>
  *
@@ -3788,15 +4214,19 @@ export interface DialogModuleOptions {
  *
  *
  *     {
- *       "value": "My text"
+ *       "condition": "user_is_logged_in",
+ *       "invert": false
  *     }
  *
  *
  *
  */
-export interface I18NProperty10 {
-  value: string;
-  i18n?: string;
+export interface SingleCondition1 {
+  condition: string;
+  invert?: boolean;
+  params?: {
+    [k: string]: unknown;
+  };
   [k: string]: unknown;
 }
 /**
@@ -3840,37 +4270,6 @@ export interface CompositeCondition1 {
   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 SingleCondition1 {
-  condition: string;
-  invert?: boolean;
-  params?: {
-    [k: string]: unknown;
-  };
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -4810,7 +5209,7 @@ export interface I18NProperty33 {
  *
  */
 export interface CompositeCondition2 {
-  conditions?: (SingleCondition | CompositeCondition3)[];
+  conditions?: (CompositeCondition3 | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -4851,7 +5250,7 @@ export interface CompositeCondition2 {
  *
  */
 export interface CompositeCondition3 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -5115,7 +5514,7 @@ export interface I18NProperty38 {
  *
  */
 export interface CompositeCondition4 {
-  conditions?: (SingleCondition | CompositeCondition5)[];
+  conditions?: (CompositeCondition5 | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -5156,7 +5555,7 @@ export interface CompositeCondition4 {
  *
  */
 export interface CompositeCondition5 {
-  conditions?: (SingleCondition | ManifestSchema)[];
+  conditions?: (ManifestSchema | SingleCondition)[];
   type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
@@ -5939,74 +6338,10 @@ export interface Icon10 {
  *
  */
 export interface WebItemTarget1 {
-  options?: InlineDialogOptions1 | DialogModuleOptions1 | DialogOptions2;
+  options?: DialogOptions2 | InlineDialogOptions1 | DialogModuleOptions1;
   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 InlineDialogOptions1 {
-  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 DialogModuleOptions1 {
-  key: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6100,7 +6435,95 @@ export interface DialogOptions2 {
  *
  *
  */
-export interface I18NProperty58 {
+export interface I18NProperty58 {
+  value: string;
+  i18n?: 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 InlineDialogOptions1 {
+  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 DialogModuleOptions1 {
+  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 I18NProperty59 {
   value: string;
   i18n?: string;
   [k: string]: unknown;
@@ -6108,8 +6531,8 @@ export interface I18NProperty58 {
 /**
  *
  *
- * 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.
+ * Composite Conditions are composed of a collection of [Single Condition](../single-condition/) / Composite Conditions
+ *  and a type attribute.
  *
  *  <h3>Example</h3>
  *
@@ -6118,15 +6541,32 @@ export interface I18NProperty58 {
  *
  *
  *     {
- *       "value": "My text"
+ *       "conditions": [
+ *         {
+ *           "or": [
+ *             {
+ *               "condition": "can_attach_file_to_issue",
+ *               "invert": false
+ *             },
+ *             {
+ *               "condition": "is_issue_assigned_to_current_user",
+ *               "invert": false
+ *             }
+ *           ]
+ *         },
+ *         {
+ *           "condition": "user_is_logged_in",
+ *           "invert": false
+ *         }
+ *       ]
  *     }
  *
  *
  *
  */
-export interface I18NProperty59 {
-  value: string;
-  i18n?: string;
+export interface CompositeCondition6 {
+  conditions?: (SingleCondition | ManifestSchema)[];
+  type?: 'and' | 'AND' | 'or' | 'OR';
   [k: string]: unknown;
 }
 /**
@@ -6160,47 +6600,6 @@ export interface SingleCondition4 {
   };
   [k: string]: unknown;
 }
-/**
- *
- *
- * Composite Conditions are composed of a collection of [Single Condition](../single-condition/) / Composite Conditions
- *  and a type attribute.
- *
- *  <h3>Example</h3>
- *
- *
- *
- *
- *
- *     {
- *       "conditions": [
- *         {
- *           "or": [
- *             {
- *               "condition": "can_attach_file_to_issue",
- *               "invert": false
- *             },
- *             {
- *               "condition": "is_issue_assigned_to_current_user",
- *               "invert": false
- *             }
- *           ]
- *         },
- *         {
- *           "condition": "user_is_logged_in",
- *           "invert": false
- *         }
- *       ]
- *     }
- *
- *
- *
- */
-export interface CompositeCondition6 {
-  conditions?: (SingleCondition | ManifestSchema)[];
-  type?: 'and' | 'AND' | 'or' | 'OR';
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -6555,6 +6954,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;
+}
 /**
  *
  *
@@ -6592,41 +7022,10 @@ export interface I18NProperty63 {
  *
  */
 export interface CompositeCondition7 {
-  conditions?: (ManifestSchema | SingleCondition)[];
+  conditions?: (SingleCondition | ManifestSchema)[];
   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;
-}
 /**
  *
  *
@@ -8046,138 +8445,11 @@ export interface I18NProperty74 {
  *
  */
 export interface MacroPropertyPanel {
-  controls?: (ToggleGroup | TextControl | ButtonControl | ControlGroup)[];
+  controls?: (ButtonControl | ToggleGroup | ControlGroup | TextControl)[];
   cacheable?: boolean;
   url: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Defines a ToggleGroup which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     [
- *       {
- *         "type": "togglegroup",
- *         "macroParameter": "toggleGroupMacroParameter",
- *         "controls": [
- *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 0",
- *             "label": {
- *               "value": "My Custom Control 0"
- *             },
- *             "key": "my-custom-toggle-button-0"
- *           },
- *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 1",
- *             "label": {
- *               "value": "My Custom Control 1"
- *             },
- *             "key": "my-custom-toggle-button-1"
- *           }
- *         ]
- *       }
- *     ]
- *
- *
- *
- */
-export interface ToggleGroup {
-  controls: ToggleButtonControl[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a toggle button which appears inside a ToggleGroup
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     {
- *       "type": "togglebutton",
- *       "macroParameterValue": "macroParameterValue 0",
- *       "label": {
- *         "value": "My Custom Control 0"
- *       },
- *       "key": "my-custom-toggle-button-0"
- *     }
- *
- *
- *
- */
-export interface ToggleButtonControl {
-  macroParameterValue: string;
-  label: I18NProperty75;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
-  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 {
-  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;
-}
 /**
  *
  *
@@ -8201,11 +8473,110 @@ export interface TextControl {
  *
  */
 export interface ButtonControl {
-  label: I18NProperty76;
+  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 {
+  value: string;
+  i18n?: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     [
+ *       {
+ *         "type": "togglegroup",
+ *         "macroParameter": "toggleGroupMacroParameter",
+ *         "controls": [
+ *           {
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 0",
+ *             "label": {
+ *               "value": "My Custom Control 0"
+ *             },
+ *             "key": "my-custom-toggle-button-0"
+ *           },
+ *           {
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 1",
+ *             "label": {
+ *               "value": "My Custom Control 1"
+ *             },
+ *             "key": "my-custom-toggle-button-1"
+ *           }
+ *         ]
+ *       }
+ *     ]
+ *
+ *
+ *
+ */
+export interface ToggleGroup {
+  controls: ToggleButtonControl[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a toggle button which appears inside a ToggleGroup
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "togglebutton",
+ *       "macroParameterValue": "macroParameterValue 0",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-toggle-button-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface ToggleButtonControl {
+  macroParameterValue: string;
+  label: I18NProperty76;
+  type: 'togglebutton' | 'TOGGLEBUTTON';
+  key: string;
+  [k: string]: unknown;
+}
 /**
  *
  *
@@ -8323,6 +8694,34 @@ export interface I18NProperty77 {
   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;
+}
 /**
  *
  *
@@ -29245,57 +29644,156 @@ export interface Icon17 {
  *
  *
  */
-export interface I18NProperty83 {
+export interface I18NProperty83 {
+  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 MacroPropertyPanel1 {
+  controls?: (ToggleGroup1 | TextControl1 | ControlGroup1 | ButtonControl3)[];
+  cacheable?: boolean;
+  url: string;
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     [
+ *       {
+ *         "type": "togglegroup",
+ *         "macroParameter": "toggleGroupMacroParameter",
+ *         "controls": [
+ *           {
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 0",
+ *             "label": {
+ *               "value": "My Custom Control 0"
+ *             },
+ *             "key": "my-custom-toggle-button-0"
+ *           },
+ *           {
+ *             "type": "togglebutton",
+ *             "macroParameterValue": "macroParameterValue 1",
+ *             "label": {
+ *               "value": "My Custom Control 1"
+ *             },
+ *             "key": "my-custom-toggle-button-1"
+ *           }
+ *         ]
+ *       }
+ *     ]
+ *
+ *
+ *
+ */
+export interface ToggleGroup1 {
+  controls: ToggleButtonControl1[];
+  macroParameter: string;
+  type: 'togglegroup' | 'TOGGLEGROUP';
+  [k: string]: unknown;
+}
+/**
+ *
+ *
+ * Defines a toggle button which appears inside a ToggleGroup
+ *
+ *  <p><b>Example</b></p>
+ *
+ *
+ *
+ *
+ *
+ *     {
+ *       "type": "togglebutton",
+ *       "macroParameterValue": "macroParameterValue 0",
+ *       "label": {
+ *         "value": "My Custom Control 0"
+ *       },
+ *       "key": "my-custom-toggle-button-0"
+ *     }
+ *
+ *
+ *
+ */
+export interface ToggleButtonControl1 {
+  macroParameterValue: string;
+  label: I18NProperty84;
+  type: 'togglebutton' | 'TOGGLEBUTTON';
+  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 I18NProperty84 {
   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 MacroPropertyPanel1 {
-  controls?: (TextControl1 | ButtonControl2 | ToggleGroup1 | ControlGroup1)[];
-  cacheable?: boolean;
-  url: string;
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -29327,59 +29825,7 @@ export interface TextControl1 {
 /**
  *
  *
- * 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 ButtonControl2 {
-  label: I18NProperty84;
-  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 I18NProperty84 {
-  value: string;
-  i18n?: string;
-  [k: string]: unknown;
-}
-/**
- *
- *
- * Defines a ToggleGroup which may appear in control extension points such as the property panel
+ * Defines a ControlGroup which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -29389,24 +29835,21 @@ export interface I18NProperty84 {
  *
  *     [
  *       {
- *         "type": "togglegroup",
- *         "macroParameter": "toggleGroupMacroParameter",
+ *         "type": "group",
  *         "controls": [
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 0",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 0"
  *             },
- *             "key": "my-custom-toggle-button-0"
+ *             "key": "my-custom-control-0"
  *           },
  *           {
- *             "type": "togglebutton",
- *             "macroParameterValue": "macroParameterValue 1",
+ *             "type": "button",
  *             "label": {
  *               "value": "My Custom Control 1"
  *             },
- *             "key": "my-custom-toggle-button-1"
+ *             "key": "my-custom-control-1"
  *           }
  *         ]
  *       }
@@ -29415,16 +29858,15 @@ export interface I18NProperty84 {
  *
  *
  */
-export interface ToggleGroup1 {
-  controls: ToggleButtonControl1[];
-  macroParameter: string;
-  type: 'togglegroup' | 'TOGGLEGROUP';
+export interface ControlGroup1 {
+  controls: ButtonControl2[];
+  type: 'group' | 'GROUP';
   [k: string]: unknown;
 }
 /**
  *
  *
- * Defines a toggle button which appears inside a ToggleGroup
+ * Defines a button which may appear in control extension points such as the property panel
  *
  *  <p><b>Example</b></p>
  *
@@ -29433,21 +29875,19 @@ export interface ToggleGroup1 {
  *
  *
  *     {
- *       "type": "togglebutton",
- *       "macroParameterValue": "macroParameterValue 0",
+ *       "type": "button",
  *       "label": {
  *         "value": "My Custom Control 0"
  *       },
- *       "key": "my-custom-toggle-button-0"
+ *       "key": "my-custom-control-0"
  *     }
  *
  *
  *
  */
-export interface ToggleButtonControl1 {
-  macroParameterValue: string;
+export interface ButtonControl2 {
   label: I18NProperty85;
-  type: 'togglebutton' | 'TOGGLEBUTTON';
+  type: 'button' | 'BUTTON';
   key: string;
   [k: string]: unknown;
 }
@@ -29475,47 +29915,6 @@ export interface I18NProperty85 {
   i18n?: string;
   [k: string]: unknown;
 }
-/**
- *
- *
- * Defines a ControlGroup which may appear in control extension points such as the property panel
- *
- *  <p><b>Example</b></p>
- *
- *
- *
- *
- *
- *     [
- *       {
- *         "type": "group",
- *         "controls": [
- *           {
- *             "type": "button",
- *             "label": {
- *               "value": "My Custom Control 0"
- *             },
- *             "key": "my-custom-control-0"
- *           },
- *           {
- *             "type": "button",
- *             "label": {
- *               "value": "My Custom Control 1"
- *             },
- *             "key": "my-custom-control-1"
- *           }
- *         ]
- *       }
- *     ]
- *
- *
- *
- */
-export interface ControlGroup1 {
-  controls: ButtonControl3[];
-  type: 'group' | 'GROUP';
-  [k: string]: unknown;
-}
 /**
  *
  *
@@ -50417,47 +50816,10 @@ export interface I18NProperty91 {
  *
  */
 export interface WebItemTarget2 {
-  options?: InlineDialogOptions2 | DialogModuleOptions2 | DialogOptions4;
+  options?: DialogModuleOptions2 | DialogOptions4 | InlineDialogOptions2;
   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;
-}
 /**
  *
  *
@@ -50583,6 +50945,43 @@ export interface I18NProperty92 {
   i18n?: 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;
+}
 /**
  *
  *
@@ -51369,6 +51768,12 @@ export interface Fetch {
 export interface Remote {
   remote: string;
 }
+/**
+ * References a Remote
+ */
+export interface Remote1 {
+  remote: string;
+}
 export interface HostedResourcesSchema {
   /**
    * A key for the resource, which other modules can refer to. Must be unique within the manifest and have a maximum of 23 characters.
@@ -51396,19 +51801,7 @@ export interface AuthProviderCustom {
    */
   name: string;
   type: 'oauth2';
-  bearerMethod?:
-    | ('authorization-header' | 'form-encoded' | 'uri-query')
-    | {
-        type: 'authorization-header' | 'form-encoded' | 'uri-query';
-        /**
-         * Custom authorization header prefix
-         */
-        prefix?: string;
-        /**
-         * Custom Header name or Parameter name (depending on type)
-         */
-        parameter?: string;
-      };
+  bearerMethod: BearerMethodSchema;
   clientId: string;
   scopes?: string[];
   remotes?: ModuleKeySchema[];
@@ -51491,7 +51884,12 @@ export interface AuthProviderPredefined {
    * Name shown to end users
    */
   name: string;
+  /**
+   * Pre-defined integration name
+   */
   integration: 'adobe' | 'azuredevops' | 'dropbox' | 'google' | 'miro';
+  bearerMethod: BearerMethodSchema;
   clientId: string;
   scopes?: string[];
+  remotes: ModuleKeySchema[];
 }