@forge/cli-shared 4.2.1-next.0 → 5.0.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @forge/cli-shared
 
+## 5.0.0-next.2
+
+### Major Changes
+
+- 5c2c20f: Fixed the issue where the CLI was unable to bundle modules with multiple entrypoints using different resource types.
+
+  Specifically the following configuration that supports both UI Kit and Custom UI resources are now supported properly.
+
+  ```yaml
+  modules:
+    jira:customFieldType:
+      - key: my_custom_field_app
+        resource: ui-kit-resource
+        render: native
+        contextConfig:
+          resource: custom-ui-resource
+  ```
+
+  In the previous CLI version, the above configuration would assume that the `custom-ui-resource` is a UI Kit resource
+  and would expected a UI Kit based resource is linked. To support using same resource type for multiple entrypoints,
+  in above example, please add `render: native` to the `contextConfig` to correct the resource type:
+
+  ```yaml
+  modules:
+    jira:customFieldType:
+      - key: my_custom_field_app
+        resource: ui-kit-resource
+        render: native
+        contextConfig:
+          resource: ui-kit-resource
+          render: native
+  ```
+
+## 4.2.1-next.1
+
+### Patch Changes
+
+- Updated dependencies [f04a310]
+  - @forge/manifest@7.2.3-next.1
+
 ## 4.2.1-next.0
 
 ### Patch Changes

package/out/config/config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAS,MAAM,MAAM,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAAW,cAAc,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAQ,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE1D,qBAAa,oBAAqB,SAAQ,eAAe;;CAIxD;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1C,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AAC/D,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IAE3E,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,gBAAgB;IAGlC,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAgBzC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IASrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAMhD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE,OAAO,CAAC,aAAa;IAIR,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1G,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,gBAAgB;IAIX,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAoClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAqBxE,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKzD,OAAO,CAAC,eAAe;CAiBxB"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAS,MAAM,MAAM,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAAW,cAAc,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,eAAe,EAAQ,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE1D,qBAAa,oBAAqB,SAAQ,eAAe;;CAIxD;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1C,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;AAC/D,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IAE3E,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,gBAAgB,EAC5B,UAAU,EAAE,gBAAgB;IAGlC,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAgBzC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IASrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAMhD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajE,OAAO,CAAC,aAAa;IAIR,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1G,OAAO,CAAC,wBAAwB;IAKhC,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,gBAAgB;IAIX,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAoClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAqBxE,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKzD,OAAO,CAAC,eAAe;CA0BxB"}

package/out/config/config-file.js

