@forge/cli 6.10.0 → 6.11.0-next.14

package/out/command-line/controller/settings-controller.d.ts

@@ -1,19 +1,20 @@
 import { CachedConfigService } from '../../service/cached-config-service';
 import { SettingsView } from '../view/settings-view';
-export declare const ALLOWED_SETTINGS: readonly ["usage-analytics"];
-declare type AllowedSettingType = typeof ALLOWED_SETTINGS[number];
-declare type SettingGetter = () => boolean | undefined;
-declare type SettingSetter = (val: boolean) => void;
+import { AppConfigProvider, FeatureFlagService } from '@forge/cli-shared';
 export declare class SettingsController {
     private readonly settingsView;
     private readonly cachedConfigService;
-    constructor(settingsView: SettingsView, cachedConfigService: CachedConfigService);
-    SETTINGS_MAP: {
-        [key in AllowedSettingType]: [string, SettingGetter, SettingSetter];
-    };
-    showSettings(json?: boolean): void;
+    private readonly getAppConfig;
+    private readonly featureFlagService;
+    constructor(settingsView: SettingsView, cachedConfigService: CachedConfigService, getAppConfig: AppConfigProvider, featureFlagService: FeatureFlagService);
+    private SETTINGS_MAP;
+    private getAppId;
+    private validateAppManifest;
     private parseBoolean;
-    setSettings(preference: unknown, value: string): void;
+    private isAllowedSetting;
+    private getSetting;
+    getPublicSettings(): Promise<string[]>;
+    showSettings(json?: boolean): Promise<void>;
+    setSetting(preference: string, value: string): Promise<void>;
 }
-export {};
 //# sourceMappingURL=settings-controller.d.ts.map

package/out/command-line/controller/settings-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,eAAO,MAAM,gBAAgB,8BAA+B,CAAC;AAE7D,aAAK,kBAAkB,GAAG,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAM1D,aAAK,aAAa,GAAG,MAAM,OAAO,GAAG,SAAS,CAAC;AAC/C,aAAK,aAAa,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;AAE5C,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAgB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAAhE,YAAY,EAAE,YAAY,EAAmB,mBAAmB,EAAE,mBAAmB;IAElH,YAAY,EAAE;SAAG,GAAG,IAAI,kBAAkB,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC;KAAE,CAMnF;IAEK,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAQlC,OAAO,CAAC,YAAY;IAWb,WAAW,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM;CAYtD"}
+{"version":3,"file":"settings-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/settings-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,iBAAiB,EAEjB,kBAAkB,EAInB,MAAM,mBAAmB,CAAC;AAiB3B,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAHlB,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB,EAC/B,kBAAkB,EAAE,kBAAkB;IAGzD,OAAO,CAAC,YAAY,CA6BlB;YAEY,QAAQ;YAKR,mBAAmB;IAKjC,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;YAIV,UAAU;IAWX,iBAAiB;IAWjB,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAY3B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAY1D"}

package/out/command-line/controller/settings-controller.js

