@forge/cli-shared 3.0.0 → 3.1.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/cli-shared
 
+## 3.1.0-next.0
+
+### Minor Changes
+
+- 89ae99e0: Add support for auto-bundling resources
+
 ## 3.0.0
 
 ### Major Changes

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

@@ -10,7 +10,7 @@ export interface ConfigInteractor {
     snapshotsEnabled(): Promise<boolean>;
 }
 export declare type Resource = Resources[0];
-export declare type ResourceType = 'customUI' | 'default';
+export declare type ResourceType = 'customUI' | 'nativeUI' | 'default';
 export interface ResourceDetails extends Resource {
     resourceType: ResourceType;
 }
@@ -25,8 +25,8 @@ export declare class ConfigFile implements ConfigReader, ConfigWriter, ConfigInt
     private makeManifestUnique;
     prependAppNameToModules(name: string): Promise<void>;
     writeToConfigFile<K extends string, V>(configKey: K, config: V): Promise<void>;
-    private getHostedResourceKeys;
-    private findMissingResources;
+    private getHostedResourceModules;
+    private assertNoMissingResources;
     private getRemoteFromEgressPermission;
     private instanceOfRemote;
     getEgressPermissions(): Promise<{
@@ -39,5 +39,6 @@ export declare class ConfigFile implements ConfigReader, ConfigWriter, ConfigInt
     }>>;
     getResources(): Promise<ResourceDetails[]>;
     getConnectKey(): Promise<string | undefined>;
+    private getResourceType;
 }
 //# sourceMappingURL=config-file.d.ts.map

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,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAEL,cAAc,EACd,SAAS,EAMV,MAAM,qCAAqC,CAAC;AAE7C,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAClD,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IASxC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3F,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;IAK5B,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,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA0B1C,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAI1D"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAEL,cAAc,EACd,SAAS,EAOV,MAAM,qCAAqC,CAAC;AAE7C,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,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;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IASxC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3F,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,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAgB1C,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKzD,OAAO,CAAC,eAAe;CAcxB"}

package/out/config/config-file.js

@@ -97,20 +97,15 @@ class ConfigFile {
         currentConfigDoc.set(configKey, config);
         this.fileWriter.writeStringToFile(currentConfigDoc.toString(), _1.manifestFileName);
     }