@@ -200,7 +200,18 @@ class ConfigFile {
         return (_a = app.connect) === null || _a === void 0 ? void 0 : _a.key;
     }
     getResourceType({ key: resourceKey }, allModules) {
-        const linkedModule = allModules.find((m) => m.resource === resourceKey || config_1.ModuleEntryPoints.some((entryPoint) => { var _a; return ((_a = m[entryPoint]) === null || _a === void 0 ? void 0 : _a.resource) === resourceKey; }));
+        var _a;
+        const linkedModule = (_a = allModules.find((m) => m.resource === resourceKey)) !== null && _a !== void 0 ? _a : allModules
+            .reduce((acc, m) => {
+            config_1.ModuleEntryPoints.forEach((entryPoint) => {
+                const entryPointModule = m[entryPoint];
+                if (entryPointModule) {
+                    acc.push(entryPointModule);
+                }
+            });
+            return acc;
+        }, [])
+            .find(({ resource }) => resource === resourceKey);
         if (!linkedModule) {
             return 'default';
         }

package/out/graphql/graphql-types.d.ts

@@ -5682,6 +5682,7 @@ export declare type CompassTeamCheckinsInput = {
 export declare type CompassTeamData = {
     __typename?: 'CompassTeamData';
     currentCheckin?: Maybe<CompassTeamCheckin>;
+    id: Scalars['ID']['output'];
     labels?: Maybe<Array<CompassTeamLabel>>;
     metricSources?: Maybe<CompassTeamMetricSourceConnection>;
     pullRequests?: Maybe<CompassPullRequestConnection>;
@@ -28532,9 +28533,6 @@ export declare type JiraAppConfigStateEdge = {
 export declare type JiraAppNavigationConfig = {
     iconUrl?: Maybe<Scalars['String']['output']>;
     label?: Maybe<Scalars['String']['output']>;
-    links?: Maybe<Array<Maybe<JiraAppNavigationConfig>>>;
-    section?: Maybe<Scalars['Boolean']['output']>;
-    separator?: Maybe<Scalars['Boolean']['output']>;
     styleClass?: Maybe<Scalars['String']['output']>;
     url?: Maybe<Scalars['String']['output']>;
 };
@@ -28549,9 +28547,7 @@ export declare type JiraAppNavigationItem = JiraAppNavigationConfig & JiraNaviga
     id: Scalars['ID']['output'];
     isDefault?: Maybe<Scalars['Boolean']['output']>;
     label?: Maybe<Scalars['String']['output']>;
-    links?: Maybe<Array<Maybe<JiraAppNavigationItemNestedLink>>>;
-    section?: Maybe<Scalars['Boolean']['output']>;
-    separator?: Maybe<Scalars['Boolean']['output']>;
+    sections?: Maybe<Array<Maybe<JiraAppSection>>>;
     styleClass?: Maybe<Scalars['String']['output']>;
     typeKey?: Maybe<JiraNavigationItemTypeKey>;
     url?: Maybe<Scalars['String']['output']>;
@@ -28560,12 +28556,15 @@ export declare type JiraAppNavigationItemNestedLink = JiraAppNavigationConfig &
     __typename?: 'JiraAppNavigationItemNestedLink';
     iconUrl?: Maybe<Scalars['String']['output']>;
     label?: Maybe<Scalars['String']['output']>;
-    links?: Maybe<Array<Maybe<JiraAppNavigationItemNestedLink>>>;
-    section?: Maybe<Scalars['Boolean']['output']>;
-    separator?: Maybe<Scalars['Boolean']['output']>;
     styleClass?: Maybe<Scalars['String']['output']>;
     url?: Maybe<Scalars['String']['output']>;
 };
+export declare type JiraAppSection = {
+    __typename?: 'JiraAppSection';
+    hasSeparator?: Maybe<Scalars['Boolean']['output']>;
+    label?: Maybe<Scalars['String']['output']>;
+    links?: Maybe<Array<Maybe<JiraAppNavigationItemNestedLink>>>;
+};
 export declare enum JiraAppType {
     Connect = "CONNECT",
     Forge = "FORGE"
@@ -41891,10 +41890,8 @@ export declare enum MembershipState {
 }
 export declare type MercuryCreateGoalInput = {
     description?: InputMaybe<Scalars['String']['input']>;
-    goalStatus?: InputMaybe<MercuryGoalStatus>;
     goalType?: InputMaybe<MercuryGoalType>;
-    metricScoring?: InputMaybe<MercuryMetricScoringInput>;
-    metricType?: InputMaybe<MercuryMetricType>;
+    metricTarget?: InputMaybe<MercuryMetricTargetInput>;
     name: Scalars['String']['input'];
     owner?: InputMaybe<Scalars['String']['input']>;
     parentGoalAri?: InputMaybe<Scalars['String']['input']>;
@@ -41929,7 +41926,7 @@ export declare type MercuryEditGoalInput = {
     description?: InputMaybe<Scalars['String']['input']>;
     goalAri: Scalars['String']['input'];
     goalStatus?: InputMaybe<MercuryGoalStatus>;
-    metricValue?: InputMaybe<Scalars['BigDecimal']['input']>;
+    metricTarget?: InputMaybe<MercuryMetricTargetInput>;
     name?: InputMaybe<Scalars['String']['input']>;
     owner?: InputMaybe<Scalars['String']['input']>;
     startDate?: InputMaybe<Scalars['Date']['input']>;
@@ -42161,7 +42158,8 @@ export declare type MercuryMetricScoring = {
     startValue?: Maybe<Scalars['BigDecimal']['output']>;
     targetValue?: Maybe<Scalars['BigDecimal']['output']>;
 };
-export declare type MercuryMetricScoringInput = {
+export declare type MercuryMetricTargetInput = {
+    metricType?: InputMaybe<MercuryMetricType>;
     startValue?: InputMaybe<Scalars['BigDecimal']['input']>;
     targetValue?: InputMaybe<Scalars['BigDecimal']['input']>;
 };
@@ -47160,6 +47158,32 @@ export declare type SearchResultGoogleDocument = SearchResult & {
     type: SearchResultType;
     url: Scalars['URL']['output'];
 };
+export declare type SearchResultGooglePresentation = SearchResult & {
+    __typename?: 'SearchResultGooglePresentation';
+    bodyText: Scalars['String']['output'];
+    description: Scalars['String']['output'];
+    excerpt?: Maybe<Scalars['String']['output']>;
+    iconUrl?: Maybe<Scalars['URL']['output']>;
+    id: Scalars['ID']['output'];
+    isRestricted?: Maybe<Scalars['Boolean']['output']>;
+    lastModifiedDate?: Maybe<Scalars['String']['output']>;
+    title: Scalars['String']['output'];
+    type: SearchResultType;
+    url: Scalars['URL']['output'];
+};
+export declare type SearchResultGoogleSpreadsheet = SearchResult & {
+    __typename?: 'SearchResultGoogleSpreadsheet';
+    bodyText: Scalars['String']['output'];
+    description: Scalars['String']['output'];
+    excerpt?: Maybe<Scalars['String']['output']>;
+    iconUrl?: Maybe<Scalars['URL']['output']>;
+    id: Scalars['ID']['output'];
+    isRestricted?: Maybe<Scalars['Boolean']['output']>;
+    lastModifiedDate?: Maybe<Scalars['String']['output']>;
+    title: Scalars['String']['output'];
+    type: SearchResultType;
+    url: Scalars['URL']['output'];
+};
 export declare type SearchResultItemEdge = {
     __typename?: 'SearchResultItemEdge';
     cursor?: Maybe<Scalars['String']['output']>;
@@ -47304,10 +47328,12 @@ export declare enum SearchResultType {
     Learning = "learning",
     Page = "page",
     Plan = "plan",
+    Presentation = "presentation",
     Project = "project",
     Question = "question",
     Repository = "repository",
     Space = "space",
+    Spreadsheet = "spreadsheet",
     Tag = "tag",
     Unrecognised = "unrecognised",
     Whiteboard = "whiteboard"
@@ -47686,6 +47712,7 @@ export declare type ShepherdAlertSupportingData = {
     customDetectionHighlight?: Maybe<ShepherdCustomDetectionHighlight>;
     highlight: ShepherdHighlight;
     marketplaceAppHighlight?: Maybe<ShepherdMarketplaceAppHighlight>;
+    searchDetectionHighlight?: Maybe<ShepherdSearchDetectionHighlight>;
 };
 export declare enum ShepherdAlertTemplateType {
     AddedConfluenceGlobalPermission = "ADDED_CONFLUENCE_GLOBAL_PERMISSION",
@@ -48382,6 +48409,16 @@ export declare type ShepherdResourceEventInput = {
     ari: Scalars['String']['input'];
     time: Scalars['DateTime']['input'];
 };
+export declare type ShepherdSearchDetectionHighlight = {
+    __typename?: 'ShepherdSearchDetectionHighlight';
+    searchQueries: Array<ShepherdSearchQuery>;
+};
+export declare type ShepherdSearchQuery = {
+    __typename?: 'ShepherdSearchQuery';
+    datetime: Scalars['DateTime']['output'];
+    query: Scalars['String']['output'];
+    suspiciousSearchTerms?: Maybe<Array<ShepherdSuspiciousSearchTerm>>;
+};
 export declare type ShepherdSite = {
     __typename?: 'ShepherdSite';
     cloudId: Scalars['ID']['output'];
@@ -48476,6 +48513,12 @@ export declare type ShepherdSubscriptionUpdateInput = {
     webhook?: InputMaybe<ShepherdUpdateWebhookInput>;
 };
 export declare type ShepherdSubscriptionsResult = QueryError | ShepherdSubscriptionConnection;
+export declare type ShepherdSuspiciousSearchTerm = {
+    __typename?: 'ShepherdSuspiciousSearchTerm';
+    category: Scalars['String']['output'];
+    endPosition: Scalars['Int']['output'];
+    startPosition: Scalars['Int']['output'];
+};
 export declare type ShepherdTime = {
     __typename?: 'ShepherdTime';
     end?: Maybe<Scalars['DateTime']['output']>;