@@ -1,29 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SettingsController = exports.ALLOWED_SETTINGS = void 0;
+exports.SettingsController = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
-exports.ALLOWED_SETTINGS = ['usage-analytics'];
-const isAllowedSetting = (arg) => {
-    return exports.ALLOWED_SETTINGS.includes(arg);
-};
+const manifest_1 = require("@forge/manifest");
+const environment_1 = require("../environment");
+const ALLOWED_SETTINGS = ['usage-analytics', 'default-environment'];
 class SettingsController {
-    constructor(settingsView, cachedConfigService) {
+    constructor(settingsView, cachedConfigService, getAppConfig, featureFlagService) {
         this.settingsView = settingsView;
         this.cachedConfigService = cachedConfigService;
+        this.getAppConfig = getAppConfig;
+        this.featureFlagService = featureFlagService;
         this.SETTINGS_MAP = {
-            'usage-analytics': [
-                cli_shared_1.Text.settings.usageAnalytics.description,
-                () => this.cachedConfigService.getAnalyticsPreferences(),
-                (value) => this.cachedConfigService.setAnalyticsPreferences(value)
-            ]
+            'usage-analytics': {
+                description: cli_shared_1.Text.settings.usageAnalytics.description,
+                get: () => this.cachedConfigService.getAnalyticsPreferences(),
+                set: (value) => {
+                    const parsedValue = this.parseBoolean(value);
+                    this.cachedConfigService.setAnalyticsPreferences(parsedValue);
+                },
+                display: (value) => value,
+                isAvailable: () => true
+            },
+            'default-environment': {
+                description: cli_shared_1.Text.settings.defaultEnvironment.description,
+                get: async () => {
+                    const appId = await this.getAppId();
+                    const environment = this.cachedConfigService.getDefaultEnvironment(appId);
+                    return environment ? (0, cli_shared_1.environmentToOption)(environment) : environment;
+                },
+                set: async (value) => {
+                    (0, environment_1.validateDevEnvironment)(value);
+                    const environment = (0, environment_1.checkEnvironmentOption)(value);
+                    const appId = await this.getAppId();
+                    this.cachedConfigService.setDefaultEnvironment(appId, environment);
+                },
+                display: (value) => cli_shared_1.Text.env.displayEnvironment(value, cli_shared_1.AppEnvironmentType.Development, cli_shared_1.environmentToOption),
+                isAvailable: async () => (await this.validateAppManifest()).success && (await this.featureFlagService.isConcurrentDevEnabled())
+            }
         };
     }
-    showSettings(json) {
-        const settings = exports.ALLOWED_SETTINGS.map((setting) => {
-            const [desc, getSetting] = this.SETTINGS_MAP[setting];
-            return [setting, desc, getSetting()];
-        });
-        this.settingsView.showSettings(settings, json);
+    async getAppId() {
+        const { id } = await this.getAppConfig();
+        return id;
+    }
+    async validateAppManifest() {
+        const fileValidator = new manifest_1.FileValidator();
+        return fileValidator.validate(manifest_1.MANIFEST_FILE);
     }
     parseBoolean(value) {
         switch (value) {
@@ -35,14 +58,47 @@ class SettingsController {
                 throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.set.invalidValue);
         }
     }
-    setSettings(preference, value) {
-        if (!isAllowedSetting(preference)) {
-            throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.set.invalidSetting(exports.ALLOWED_SETTINGS));
+    isAllowedSetting(preference) {
+        return ALLOWED_SETTINGS.includes(preference);
+    }
+    async getSetting(preference) {
+        if (!this.isAllowedSetting(preference)) {
+            return null;
+        }
+        const publicSettings = await this.getPublicSettings();
+        if (publicSettings.includes(preference)) {
+            return this.SETTINGS_MAP[preference];
+        }
+        return null;
+    }
+    async getPublicSettings() {
+        const settings = [];
+        for (const setting of ALLOWED_SETTINGS) {
+            if (await this.SETTINGS_MAP[setting].isAvailable()) {
+                settings.push(setting);
+            }
+        }
+        return settings;
+    }
+    async showSettings(json) {
+        const settings = [];
+        for (const settingName of ALLOWED_SETTINGS) {
+            const setting = await this.getSetting(settingName);
+            if (setting !== null) {
+                settings.push([settingName, setting.description, await setting.get()]);
+            }
+        }
+        this.settingsView.showSettings(settings, json);
+    }
+    async setSetting(preference, value) {
+        const setting = await this.getSetting(preference);
+        if (setting === null) {
+            const publicSettings = await this.getPublicSettings();
+            throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.set.invalidSetting(publicSettings));
         }
-        const parsedValue = this.parseBoolean(value);
-        const [, , setSetting] = this.SETTINGS_MAP[preference];
-        setSetting(parsedValue);
-        this.settingsView.setSuccess(preference, value);
+        await setting.set(value);
+        const displayValue = setting.display(value);
+        this.settingsView.setSuccess(preference, displayValue);
     }
 }
 exports.SettingsController = SettingsController;

package/out/command-line/dependency-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAGhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqTvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAGhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAIzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4TvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

package/out/command-line/dependency-injection.js

@@ -82,17 +82,17 @@ const getDependencies = async (cliDetails) => {
     const appConfigReader = (0, cli_shared_1.configFileReaderForSection)(cli_shared_1.appConfigKey, cli_shared_1.appConfigShape, configFile);
     const assertiveAppConfigReader = (0, cli_shared_1.assertiveAppConfigProvider)(appConfigReader);
     const appConfigWriter = (0, cli_shared_1.configFileWriterForSection)(cli_shared_1.appConfigKey, cli_shared_1.appConfigShape, configFile);
+    const credentialStore = (0, cli_shared_1.getCredentialStore)(ui);
+    const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
     const settingsView = new settings_view_1.SettingsView(ui);
-    const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService);
+    const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService, assertiveAppConfigReader, featureFlagService);
     const liteLintView = new lite_lint_view_1.LiteLintView(ui);
     const liteLintService = new lite_lint_service_1.LiteLintService();
     const analyticsSettingsView = new analytics_settings_view_1.AnalyticsSettingsView(ui);
     const preCommandController = new pre_command_controller_1.PreCommandController(liteLintService, liteLintView, configFile, cachedConfigService, analyticsSettingsView, settingsView);
     const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
-    const credentialStore = (0, cli_shared_1.getCredentialStore)(ui);
     const authenticator = new cli_shared_1.PersonalTokenAuthenticator(credentialStore);
     cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore);