-    getHostedResourceKeys(modules) {
-        const resourceKeys = [];
-        for (const moduleKey in modules) {
-            modules[moduleKey].forEach((module) => {
-                if (config_1.isHostedResourceModule(module)) {
-                    resourceKeys.push(module.resource);
-                }
-            });
-        }
-        return resourceKeys;
+    getHostedResourceModules(modules) {
+        const modulesArray = Object.values(modules).flat();
+        return modulesArray.filter((module) => config_1.isHostedResourceModule(module));
     }
-    findMissingResources(resourceKeys, resources) {
-        const missing = resourceKeys.filter((resourceKey) => !resources.some(({ key }) => resourceKey === key));
-        return missing;
+    assertNoMissingResources(modules, resources) {
+        const missingResources = modules.filter(({ resource }) => !resources.some(({ key }) => resource === key));
+        if (missingResources.length > 0) {
+            throw new ResourceDefinitionMissingError(missingResources.map((m) => m.resource));
+        }
     }
     getRemoteFromEgressPermission(remoteEgressPermission, remotes) {
         if (!remotes) {
@@ -170,20 +165,11 @@ class ConfigFile {
     }
     async getResources() {
         const { modules, resources } = await this.readConfig();
-        const hostedResourceKeys = modules ? this.getHostedResourceKeys(modules) : [];
+        const hostedResourceModules = modules ? this.getHostedResourceModules(modules) : [];
         const maybeResources = resources || [];
         const validResources = maybeResources.filter(config_1.validateResource);
-        const missingResources = this.findMissingResources(hostedResourceKeys, validResources);
-        if (missingResources.length > 0) {
-            throw new ResourceDefinitionMissingError(missingResources);
-        }
-        const getResourceType = (resourceKey) => {
-            if (hostedResourceKeys.includes(resourceKey)) {
-                return 'customUI';
-            }
-            return 'default';
-        };
-        const validResourcesWithDetails = validResources.map((resource) => (Object.assign(Object.assign({}, resource), { resourceType: getResourceType(resource.key) })));
+        this.assertNoMissingResources(hostedResourceModules, validResources);
+        const validResourcesWithDetails = validResources.map((resource) => (Object.assign(Object.assign({}, resource), { resourceType: this.getResourceType(resource, hostedResourceModules) })));
         return validResourcesWithDetails || [];
     }
     async getConnectKey() {
@@ -191,5 +177,12 @@ class ConfigFile {
         const { app } = await this.readConfig();
         return (_a = app.connect) === null || _a === void 0 ? void 0 : _a.key;
     }
+    getResourceType({ key: resourceKey }, allModules) {
+        const linkedModule = allModules.find((m) => m.resource === resourceKey);
+        if (!linkedModule) {
+            return 'default';
+        }
+        return linkedModule.render === 'native' ? 'nativeUI' : 'customUI';
+    }
 }
 exports.ConfigFile = ConfigFile;

package/out/config/config.d.ts

@@ -5,7 +5,8 @@ export interface BaseModule {
     key: string;
 }
 export interface HostedResourcesModule extends BaseModule {
-    resource?: string;
+    resource: string;
+    render?: 'default' | 'native';
 }
 export interface ConfigReader {
     readConfig(): Promise<ManifestSchema>;

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAC/C,eAAO,MAAM,mBAAmB,UAAuE,CAAC;AAExG,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,qBAAsB,SAAQ,UAAU;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAED,eAAO,MAAM,gBAAgB,aAAc,GAAG,0BAG7C,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAY,GAAG,oCAGjD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAC/C,eAAO,MAAM,mBAAmB,UAAuE,CAAC;AAExG,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,qBAAsB,SAAQ,UAAU;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9F,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAED,eAAO,MAAM,gBAAgB,aAAc,GAAG,0BAG7C,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAY,GAAG,oCAGjD,CAAC"}

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

@@ -2367,6 +2367,14 @@ export declare type CompassCustomFieldInput = {
     textField?: Maybe<CompassCustomTextFieldInput>;
     numberField?: Maybe<CompassCustomNumberFieldInput>;
 };
+export declare type CompassCustomFieldScorecardCriteria = {
+    id: Scalars['ID'];
+    weight: Scalars['Int'];
+    scorecardCriteriaScore?: Maybe<CompassScorecardCriteriaScore>;
+};
+export declare type CompassCustomFieldScorecardCriteriaScorecardCriteriaScoreArgs = {
+    query?: Maybe<CompassScorecardCriteriaScoreQuery>;
+};
 export declare type CompassCustomNumberField = CompassCustomField & {
     __typename?: 'CompassCustomNumberField';
     definition?: Maybe<CompassCustomNumberFieldDefinition>;
@@ -2633,7 +2641,7 @@ export declare type CompassFlagEventProperties = {
     id: Scalars['ID'];
     status?: Maybe<Scalars['String']>;
 };
-export declare type CompassHasCustomBooleanFieldScorecardCriteria = CompassScorecardCriteria & {
+export declare type CompassHasCustomBooleanFieldScorecardCriteria = CompassScorecardCriteria & CompassCustomFieldScorecardCriteria & {
     __typename?: 'CompassHasCustomBooleanFieldScorecardCriteria';
     id: Scalars['ID'];
     weight: Scalars['Int'];
@@ -2645,7 +2653,7 @@ export declare type CompassHasCustomBooleanFieldScorecardCriteria = CompassScore
 export declare type CompassHasCustomBooleanFieldScorecardCriteriaScorecardCriteriaScoreArgs = {
     query?: Maybe<CompassScorecardCriteriaScoreQuery>;
 };
-export declare type CompassHasCustomNumberFieldScorecardCriteria = CompassScorecardCriteria & {
+export declare type CompassHasCustomNumberFieldScorecardCriteria = CompassScorecardCriteria & CompassCustomFieldScorecardCriteria & {
     __typename?: 'CompassHasCustomNumberFieldScorecardCriteria';
     id: Scalars['ID'];
     weight: Scalars['Int'];
@@ -2657,7 +2665,7 @@ export declare type CompassHasCustomNumberFieldScorecardCriteria = CompassScorec
 export declare type CompassHasCustomNumberFieldScorecardCriteriaScorecardCriteriaScoreArgs = {
     query?: Maybe<CompassScorecardCriteriaScoreQuery>;
 };
-export declare type CompassHasCustomTextFieldScorecardCriteria = CompassScorecardCriteria & {
+export declare type CompassHasCustomTextFieldScorecardCriteria = CompassScorecardCriteria & CompassCustomFieldScorecardCriteria & {
     __typename?: 'CompassHasCustomTextFieldScorecardCriteria';
     id: Scalars['ID'];
     weight: Scalars['Int'];
@@ -6607,8 +6615,10 @@ export declare type ForgeAlertsActivitiesResult = ForgeAlertsActivityConnection
 export declare type ForgeAlertsActivity = {
     __typename?: 'ForgeAlertsActivity';
     activityMessage: Scalars['String'];
-    timestamp: Scalars['Int'];
+    timestamp: Scalars['String'];
     type: ForgeAlertsActivityType;
+    isMuted: Scalars['Boolean'];
+    status: ForgeAlertsStatus;
 };
 export declare type ForgeAlertsActivityConnection = {
     __typename?: 'ForgeAlertsActivityConnection';
@@ -6626,7 +6636,8 @@ export declare enum ForgeAlertsActivityType {
     AlertMuted = "ALERT_MUTED",
     AlertOpened = "ALERT_OPENED",
     AlertResolved = "ALERT_RESOLVED",
-    AlertSent = "ALERT_SENT",
+    AlertSentFiring = "ALERT_SENT_FIRING",
+    AlertSentResolved = "ALERT_SENT_RESOLVED",
     AlertUnmuted = "ALERT_UNMUTED",
     AlertUpdated = "ALERT_UPDATED"
 }