@forge/cli-shared 9.4.0-next.10 → 9.4.0-next.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/cli-shared
 
+## 9.4.0-next.11
+
+### Minor Changes
+
+- d9f80a3: Add feature-gated combined artifact uploads to `forge build`. Combined builds are queued for server-side processing and can be monitored in the Developer Console.
+
 ## 9.4.0-next.10
 
 ### Minor Changes

package/out/app-logs/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/app-logs/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6E,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAwBrB,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,qBAAa,iBAAkB,YAAW,iBAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;;;IAapD,aAAa,CACxB,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IAmHX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/app-logs/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6E,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAwBrB,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,qBAAa,iBAAkB,YAAW,iBAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;;;IAapD,aAAa,CACxB,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IA6IX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}

package/out/app-logs/graphql-client.js

@@ -44,6 +44,10 @@ class LogsGraphQLClient {
         $limit: Int!,
         $queryStartTime: String!,
         $runtime: String
+        $functionKeys: [String]
+        $containers: [String]
+        $instances: [String]
+        $services: [String]
       ) {
         appLogsWithMetaData(
           appId: $appId
@@ -54,6 +58,10 @@ class LogsGraphQLClient {
           query: {
             dates: $dateSearchInput
             runtime: $runtime
+            functionKeys: $functionKeys
+            containers: $containers
+            instances: $instances
+            services: $services
           }
         ) {
           appLogs {
@@ -68,6 +76,24 @@ class LogsGraphQLClient {
             other
             ts
           }
+          appLogsFilterBuckets {
+            containers {
+              key
+              count
+              __typename
+            }
+            services {
+              key
+              count
+              __typename
+            }
+            functionKeys {
+              key
+              count
+              __typename
+            }
+            __typename
+          }
           hasNextPage
           totalLogs
           __typename

package/out/app-logs/view-logs.d.ts

@@ -16,8 +16,11 @@ export interface QueryDetails {
     limit: number;
     context?: InstallContext;
     startTime?: string | null;
-    containers?: boolean;
     grouped?: boolean;
+    containerKey?: string;
+    containerInstance?: string;
+    serviceKey?: string;
+    functionKey?: string;
 }
 export type AppLogsDetails = {
     appId: string;
@@ -33,6 +36,10 @@ export type AppLogsDetailsV2 = AppLogsDetails & {
     dateSearchInput: DateSearchInput;
     queryStartTime: string;
     maxLimit: number;
+    containers?: string[];
+    instances?: string[];
+    services?: string[];
+    functionKeys?: string[];
 };
 export interface InvocationQueryDetails {
     environmentKey: string;
@@ -71,8 +78,13 @@ export declare class ViewAppLogsCommand {
     private readonly logsClient;
     private readonly statsigService;
     constructor(getAppConfig: AppConfigProvider, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient, logsClient: ViewAppLogsClient, statsigService: StatsigService);
-    getAll({ environmentKey, limit, context, startTime, grouped, containers }: QueryDetails): Promise<Invocation[]>;
-    getLogs(details: AppLogsDetails): Promise<Invocation[]>;
+    getAll({ environmentKey, limit, context, containerKey, containerInstance, serviceKey, functionKey, startTime, grouped }: QueryDetails): Promise<Invocation[]>;
+    getLogs(details: AppLogsDetails, containerDetails: {
+        containerKey?: string;
+        containerInstance?: string;
+        serviceKey?: string;
+        functionKey?: string;
+    }): Promise<Invocation[]>;
     getOne(details: InvocationQueryDetails): Promise<Invocation>;
 }
 //# sourceMappingURL=view-logs.d.ts.map

package/out/app-logs/view-logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}

package/out/app-logs/view-logs.js

@@ -21,7 +21,7 @@ class ViewAppLogsCommand {
         this.logsClient = logsClient;
         this.statsigService = statsigService;
     }
-    async getAll({ environmentKey, limit, context, startTime = null, grouped = false, containers = false }) {
+    async getAll({ environmentKey, limit, context, containerKey, containerInstance, serviceKey, functionKey, startTime = null, grouped = false }) {
         const { id: appId } = await this.getAppConfig();
         const [environmentId, cloudId] = await Promise.all([
             this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey),
@@ -36,16 +36,22 @@ class ViewAppLogsCommand {
             contextAri: contextAri ? [contextAri] : undefined,
             grouped
         };
-        if (containers) {
+        if (containerKey || containerInstance || serviceKey) {
             details.runtime = Runtime.CONTAINER.toLowerCase();
         }
         const isV2ApiEnabled = await this.statsigService.isLogsV2ApiEnabled();
         if (isV2ApiEnabled) {
-            return this.getLogs(details);
+            const containerDetails = {
+                containerKey,
+                containerInstance,
+                serviceKey,
+                functionKey
+            };
+            return this.getLogs(details, containerDetails);
         }
         return this.logsClient.viewAppLogs(details);
     }
-    async getLogs(details) {
+    async getLogs(details, containerDetails) {
         const latestStart = new Date().toISOString();
         let earliestStart = new Date();
         if (details.startTime) {
@@ -60,6 +66,10 @@ class ViewAppLogsCommand {
         };
         return this.logsClient.viewAppLogsV2({
             ...details,
+            containers: containerDetails.containerKey ? [containerDetails.containerKey] : [],
+            instances: containerDetails.containerInstance ? [containerDetails.containerInstance] : [],
+            services: containerDetails.serviceKey ? [containerDetails.serviceKey] : [],
+            functionKeys: containerDetails.functionKey ? [containerDetails.functionKey] : [],
             offset: 0,
             dateSearchInput,
             queryStartTime: earliestStart.toISOString(),

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

@@ -49259,6 +49259,7 @@ export type EcosystemGlobalInstallationOverrideInput = {
 export declare enum EcosystemGlobalInstallationOverrideKeys {
     AllowCustomMetrics = "ALLOW_CUSTOM_METRICS",
     AllowEgressAnalytics = "ALLOW_EGRESS_ANALYTICS",
+    AllowExternalMcp = "ALLOW_EXTERNAL_MCP",
     AllowLlmCapability = "ALLOW_LLM_CAPABILITY",
     AllowLogsAccess = "ALLOW_LOGS_ACCESS",
     AllowPersonalApps = "ALLOW_PERSONAL_APPS",
@@ -49270,6 +49271,7 @@ export type EcosystemInstallationConfigInput = {
 export declare enum EcosystemInstallationOverrideKeys {
     AllowCustomMetrics = "ALLOW_CUSTOM_METRICS",
     AllowEgressAnalytics = "ALLOW_EGRESS_ANALYTICS",
+    AllowExternalMcp = "ALLOW_EXTERNAL_MCP",
     AllowLlmCapability = "ALLOW_LLM_CAPABILITY",
     AllowLogsAccess = "ALLOW_LOGS_ACCESS",
     AllowRestApis = "ALLOW_REST_APIS"
@@ -141817,6 +141819,7 @@ export type JiraProject = Node & {
     linkedOperationsIncidentsByProject?: Maybe<GraphStoreSimplifiedJswProjectAssociatedIncidentConnection>;
     linkedSecurityContainers?: Maybe<AriGraphRelationshipConnection>;
     linkedSecurityVulnerabilitiesByProject?: Maybe<GraphJiraVulnerabilityConnection>;
+    manageIssueTypesUrl?: Maybe<Scalars['String']['output']>;
     manageWorkflowUrl?: Maybe<Scalars['String']['output']>;
     mostRecentlyViewedBoard?: Maybe<JiraBoardResult>;
     name: Scalars['String']['output'];
@@ -230693,6 +230696,7 @@ export type TownsquareProject = HasMercuryProjectFields & Node & {
     mercuryProjectStatus?: Maybe<MercuryProjectStatus>;
     mercuryProjectType?: Maybe<MercuryProjectType>;
     mercuryProjectUrl?: Maybe<Scalars['URL']['output']>;
+    mercuryStartDate?: Maybe<Scalars['DateTime']['output']>;
     mercuryTargetDate?: Maybe<Scalars['String']['output']>;
     mercuryTargetDateEnd?: Maybe<Scalars['DateTime']['output']>;
     mercuryTargetDateStart?: Maybe<Scalars['DateTime']['output']>;