-    const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
     await (0, sentry_1.initialiseSentry)(cachedConfigService);
     const createGraphQLClient = (auth) => {
         const minimalGraphQLRunner = new cli_shared_1.MinimalGraphQLRunner(auth, graphqlGateway, cliDetails);

package/out/command-line/environment.d.ts

@@ -1,3 +1,4 @@
 export declare const validateEnvironmentOption: (userValue: string) => string;
+export declare const validateDevEnvironment: (userValue: string) => string;
 export declare const checkEnvironmentOption: (userValue: string) => string;
 //# sourceMappingURL=environment.d.ts.map

package/out/command-line/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/command-line/environment.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB,cAAe,MAAM,KAAG,MAK7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,cAAe,MAAM,KAAG,MAE1D,CAAC"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/command-line/environment.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,yBAAyB,cAAe,MAAM,KAAG,MAK7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,cAAe,MAAM,KAAG,MAK1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,cAAe,MAAM,KAAG,MAE1D,CAAC"}

package/out/command-line/environment.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkEnvironmentOption = exports.validateEnvironmentOption = void 0;
+exports.checkEnvironmentOption = exports.validateDevEnvironment = exports.validateEnvironmentOption = void 0;
 const cli_shared_1 = require("@forge/cli-shared");
 const ENVIRONMENT_KEY_PATTERN = /^[a-zA-Z0-9-_]+$/;
 const validateEnvironmentOption = (userValue) => {
@@ -10,6 +10,13 @@ const validateEnvironmentOption = (userValue) => {
     return userValue;
 };
 exports.validateEnvironmentOption = validateEnvironmentOption;
+const validateDevEnvironment = (userValue) => {
+    if ([cli_shared_1.STAGING_ENVIRONMENT_KEY, cli_shared_1.PRODUCTION_ENVIRONMENT_KEY].includes(userValue)) {
+        throw new cli_shared_1.ValidationError(cli_shared_1.Text.env.developmentOnly(userValue, cli_shared_1.environmentToOption));
+    }
+    return userValue;
+};
+exports.validateDevEnvironment = validateDevEnvironment;
 const checkEnvironmentOption = (userValue) => {
     return (0, cli_shared_1.optionToEnvironment)((0, exports.validateEnvironmentOption)(userValue));
 };

package/out/command-line/index.d.ts

@@ -1,4 +1,4 @@
 import { Dependencies } from './dependency-injection';
-export declare function registerCommands(deps: Dependencies): void;
+export declare function registerCommands(deps: Dependencies): Promise<void>;
 export declare const main: () => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/out/command-line/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAelD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAiBzC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAoBvE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,iBAexD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAmBzC,CAAC"}

package/out/command-line/index.js

@@ -20,7 +20,7 @@ const register_providers_commands_1 = require("./register-providers-commands");
 const register_contributors_commands_1 = require("./register-contributors-commands");
 const register_environment_commands_1 = require("./register-environment-commands");
 const register_storage_commands_1 = require("./register-storage-commands");
-function registerCommands(deps) {
+async function registerCommands(deps) {
     (0, register_autocomplete_commands_1.registerCommands)(deps);
     (0, register_authentication_command_1.registerCommands)(deps);
     (0, register_app_commands_1.registerCommands)(deps);
@@ -32,7 +32,7 @@ function registerCommands(deps) {
     (0, register_tunnel_commands_1.registerCommands)(deps);
     (0, register_webtrigger_commands_1.registerCommands)(deps);
     (0, register_feedback_commands_1.registerCommands)(deps);
-    (0, register_settings_commands_1.registerCommands)(deps);
+    await (0, register_settings_commands_1.registerCommands)(deps);
     (0, register_providers_commands_1.registerCommands)(deps);
     (0, register_storage_commands_1.registerCommands)(deps);
 }
@@ -45,13 +45,15 @@ const registerEvents = ({ ui }) => {
 const main = async () => {
     const cliDetails = (0, version_info_1.getCLIDetails)();
     const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
-    registerCommands(deps);
     registerEvents(deps);
-    const { muaoEnabled, concurrentDevEnabled } = await deps.controllers.prerequisitesController.check();
-    if (muaoEnabled) {
+    const [, featureFlags] = await Promise.all([
+        registerCommands(deps),
+        deps.controllers.prerequisitesController.check()
+    ]);
+    if (featureFlags.muaoEnabled) {
         (0, register_contributors_commands_1.registerCommands)(deps);
     }
-    if (concurrentDevEnabled) {
+    if (featureFlags.concurrentDevEnabled) {
         (0, register_environment_commands_1.registerCommands)(deps);
     }
     await deps.cmd.parse(process.argv);

package/out/command-line/register-app-commands.d.ts

@@ -1,10 +1,10 @@
-import { CreateAppCommandResult, CommandLineUI, CreateAppCommand } from '@forge/cli-shared';
+import { CreateAppCommandResult, CommandLineUI, CreateAppCommand, FeatureFlagService } from '@forge/cli-shared';
 import { Dependencies } from './dependency-injection';
 export declare function directoryNameFromAppName(appName?: string): string | undefined;
 export interface CreateCommandHandlerOptions {
     template?: string;
     directory?: string;
 }
-export declare function createCommandHandler(ui: CommandLineUI, createAppCommand: CreateAppCommand, name: string, { template, directory }: CreateCommandHandlerOptions): Promise<CreateAppCommandResult>;
+export declare function createCommandHandler(ui: CommandLineUI, createAppCommand: CreateAppCommand, featureFlagService: FeatureFlagService, name: string, { template, directory }: CreateCommandHandlerOptions): Promise<CreateAppCommandResult>;
 export declare function registerCommands(deps: Dependencies): void;
 //# sourceMappingURL=register-app-commands.d.ts.map

package/out/command-line/register-app-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBtD,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAwFjC;AA0CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
+{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAEhB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBtD,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CAwGjC;AA+CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}

package/out/command-line/register-app-commands.js

@@ -12,6 +12,7 @@ var TemplateCategory;
     TemplateCategory["CUSTOM_UI"] = "Custom UI";
     TemplateCategory["BACKEND"] = "Triggers and Validators";
     TemplateCategory["UI_KIT"] = "UI kit";
+    TemplateCategory["UI_KIT_2"] = "UI kit 2 (Preview)";
 })(TemplateCategory || (TemplateCategory = {}));
 function ensureDirectoryDoesntExist(directory) {
     if (fs_1.default.existsSync(directory)) {
@@ -33,7 +34,7 @@ function directoryNameFromAppName(appName) {
     return allDashes ? undefined : normalized;
 }
 exports.directoryNameFromAppName = directoryNameFromAppName;
-async function createCommandHandler(ui, createAppCommand, name, { template, directory }) {
+async function createCommandHandler(ui, createAppCommand, featureFlagService, name, { template, directory }) {
     if (directory) {
         ensureDirectoryDoesntExist(directory);
         ui.info(cli_shared_2.Text.create.intro(directory));
@@ -61,25 +62,34 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
     if (!template) {
         ui.info(cli_shared_2.Text.create.overviewTemplates);
         const templates = await ui.displayTemporaryMessage(() => createAppCommand.getAvailableTemplates(), cli_shared_2.Text.create.waitTemplates);
-        const type = await ui.promptForList(cli_shared_2.Text.create.promptCategory, Object.values(TemplateCategory));
+        const enableCSUIK = await featureFlagService.readFlag('forge-cli-enable-csuik');
+        const type = await ui.promptForList(cli_shared_2.Text.create.promptCategory, Object.values(TemplateCategory).filter((category) => enableCSUIK || category !== TemplateCategory.UI_KIT_2));
         const filteredTemplates = type === TemplateCategory.SHOW_ALL
             ? templates
             : templates
                 .filter((name) => {
                 switch (type) {
                     case TemplateCategory.BACKEND:
-                        return !name.includes('ui-kit') && !name.includes('custom-ui') && name !== 'blank';
+                        return (!name.includes('ui-kit') &&
+                            !name.includes('csuik') &&
+                            !name.includes('custom-ui') &&
+                            name !== 'blank');
                     case TemplateCategory.CUSTOM_UI:
                         return name.includes('custom-ui');
                     case TemplateCategory.UI_KIT:
                         return name.includes('ui-kit');
+                    case TemplateCategory.UI_KIT_2:
+                        return name.includes('csuik');
                 }
             })
-                .map((name) => name.replace('-ui-kit', '').replace('-custom-ui', ''));
+                .map((name) => name.replace('-ui-kit', '').replace('-custom-ui', '').replace('-csuik', ''));
         template = await ui.promptForList(cli_shared_2.Text.create.promptTemplate, filteredTemplates);
         if (type === TemplateCategory.UI_KIT) {
             template = `${template}-ui-kit`;
         }
+        if (type === TemplateCategory.UI_KIT_2) {
+            template = `${template}-csuik`;
+        }
         if (type === TemplateCategory.CUSTOM_UI) {
             template = `${template}-custom-ui`;
         }
@@ -96,13 +106,13 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
     return result;
 }
 exports.createCommandHandler = createCommandHandler;
-function registerCreateCommands({ cmd, ui, commands: { createAppCommand } }) {
+function registerCreateCommands({ cmd, ui, commands: { createAppCommand }, services: { featureFlagService } }) {
     cmd
         .command('create [name]')
         .description(cli_shared_2.Text.create.cmd.desc)
         .option('-t, --template <template name>', cli_shared_2.Text.create.optionTemplate)
         .option('-d, --directory <directory name>', cli_shared_2.Text.create.optionDirectory)
-        .action((name, options) => createCommandHandler(ui, createAppCommand, name, options));
+        .action((name, options) => createCommandHandler(ui, createAppCommand, featureFlagService, name, options));
 }
 function registerRegisterCommand({ cmd, ui, commands: { registerAppCommand } }) {
     cmd

package/out/command-line/register-settings-commands.d.ts

@@ -1,3 +1,3 @@
 import { Dependencies } from './dependency-injection';
-export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
+export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => Promise<void>;
 //# sourceMappingURL=register-settings-commands.d.ts.map

package/out/command-line/register-settings-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgCtD,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,SAK9D,CAAC"}
+{"version":3,"file":"register-settings-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-settings-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAiCtD,eAAO,MAAM,gBAAgB,qBAA4B,YAAY,kBAKpE,CAAC"}

package/out/command-line/register-settings-commands.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCommands = void 0;
 const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
-const settings_controller_1 = require("./controller/settings-controller");
 const COMMAND_NAME = 'settings';
 const SHOW_COMMAND_NAME = 'list';
-const SET_COMMAND_NAME = 'set <setting> <boolean>';
+const SET_COMMAND_NAME = 'set <setting> <boolean|string>';
 const registerSettingsList = ({ cmd, controllers: { settingsController } }) => {
     cmd
         .command(SHOW_COMMAND_NAME)
@@ -15,25 +14,26 @@ const registerSettingsList = ({ cmd, controllers: { settingsController } }) => {
         .requireNoAnalyticsConsent()
         .jsonOption()
         .action(async ({ json }) => {
-        settingsController.showSettings(json);
+        await settingsController.showSettings(json);
         return { analytics: {} };
     });
 };
-const registerSettingsSet = ({ cmd, controllers: { settingsController } }) => {
+const registerSettingsSet = async ({ cmd, controllers: { settingsController } }) => {
+    const allowedSettings = await settingsController.getPublicSettings();
     cmd
         .command(SET_COMMAND_NAME)
-        .description(cli_shared_1.Text.settings.set.description(settings_controller_1.ALLOWED_SETTINGS))
+        .description(cli_shared_1.Text.settings.set.description(allowedSettings))
         .requireNoAuthentication()
         .requireNoAnalyticsConsent()
         .action(async (preference, value) => {
-        settingsController.setSettings(preference, value);
+        await settingsController.setSetting(preference, value);
         return { analytics: {} };
     });
 };
-const registerCommands = (_a) => {
+const registerCommands = async (_a) => {
     var { cmd } = _a, deps = tslib_1.__rest(_a, ["cmd"]);
     const preferences = cmd.command(COMMAND_NAME).requireNoAuthentication().description(cli_shared_1.Text.settings.description);
     registerSettingsList(Object.assign({ cmd: preferences }, deps));
-    registerSettingsSet(Object.assign({ cmd: preferences }, deps));
+    await registerSettingsSet(Object.assign({ cmd: preferences }, deps));
 };
 exports.registerCommands = registerCommands;

package/out/command-line/view/deploy-view.d.ts

@@ -6,6 +6,7 @@ export declare class DeployView {
     constructor(ui: UI);
     getLogger(): UI;
     displayStart(environment: string): void;
+    displayListAppInstallationsError(): void;
     displayLintRunning(): void;
     displayOutdatedInstallationsMessage(): void;
     displayIndexingCommand(environment: string): void;

package/out/command-line/view/deploy-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/deploy-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAA2D,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,SAAS,IAAI,EAAE;IAIf,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIvC,kBAAkB,IAAI,IAAI;IAI1B,mCAAmC,IAAI,IAAI;IAK3C,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKjD,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAKlD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI3C,qBAAqB,IAAI,IAAI;IAI7B,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAInG,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzD,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAI3E,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,wBAAwB,CACnC,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,qBAAqB,EACxE,wBAAwB,EAAE,OAAO,EACjC,cAAc,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAC9C,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}
+{"version":3,"file":"deploy-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/deploy-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAA2D,EAAE,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,qBAAa,UAAU;IACT,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,SAAS,IAAI,EAAE;IAIf,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIvC,gCAAgC,IAAI,IAAI;IAIxC,kBAAkB,IAAI,IAAI;IAI1B,mCAAmC,IAAI,IAAI;IAK3C,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKjD,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAKlD,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI3C,qBAAqB,IAAI,IAAI;IAI7B,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAInG,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzD,mCAAmC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAI3E,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,kCAAkC,IAAI,OAAO,CAAC,OAAO,CAAC;IAItD,wBAAwB,CACnC,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,qBAAqB,EACxE,wBAAwB,EAAE,OAAO,EACjC,cAAc,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAC9C,OAAO,CAAC,gBAAgB,CAAC;CAY7B"}

package/out/command-line/view/deploy-view.js

@@ -14,6 +14,9 @@ class DeployView {
     displayStart(environment) {
         this.ui.info(cli_shared_1.Text.deploy.cmd.start1(environment, cli_shared_1.environmentToOption));
     }
+    displayListAppInstallationsError() {
+        this.ui.info(cli_shared_1.Text.deploy.taskListInstallation.listInstallationError);
+    }
     displayLintRunning() {
         this.ui.info(cli_shared_1.Text.lint.running);
     }

package/out/command-line/view/settings-view.d.ts

@@ -1,5 +1,5 @@
 import { UI } from '@forge/cli-shared';
-declare type PreferenceValue = boolean | undefined;
+declare type PreferenceValue = string | boolean | undefined;
 export declare class SettingsView {
     private readonly ui;
     constructor(ui: UI);

package/out/command-line/view/settings-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7C,aAAK,eAAe,GAAG,OAAO,GAAG,SAAS,CAAC;AAE3C,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO;IAiB7E,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIjD"}
+{"version":3,"file":"settings-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/settings-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE7C,aAAK,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;AAEpD,qBAAa,YAAY;IACX,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAE5B,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO;IAiB7E,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAIjD"}

package/out/service/cached-config-service.d.ts

@@ -4,5 +4,8 @@ export declare class CachedConfigService {
     constructor(cachedConf: CachedConf);
     getAnalyticsPreferences(): boolean | undefined;
     setAnalyticsPreferences(preference: boolean): void;
+    private getDefaultEnvironments;
+    getDefaultEnvironment(appId: string): string | undefined;
+    setDefaultEnvironment(appId: string, preference: string): void;
 }
 //# sourceMappingURL=cached-config-service.d.ts.map

package/out/service/cached-config-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;CAG1D"}
+{"version":3,"file":"cached-config-service.d.ts","sourceRoot":"","sources":["../../src/service/cached-config-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO/C,qBAAa,mBAAmB;IAClB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,UAAU;IAE5C,uBAAuB,IAAI,OAAO,GAAG,SAAS;IAO9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;IAIzD,OAAO,CAAC,sBAAsB;IAIvB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMxD,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAKtE"}

package/out/service/cached-config-service.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CachedConfigService = void 0;
 const ANALYTICS_PREFERENCES_KEY = 'analytics-preferences';
+const DEFAULT_ENVIRONMENT_KEY = 'default-environment';
 class CachedConfigService {
     constructor(cachedConf) {
         this.cachedConf = cachedConf;
@@ -15,5 +16,17 @@ class CachedConfigService {
     setAnalyticsPreferences(preference) {
         this.cachedConf.set(ANALYTICS_PREFERENCES_KEY, preference);
     }
+    getDefaultEnvironments() {
+        return this.cachedConf.get(DEFAULT_ENVIRONMENT_KEY) || {};
+    }
+    getDefaultEnvironment(appId) {
+        const defaultEnvironments = this.getDefaultEnvironments();
+        return defaultEnvironments[appId];
+    }
+    setDefaultEnvironment(appId, preference) {
+        const defaultEnvironments = this.getDefaultEnvironments();
+        defaultEnvironments[appId] = preference;
+        this.cachedConf.set(DEFAULT_ENVIRONMENT_KEY, defaultEnvironments);
+    }
 }
 exports.CachedConfigService = CachedConfigService;

package/out/service/tunnel-service.d.ts.map

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

package/out/service/tunnel-service.js

@@ -159,7 +159,9 @@ class TunnelServiceBase {
     getVolumeOptions() {
         const options = [`-v=${CUR_WORK_APP_DIR || process.cwd()}:/app:cached`];
         if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
-            options.push(`-v=${(0, path_1.join)(__dirname, '../../../..')}:/monorepo:cached`);
+            const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
+            options.push(`-v=${monorepoRoot}:/monorepo:cached`);
+            options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
         }
         if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
             const mounts = process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES.split(',');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "6.10.0",
+  "version": "6.11.0-next.14",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,13 +18,13 @@
     "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
   },
   "dependencies": {
-    "@forge/bundler": "4.7.0",
-    "@forge/cli-shared": "3.11.2",
+    "@forge/bundler": "4.8.0-next.12",
+    "@forge/cli-shared": "3.12.0-next.7",
     "@forge/egress": "1.2.1",
-    "@forge/lint": "3.4.0",
-    "@forge/manifest": "4.12.0",
-    "@forge/runtime": "4.3.4",
-    "@forge/tunnel": "3.4.0",
+    "@forge/lint": "3.5.0-next.8",
+    "@forge/manifest": "4.13.0-next.4",
+    "@forge/runtime": "4.4.0-next.2",
+    "@forge/tunnel": "3.5.0-next.13",
     "@forge/util": "1.2.3",
     "@sentry/node": "^7.29.0",
     "ajv": "^6.12.6",