@forge/cli 6.14.1 → 6.15.0-next.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +561 -0
- package/npm-shrinkwrap.json +1764 -2396
- package/out/analytics-client/analytics-client.d.ts +1 -1
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/autocomplete/autocomplete-config.json +16 -0
- package/out/bin/postinstall.js +1 -2
- package/out/command-line/anon-user-id.js +1 -1
- package/out/command-line/command.d.ts +8 -8
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +8 -8
- package/out/command-line/controller/default-environment-controller.d.ts +2 -3
- package/out/command-line/controller/default-environment-controller.d.ts.map +1 -1
- package/out/command-line/controller/default-environment-controller.js +2 -8
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +3 -2
- package/out/command-line/controller/prerequisites-controller.d.ts +1 -10
- package/out/command-line/controller/prerequisites-controller.d.ts.map +1 -1
- package/out/command-line/controller/prerequisites-controller.js +1 -22
- package/out/command-line/controller/settings-controller.d.ts +3 -7
- package/out/command-line/controller/settings-controller.d.ts.map +1 -1
- package/out/command-line/controller/settings-controller.js +33 -50
- package/out/command-line/dependency-injection.d.ts +2 -2
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +3 -4
- package/out/command-line/index.d.ts +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +6 -12
- package/out/command-line/register-installation-commands.js +6 -6
- package/out/command-line/register-settings-commands.d.ts +1 -1
- package/out/command-line/register-settings-commands.d.ts.map +1 -1
- package/out/command-line/register-settings-commands.js +5 -5
- package/out/command-line/unique-machine-id.d.ts +0 -1
- package/out/command-line/unique-machine-id.d.ts.map +1 -1
- package/out/command-line/unique-machine-id.js +2 -3
- package/out/command-line/version-info.d.ts.map +1 -1
- package/out/command-line/version-info.js +2 -3
- package/out/command-line/view/install-view.d.ts.map +1 -1
- package/out/command-line/view/install-view.js +1 -1
- package/out/command-line/view/settings-view.d.ts +1 -1
- package/out/command-line/view/settings-view.d.ts.map +1 -1
- package/out/contributors/graphql-client.d.ts +0 -2
- package/out/contributors/graphql-client.d.ts.map +1 -1
- package/out/contributors/graphql-client.js +24 -16
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts +2 -2
- package/out/deploy/deployer/deploy-monitor-graphql-client.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.d.ts.map +1 -1
- package/out/deploy/deployer/deployer.js +2 -1
- package/out/environment/graphql-client.d.ts.map +1 -1
- package/out/environment/graphql-client.js +6 -0
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +8 -8
- package/out/installations/site-translation/bitbucket.js +1 -1
- package/out/installations/site-translation/cloudid-products.d.ts.map +1 -1
- package/out/installations/site-translation/cloudid-products.js +1 -1
- package/out/service/installation-service.js +1 -1
- package/out/service/migration-keys-service.d.ts +1 -1
- package/out/service/migration-keys-service.d.ts.map +1 -1
- package/out/service/tunnel-service.d.ts +1 -1
- package/out/service/tunnel-service.d.ts.map +1 -1
- package/out/workers/forge-cli-workers.js +1 -2
- package/out/workers/tunnel-clean-up-worker.d.ts +1 -1
- package/out/workers/tunnel-clean-up-worker.d.ts.map +1 -1
- package/package.json +24 -24
|
@@ -2,7 +2,7 @@ import { PersonalApiCredentialsValidated, Logger } from '@forge/cli-shared';
|
|
|
2
2
|
import { Storage } from '../storage/local-file-storage';
|
|
3
3
|
import { CachedConfigService } from '../service/cached-config-service';
|
|
4
4
|
import { DeferredErrors } from '../command-line/errors';
|
|
5
|
-
export
|
|
5
|
+
export type AttributeMapper<T> = (val: T) => T | undefined;
|
|
6
6
|
export declare class AnalyticsClientReporter {
|
|
7
7
|
private readonly storage;
|
|
8
8
|
private readonly logger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,
|
|
1
|
+
{"version":3,"file":"analytics-client.d.ts","sourceRoot":"","sources":["../../src/analytics-client/analytics-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI5E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AAW3D,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAFb,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,mBAAmB;IAGrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAEvC,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,+BAA+B,GAAG,MAAM,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAsBA,aAAa,CAClB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,EAAE,KAAK,GACP,IAAI;IAQA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GACjC,IAAI;IAIA,mBAAmB,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,+BAA+B,EAC9C,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAClC,CAAC,CAAC,EAAE,KAAK,GAAG,cAAc,GACzB,IAAI;IAQP,OAAO,CAAC,sBAAsB;IA6B9B,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;CAOtB"}
|
|
@@ -8,6 +8,14 @@
|
|
|
8
8
|
"requireUserArg": false
|
|
9
9
|
}
|
|
10
10
|
},
|
|
11
|
+
"contributors": {
|
|
12
|
+
"--verbose": {
|
|
13
|
+
"requireUserArg": false
|
|
14
|
+
},
|
|
15
|
+
"--help": {
|
|
16
|
+
"requireUserArg": false
|
|
17
|
+
}
|
|
18
|
+
},
|
|
11
19
|
"create": {
|
|
12
20
|
"--verbose": {
|
|
13
21
|
"requireUserArg": false
|
|
@@ -39,6 +47,14 @@
|
|
|
39
47
|
"requireUserArg": false
|
|
40
48
|
}
|
|
41
49
|
},
|
|
50
|
+
"environments": {
|
|
51
|
+
"--verbose": {
|
|
52
|
+
"requireUserArg": false
|
|
53
|
+
},
|
|
54
|
+
"--help": {
|
|
55
|
+
"requireUserArg": false
|
|
56
|
+
}
|
|
57
|
+
},
|
|
42
58
|
"feedback": {
|
|
43
59
|
"--verbose": {
|
|
44
60
|
"requireUserArg": false
|
package/out/bin/postinstall.js
CHANGED
|
@@ -7,10 +7,9 @@ const workers_starter_1 = require("../workers/workers-starter");
|
|
|
7
7
|
const version_info_1 = require("../command-line/version-info");
|
|
8
8
|
const anon_user_id_1 = require("../command-line/anon-user-id");
|
|
9
9
|
const isSupportedShell_1 = require("../autocomplete/isSupportedShell");
|
|
10
|
-
const unique_machine_id_1 = require("../command-line/unique-machine-id");
|
|
11
10
|
const cached_config_service_1 = require("../service/cached-config-service");
|
|
12
11
|
const ui = new cli_shared_1.CommandLineUI(() => true);
|
|
13
|
-
const cachedConf = cli_shared_1.CachedConf.getCache(
|
|
12
|
+
const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
|
|
14
13
|
const configService = new cached_config_service_1.CachedConfigService(cachedConf);
|
|
15
14
|
const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, configService);
|
|
16
15
|
const cliDetails = (0, version_info_1.getCLIDetails)();
|
|
@@ -6,7 +6,7 @@ const uuid_1 = tslib_1.__importDefault(require("uuid"));
|
|
|
6
6
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
7
7
|
const ANON_ID_CACHE_KEY = 'anonId';
|
|
8
8
|
function getAnonId(createNew = false) {
|
|
9
|
-
const cachedConf = cli_shared_1.CachedConf.getCache(
|
|
9
|
+
const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
|
|
10
10
|
return cachedConf.cached(ANON_ID_CACHE_KEY, () => {
|
|
11
11
|
if (!createNew) {
|
|
12
12
|
return undefined;
|
|
@@ -6,7 +6,7 @@ import { PreCommandController } from './controller/pre-command-controller';
|
|
|
6
6
|
import * as autocomplete from '../autocomplete/types';
|
|
7
7
|
import { StubController } from './controller/stubController';
|
|
8
8
|
import { DefaultEnvironmentController } from './controller/default-environment-controller';
|
|
9
|
-
|
|
9
|
+
type ActionResult = Promise<{
|
|
10
10
|
creds?: PersonalApiCredentialsValidated;
|
|
11
11
|
analytics: any;
|
|
12
12
|
} | void>;
|
|
@@ -15,8 +15,8 @@ export declare class WrapperError extends CommanderError {
|
|
|
15
15
|
constructor(error: CommanderError, commandName: string);
|
|
16
16
|
getCommandName: () => string;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
type AnyOpts = {};
|
|
19
|
+
type ParseOpts<OptsStr extends string, Default extends string | boolean | undefined = undefined> = OptsStr extends `-${infer _}, --${infer Rest}` ? ParseOpts<`--${Rest}`, Default> : OptsStr extends `--${infer Flag} [${infer _}...]` ? {
|
|
20
20
|
[k in CamelCase<Flag>]: [string] | Default;
|
|
21
21
|
} : OptsStr extends `--${infer Flag} <${infer _}...>` ? {
|
|
22
22
|
[k in CamelCase<Flag>]: [string] | Default;
|
|
@@ -31,13 +31,13 @@ declare type ParseOpts<OptsStr extends string, Default extends string | boolean
|
|
|
31
31
|
} : Default extends undefined ? {
|
|
32
32
|
[k in CamelCase<Flag>]?: boolean;
|
|
33
33
|
} : never : never;
|
|
34
|
-
export
|
|
34
|
+
export type DefaultOpts = {
|
|
35
35
|
verbose?: boolean;
|
|
36
36
|
};
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
37
|
+
type AnyArgs = string[];
|
|
38
|
+
type ParseArgs<ArgsStr extends string> = ArgsStr extends `${infer _} ${infer Rest}` ? [string, ...ParseArgs<Rest>] : [];
|
|
39
|
+
type ActionArgs<Args extends AnyArgs, Opts extends AnyOpts> = [...Args, Opts];
|
|
40
|
+
type PreconditionCallback<Args extends AnyArgs, Opts extends AnyOpts, MoreOpts> = (...args: ActionArgs<Args, Opts>) => Promise<MoreOpts>;
|
|
41
41
|
export declare class Command<Args extends AnyArgs = [], Opts extends AnyOpts = DefaultOpts> {
|
|
42
42
|
private readonly ui;
|
|
43
43
|
private readonly analyticsClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,EAAE,EAAE,cAAc,EAAU,MAAM,WAAW,CAAC;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAEL,MAAM,EAGN,UAAU,EAEV,gBAAgB,EAChB,+BAA+B,EAChC,MAAM,mBAAmB,CAAC;AAK3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,KAAK,YAAY,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/command-line/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,14 @@ function last(arg) {
|
|
|
23
23
|
return arg[arg.length - 1];
|
|
24
24
|
}
|
|
25
25
|
class Command {
|
|
26
|
+
get verbose() {
|
|
27
|
+
return this.cmd.opts().verbose;
|
|
28
|
+
}
|
|
29
|
+
static program(ui, analyticsClient, preCommandController, cliDetails, credentialStore, defaultEnvironmentController) {
|
|
30
|
+
var _a;
|
|
31
|
+
const cmd = new Command(ui, analyticsClient, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, {});
|
|
32
|
+
return cmd.version((_a = cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== null && _a !== void 0 ? _a : 'unknown', '--version').option('--verbose', cli_shared_1.Text.optionVerbose);
|
|
33
|
+
}
|
|
26
34
|
constructor(ui, analyticsClient, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, { cmd, analyticsName, requiresAuthentication, requiresAnalyticsConsent, requiredOptionFlags, preconditionFn }) {
|
|
27
35
|
this.ui = ui;
|
|
28
36
|
this.analyticsClient = analyticsClient;
|
|
@@ -128,14 +136,6 @@ class Command {
|
|
|
128
136
|
writeErr: () => { }
|
|
129
137
|
});
|
|
130
138
|
}
|
|
131
|
-
get verbose() {
|
|
132
|
-
return this.cmd.opts().verbose;
|
|
133
|
-
}
|
|
134
|
-
static program(ui, analyticsClient, preCommandController, cliDetails, credentialStore, defaultEnvironmentController) {
|
|
135
|
-
var _a;
|
|
136
|
-
const cmd = new Command(ui, analyticsClient, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, {});
|
|
137
|
-
return cmd.version((_a = cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version) !== null && _a !== void 0 ? _a : 'unknown', '--version').option('--verbose', cli_shared_1.Text.optionVerbose);
|
|
138
|
-
}
|
|
139
139
|
clone(overrides) {
|
|
140
140
|
return new Command(this.ui, this.analyticsClient, this.preCommandController, this.cliDetails, this.credentialStore, this.defaultEnvironmentController, Object.assign({ cmd: this.cmd, analyticsName: this.analyticsName, requiresAuthentication: this.requiresAuthentication, requiresAnalyticsConsent: this.requiresAnalyticsConsent, requiredOptionFlags: this.requiredOptionFlags, preconditionFn: this.preconditionFn }, overrides));
|
|
141
141
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AppConfigProvider, CredentialStore,
|
|
1
|
+
import { AppConfigProvider, CredentialStore, GetAppOwnerQuery, LoginCommand, UI } from '@forge/cli-shared';
|
|
2
2
|
import { CreateEnvironmentCommand } from '../../environment/create-environment';
|
|
3
3
|
import { ListEnvironmentCommand } from '../../environment/list-environment';
|
|
4
4
|
import { CachedConfigService } from '../../service/cached-config-service';
|
|
@@ -8,14 +8,13 @@ export declare class DefaultEnvironmentNotSetError extends Error {
|
|
|
8
8
|
export declare class DefaultEnvironmentController {
|
|
9
9
|
private ui;
|
|
10
10
|
private readonly credentialStore;
|
|
11
|
-
private readonly featureFlagService;
|
|
12
11
|
private readonly cachedConfigService;
|
|
13
12
|
private readonly getAppConfig;
|
|
14
13
|
private readonly loginCommand;
|
|
15
14
|
private readonly createEnvironmentCommand;
|
|
16
15
|
private readonly listEnvironmentCommand;
|
|
17
16
|
private readonly getAppOwnerQuery;
|
|
18
|
-
constructor(ui: UI, credentialStore: CredentialStore,
|
|
17
|
+
constructor(ui: UI, credentialStore: CredentialStore, cachedConfigService: CachedConfigService, getAppConfig: AppConfigProvider, loginCommand: LoginCommand, createEnvironmentCommand: CreateEnvironmentCommand, listEnvironmentCommand: ListEnvironmentCommand, getAppOwnerQuery: GetAppOwnerQuery);
|
|
19
18
|
run(nonInteractive?: boolean): Promise<string>;
|
|
20
19
|
getDefaultEnvironment(): Promise<string | undefined>;
|
|
21
20
|
private promptAndSetDefaultEnvironmentForContributor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-environment-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/default-environment-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,eAAe,EAEf,
|
|
1
|
+
{"version":3,"file":"default-environment-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/default-environment-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,eAAe,EAEf,gBAAgB,EAChB,YAAY,EAEZ,EAAE,EAEH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAG1E,qBAAa,6BAA8B,SAAQ,KAAK;;CAIvD;AAED,qBAAa,4BAA4B;IAErC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAPzB,EAAE,EAAE,EAAE,EACG,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB,EAC/B,YAAY,EAAE,YAAY,EAC1B,wBAAwB,EAAE,wBAAwB,EAClD,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,gBAAgB;IAGxC,GAAG,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAyB9C,qBAAqB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;YAYnD,4CAA4C;YAO5C,8BAA8B;YAgB9B,iBAAiB;YAKjB,+BAA+B;YAoB/B,8BAA8B;YAU9B,qBAAqB;CAKpC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DefaultEnvironmentController = exports.DefaultEnvironmentNotSetError = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
5
|
const environment_1 = require("../environment");
|
|
6
|
-
const manifest_1 = require("@forge/manifest");
|
|
7
6
|
const utils_1 = require("../utils");
|
|
8
7
|
class DefaultEnvironmentNotSetError extends Error {
|
|
9
8
|
constructor() {
|
|
@@ -12,10 +11,9 @@ class DefaultEnvironmentNotSetError extends Error {
|
|
|
12
11
|
}
|
|
13
12
|
exports.DefaultEnvironmentNotSetError = DefaultEnvironmentNotSetError;
|
|
14
13
|
class DefaultEnvironmentController {
|
|
15
|
-
constructor(ui, credentialStore,
|
|
14
|
+
constructor(ui, credentialStore, cachedConfigService, getAppConfig, loginCommand, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery) {
|
|
16
15
|
this.ui = ui;
|
|
17
16
|
this.credentialStore = credentialStore;
|
|
18
|
-
this.featureFlagService = featureFlagService;
|
|
19
17
|
this.cachedConfigService = cachedConfigService;
|
|
20
18
|
this.getAppConfig = getAppConfig;
|
|
21
19
|
this.loginCommand = loginCommand;
|
|
@@ -43,15 +41,11 @@ class DefaultEnvironmentController {
|
|
|
43
41
|
}
|
|
44
42
|
async getDefaultEnvironment() {
|
|
45
43
|
try {
|
|
46
|
-
const concurrentDevEnabled = await this.featureFlagService.isConcurrentDevEnabled();
|
|
47
|
-
if (!concurrentDevEnabled) {
|
|
48
|
-
return cli_shared_1.DEFAULT_ENVIRONMENT_KEY;
|
|
49
|
-
}
|
|
50
44
|
const { id: appId } = await this.getAppConfig();
|
|
51
45
|
return this.cachedConfigService.getDefaultEnvironment(appId);
|
|
52
46
|
}
|
|
53
47
|
catch (e) {
|
|
54
|
-
if (e instanceof cli_shared_1.
|
|
48
|
+
if (e instanceof cli_shared_1.InvalidManifestError) {
|
|
55
49
|
return undefined;
|
|
56
50
|
}
|
|
57
51
|
throw e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,iBAAiB,EAEjB,UAAU,EAEV,EAAE,
|
|
1
|
+
{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,iBAAiB,EAEjB,UAAU,EAEV,EAAE,EAQF,iBAAiB,EAElB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAA6B,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAYD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AASD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBANZ,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,iBAAiB;YAGpC,cAAc;YAmBd,gBAAgB;YAuChB,gBAAgB;YAMhB,aAAa;YAeb,gBAAgB;IAqB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4GnC,OAAO,CAAC,cAAc;YAMR,kBAAkB;CAYjC"}
|
|
@@ -60,7 +60,8 @@ class InstallController {
|
|
|
60
60
|
}
|
|
61
61
|
async promptForProduct() {
|
|
62
62
|
this.ui.info(cli_shared_1.Text.installationContext.overviewProduct);
|
|
63
|
-
|
|
63
|
+
const enableAtlas = await this.featureFlags.isAtlasProductSupported();
|
|
64
|
+
return await this.ui.promptForList(cli_shared_1.Text.installationContext.promptProduct, (0, cli_shared_1.getSupportedProducts)({ enableAtlas }));
|
|
64
65
|
}
|
|
65
66
|
async promptForSite(product) {
|
|
66
67
|
this.ui.info(cli_shared_1.Text.installationContext.overviewSite);
|
|
@@ -82,7 +83,7 @@ class InstallController {
|
|
|
82
83
|
const { site, product, environmentKey, environmentType } = await this.installView.promptForUpgrade(installations);
|
|
83
84
|
return {
|
|
84
85
|
site: (0, cli_shared_1.validateSite)(site, product),
|
|
85
|
-
product: (0, cli_shared_1.
|
|
86
|
+
product: (0, cli_shared_1.productDisplayName)(product),
|
|
86
87
|
environment: environmentKey,
|
|
87
88
|
environmentType
|
|
88
89
|
};
|
|
@@ -1,20 +1,11 @@
|
|
|
1
1
|
import { CLIDetails, FeatureFlagReader, Logger } from '@forge/cli-shared';
|
|
2
|
-
interface FeatureFlagValues {
|
|
3
|
-
muaoEnabled: boolean;
|
|
4
|
-
concurrentDevEnabled: boolean;
|
|
5
|
-
}
|
|
6
|
-
export declare type PrerequisitesCheckResult = FeatureFlagValues;
|
|
7
2
|
export declare class PrerequisitesController {
|
|
8
3
|
private readonly logger;
|
|
9
4
|
private readonly featureFlags;
|
|
10
5
|
private readonly cliDetails;
|
|
11
6
|
constructor(logger: Logger, featureFlags: FeatureFlagReader, cliDetails: CLIDetails | undefined);
|
|
12
|
-
check(): Promise<
|
|
13
|
-
private evaluateFeatureFlags;
|
|
7
|
+
check(): Promise<void>;
|
|
14
8
|
private checkNodeVersion;
|
|
15
9
|
private checkCustomWarning;
|
|
16
|
-
private checkMUAOEnabled;
|
|
17
|
-
private checkConcurrentDevelopmentEnabled;
|
|
18
10
|
}
|
|
19
|
-
export {};
|
|
20
11
|
//# sourceMappingURL=prerequisites-controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prerequisites-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/prerequisites-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAe,iBAAiB,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAI7F,
|
|
1
|
+
{"version":3,"file":"prerequisites-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/prerequisites-controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAe,iBAAiB,EAAE,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAI7F,qBAAa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,iBAAiB,EAC/B,UAAU,EAAE,UAAU,GAAG,SAAS;IAG/C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAId,gBAAgB;YAgBhB,kBAAkB;CAMjC"}
|
|
@@ -12,22 +12,7 @@ class PrerequisitesController {
|
|
|
12
12
|
this.cliDetails = cliDetails;
|
|
13
13
|
}
|
|
14
14
|
async check() {
|
|
15
|
-
|
|
16
|
-
this.checkNodeVersion(),
|
|
17
|
-
this.checkCustomWarning(),
|
|
18
|
-
this.evaluateFeatureFlags()
|
|
19
|
-
]);
|
|
20
|
-
return featureFlags;
|
|
21
|
-
}
|
|
22
|
-
async evaluateFeatureFlags() {
|
|
23
|
-
const [muaoEnabled, concurrentDevEnabled] = await Promise.all([
|
|
24
|
-
this.checkMUAOEnabled(),
|
|
25
|
-
this.checkConcurrentDevelopmentEnabled()
|
|
26
|
-
]);
|
|
27
|
-
return {
|
|
28
|
-
muaoEnabled,
|
|
29
|
-
concurrentDevEnabled
|
|
30
|
-
};
|
|
15
|
+
await Promise.all([this.checkNodeVersion(), this.checkCustomWarning()]);
|
|
31
16
|
}
|
|
32
17
|
async checkNodeVersion() {
|
|
33
18
|
const userNodeVersion = (0, getNodeVersion_1.getNodeVersion)();
|
|
@@ -44,11 +29,5 @@ class PrerequisitesController {
|
|
|
44
29
|
this.logger.warn(featureFlagValue);
|
|
45
30
|
}
|
|
46
31
|
}
|
|
47
|
-
async checkMUAOEnabled() {
|
|
48
|
-
return this.featureFlags.isMUAOEnabled();
|
|
49
|
-
}
|
|
50
|
-
async checkConcurrentDevelopmentEnabled() {
|
|
51
|
-
return this.featureFlags.isConcurrentDevEnabled();
|
|
52
|
-
}
|
|
53
32
|
}
|
|
54
33
|
exports.PrerequisitesController = PrerequisitesController;
|
|
@@ -1,20 +1,16 @@
|
|
|
1
1
|
import { CachedConfigService } from '../../service/cached-config-service';
|
|
2
2
|
import { SettingsView } from '../view/settings-view';
|
|
3
|
-
import { AppConfigProvider
|
|
3
|
+
import { AppConfigProvider } from '@forge/cli-shared';
|
|
4
4
|
export declare const DEFAULT_ENVIRONMENT_SETTING = "default-environment";
|
|
5
|
+
export declare const ALLOWED_SETTINGS: readonly ["usage-analytics", "default-environment"];
|
|
5
6
|
export declare class SettingsController {
|
|
6
7
|
private readonly settingsView;
|
|
7
8
|
private readonly cachedConfigService;
|
|
8
9
|
private readonly getAppConfig;
|
|
9
|
-
|
|
10
|
-
constructor(settingsView: SettingsView, cachedConfigService: CachedConfigService, getAppConfig: AppConfigProvider, featureFlagService: FeatureFlagService);
|
|
10
|
+
constructor(settingsView: SettingsView, cachedConfigService: CachedConfigService, getAppConfig: AppConfigProvider);
|
|
11
11
|
private SETTINGS_MAP;
|
|
12
|
-
private getAppId;
|
|
13
|
-
private validateAppManifest;
|
|
14
12
|
private parseBoolean;
|
|
15
13
|
private isAllowedSetting;
|
|
16
|
-
private getSetting;
|
|
17
|
-
getPublicSettings(): Promise<string[]>;
|
|
18
14
|
showSettings(json?: boolean): Promise<void>;
|
|
19
15
|
setSetting(preference: string, value: string): Promise<void>;
|
|
20
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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,EAMlB,MAAM,mBAAmB,CAAC;AAK3B,eAAO,MAAM,2BAA2B,wBAAwB,CAAC;AACjE,eAAO,MAAM,gBAAgB,qDAA4D,CAAC;AAY1F,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,iBAAiB;IAGlD,OAAO,CAAC,YAAY,CAuClB;IAEF,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,gBAAgB;IAIX,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;IAU3B,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAiB1D"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SettingsController = exports.DEFAULT_ENVIRONMENT_SETTING = void 0;
|
|
3
|
+
exports.SettingsController = exports.ALLOWED_SETTINGS = exports.DEFAULT_ENVIRONMENT_SETTING = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
5
|
const manifest_1 = require("@forge/manifest");
|
|
6
6
|
const environment_1 = require("../environment");
|
|
7
7
|
exports.DEFAULT_ENVIRONMENT_SETTING = 'default-environment';
|
|
8
|
-
|
|
8
|
+
exports.ALLOWED_SETTINGS = ['usage-analytics', exports.DEFAULT_ENVIRONMENT_SETTING];
|
|
9
9
|
class SettingsController {
|
|
10
|
-
constructor(settingsView, cachedConfigService, getAppConfig
|
|
10
|
+
constructor(settingsView, cachedConfigService, getAppConfig) {
|
|
11
11
|
this.settingsView = settingsView;
|
|
12
12
|
this.cachedConfigService = cachedConfigService;
|
|
13
13
|
this.getAppConfig = getAppConfig;
|
|
14
|
-
this.featureFlagService = featureFlagService;
|
|
15
14
|
this.SETTINGS_MAP = {
|
|
16
15
|
'usage-analytics': {
|
|
17
16
|
description: cli_shared_1.Text.settings.usageAnalytics.description,
|
|
@@ -19,36 +18,42 @@ class SettingsController {
|
|
|
19
18
|
set: (value) => {
|
|
20
19
|
const parsedValue = this.parseBoolean(value);
|
|
21
20
|
this.cachedConfigService.setAnalyticsPreferences(parsedValue);
|
|
22
|
-
}
|
|
23
|
-
isAvailable: () => true
|
|
21
|
+
}
|
|
24
22
|
},
|
|
25
23
|
'default-environment': {
|
|
26
24
|
description: cli_shared_1.Text.settings.defaultEnvironment.description,
|
|
27
25
|
get: async () => {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
26
|
+
try {
|
|
27
|
+
const { id: appId } = await this.getAppConfig();
|
|
28
|
+
const environment = this.cachedConfigService.getDefaultEnvironment(appId);
|
|
29
|
+
return environment ? (0, cli_shared_1.environmentToOption)(environment) : environment;
|
|
30
|
+
}
|
|
31
|
+
catch (e) {
|
|
32
|
+
if (e instanceof cli_shared_1.InvalidManifestError) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
throw e;
|
|
36
|
+
}
|
|
31
37
|
},
|
|
32
38
|
set: async (value) => {
|
|
33
39
|
(0, environment_1.validateDevEnvironment)(value);
|
|
34
40
|
const environment = (0, environment_1.checkEnvironmentOption)(value);
|
|
35
|
-
|
|
36
|
-
|
|
41
|
+
try {
|
|
42
|
+
const { id: appId } = await this.getAppConfig();
|
|
43
|
+
this.cachedConfigService.setDefaultEnvironment(appId, environment);
|
|
44
|
+
}
|
|
45
|
+
catch (e) {
|
|
46
|
+
if (e instanceof cli_shared_1.InvalidManifestError) {
|
|
47
|
+
throw new cli_shared_1.ValidationError(manifest_1.errors.missingManifest());
|
|
48
|
+
}
|
|
49
|
+
throw e;
|
|
50
|
+
}
|
|
37
51
|
},
|
|
38
52
|
getDisplayValue: (value) => cli_shared_1.Text.env.displayEnvironment(value, cli_shared_1.AppEnvironmentType.Development),
|
|
39
|
-
isAvailable: async () => (await this.validateAppManifest()).success && (await this.featureFlagService.isConcurrentDevEnabled()),
|
|
40
53
|
additionalInfo: cli_shared_1.Text.settings.defaultEnvironment.info
|
|
41
54
|
}
|
|
42
55
|
};
|
|
43
56
|
}
|
|
44
|
-
async getAppId() {
|
|
45
|
-
const { id } = await this.getAppConfig();
|
|
46
|
-
return id;
|
|
47
|
-
}
|
|
48
|
-
async validateAppManifest() {
|
|
49
|
-
const fileValidator = new manifest_1.FileValidator();
|
|
50
|
-
return fileValidator.validate(manifest_1.MANIFEST_FILE);
|
|
51
|
-
}
|
|
52
57
|
parseBoolean(value) {
|
|
53
58
|
switch (value) {
|
|
54
59
|
case 'true':
|
|
@@ -60,47 +65,25 @@ class SettingsController {
|
|
|
60
65
|
}
|
|
61
66
|
}
|
|
62
67
|
isAllowedSetting(preference) {
|
|
63
|
-
return ALLOWED_SETTINGS.includes(preference);
|
|
64
|
-
}
|
|
65
|
-
async getSetting(preference) {
|
|
66
|
-
if (!this.isAllowedSetting(preference)) {
|
|
67
|
-
return null;
|
|
68
|
-
}
|
|
69
|
-
const publicSettings = await this.getPublicSettings();
|
|
70
|
-
if (publicSettings.includes(preference)) {
|
|
71
|
-
return this.SETTINGS_MAP[preference];
|
|
72
|
-
}
|
|
73
|
-
return null;
|
|
74
|
-
}
|
|
75
|
-
async getPublicSettings() {
|
|
76
|
-
const settings = [];
|
|
77
|
-
for (const setting of ALLOWED_SETTINGS) {
|
|
78
|
-
if (await this.SETTINGS_MAP[setting].isAvailable()) {
|
|
79
|
-
settings.push(setting);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
return settings;
|
|
68
|
+
return exports.ALLOWED_SETTINGS.includes(preference);
|
|
83
69
|
}
|
|
84
70
|
async showSettings(json) {
|
|
85
71
|
const settings = [];
|
|
86
|
-
for (const settingName of ALLOWED_SETTINGS) {
|
|
87
|
-
const setting =
|
|
88
|
-
|
|
89
|
-
settings.push([settingName, setting.description, await setting.get()]);
|
|
90
|
-
}
|
|
72
|
+
for (const settingName of exports.ALLOWED_SETTINGS) {
|
|
73
|
+
const setting = this.SETTINGS_MAP[settingName];
|
|
74
|
+
settings.push([settingName, setting.description, await setting.get()]);
|
|
91
75
|
}
|
|
92
76
|
this.settingsView.showSettings(settings, json);
|
|
93
77
|
}
|
|
94
78
|
async setSetting(preference, value) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const publicSettings = await this.getPublicSettings();
|
|
98
|
-
throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.set.invalidSetting(publicSettings));
|
|
79
|
+
if (!this.isAllowedSetting(preference)) {
|
|
80
|
+
throw new cli_shared_1.ValidationError(cli_shared_1.Text.settings.set.invalidSetting(exports.ALLOWED_SETTINGS));
|
|
99
81
|
}
|
|
82
|
+
const setting = this.SETTINGS_MAP[preference];
|
|
83
|
+
await setting.set(value);
|
|
100
84
|
if (setting.additionalInfo) {
|
|
101
85
|
this.settingsView.showAdditionalInfo(setting.additionalInfo);
|
|
102
86
|
}
|
|
103
|
-
await setting.set(value);
|
|
104
87
|
const displayValue = setting.getDisplayValue ? setting.getDisplayValue(value) : value;
|
|
105
88
|
this.settingsView.setSuccess(preference, displayValue);
|
|
106
89
|
}
|
|
@@ -84,7 +84,7 @@ export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Pr
|
|
|
84
84
|
defaultEnvironmentController: DefaultEnvironmentController;
|
|
85
85
|
};
|
|
86
86
|
}>;
|
|
87
|
-
|
|
88
|
-
export
|
|
87
|
+
type PromiseType<T> = T extends Promise<infer R> ? R : any;
|
|
88
|
+
export type Dependencies = PromiseType<ReturnType<typeof getDependencies>>;
|
|
89
89
|
export {};
|
|
90
90
|
//# sourceMappingURL=dependency-injection.d.ts.map
|
|
@@ -1 +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,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,
|
|
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,EAGlB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAGnB,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;AAEhF,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,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;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,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;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAIhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8VvE,CAAC;AAGF,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
|
|
@@ -55,7 +55,6 @@ const lint_controller_1 = require("./controller/lint-controller");
|
|
|
55
55
|
const pre_command_controller_1 = require("./controller/pre-command-controller");
|
|
56
56
|
const settings_controller_1 = require("./controller/settings-controller");
|
|
57
57
|
const tunnel_controller_1 = require("./controller/tunnel-controller");
|
|
58
|
-
const unique_machine_id_1 = require("./unique-machine-id");
|
|
59
58
|
const analytics_settings_view_1 = require("./view/analytics-settings-view");
|
|
60
59
|
const deploy_view_1 = require("./view/deploy-view");
|
|
61
60
|
const install_view_1 = require("./view/install-view");
|
|
@@ -73,7 +72,7 @@ const default_environment_controller_1 = require("./controller/default-environme
|
|
|
73
72
|
const getDependencies = async (cliDetails) => {
|
|
74
73
|
let cmd;
|
|
75
74
|
const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
|
|
76
|
-
const cachedConf = cli_shared_1.CachedConf.getCache(
|
|
75
|
+
const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
|
|
77
76
|
const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
|
|
78
77
|
const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, cachedConfigService);
|
|
79
78
|
const workerInfo = (0, worker_info_1.getWorkerInfo)(cliDetails);
|
|
@@ -87,7 +86,7 @@ const getDependencies = async (cliDetails) => {
|
|
|
87
86
|
const credentialStore = (0, cli_shared_1.getCredentialStore)(ui);
|
|
88
87
|
const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
|
|
89
88
|
const settingsView = new settings_view_1.SettingsView(ui);
|
|
90
|
-
const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService, assertiveAppConfigReader
|
|
89
|
+
const settingsController = new settings_controller_1.SettingsController(settingsView, cachedConfigService, assertiveAppConfigReader);
|
|
91
90
|
const liteLintView = new lite_lint_view_1.LiteLintView(ui);
|
|
92
91
|
const liteLintService = new lite_lint_service_1.LiteLintService();
|
|
93
92
|
const analyticsSettingsView = new analytics_settings_view_1.AnalyticsSettingsView(ui);
|
|
@@ -188,7 +187,7 @@ const getDependencies = async (cliDetails) => {
|
|
|
188
187
|
const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, nodeTunnelService, localTunnelService, dockerTunnelService, tunnelView, configFile);
|
|
189
188
|
const stubController = new stubController_1.StubController();
|
|
190
189
|
const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, featureFlagService, cliDetails);
|
|
191
|
-
const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore,
|
|
190
|
+
const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, loginCommand, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
|
|
192
191
|
cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController);
|
|
193
192
|
return {
|
|
194
193
|
ui,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Dependencies } from './dependency-injection';
|
|
2
|
-
export declare function registerCommands(deps: Dependencies):
|
|
2
|
+
export declare function registerCommands(deps: Dependencies): void;
|
|
3
3
|
export declare const main: () => Promise<void>;
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +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,
|
|
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,QAiBlD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}
|
|
@@ -20,19 +20,21 @@ const register_providers_commands_1 = require("./register-providers-commands");
|
|
|
20
20
|
const register_contributors_commands_1 = require("./register-contributors-commands");
|
|
21
21
|
const register_environments_commands_1 = require("./register-environments-commands");
|
|
22
22
|
const register_storage_commands_1 = require("./register-storage-commands");
|
|
23
|
-
|
|
23
|
+
function registerCommands(deps) {
|
|
24
24
|
(0, register_autocomplete_commands_1.registerCommands)(deps);
|
|
25
25
|
(0, register_authentication_command_1.registerCommands)(deps);
|
|
26
26
|
(0, register_app_commands_1.registerCommands)(deps);
|
|
27
|
+
(0, register_contributors_commands_1.registerCommands)(deps);
|
|
27
28
|
(0, register_deployment_commands_1.registerCommands)(deps);
|
|
28
29
|
(0, register_installation_commands_1.registerCommands)(deps);
|
|
30
|
+
(0, register_environments_commands_1.registerCommands)(deps);
|
|
29
31
|
(0, register_environment_variables_commands_1.registerCommands)(deps);
|
|
30
32
|
(0, register_lint_command_1.registerCommands)(deps);
|
|
31
33
|
(0, register_log_commands_1.registerCommands)(deps);
|
|
32
34
|
(0, register_tunnel_commands_1.registerCommands)(deps);
|
|
33
35
|
(0, register_webtrigger_commands_1.registerCommands)(deps);
|
|
34
36
|
(0, register_feedback_commands_1.registerCommands)(deps);
|
|
35
|
-
|
|
37
|
+
(0, register_settings_commands_1.registerCommands)(deps);
|
|
36
38
|
(0, register_providers_commands_1.registerCommands)(deps);
|
|
37
39
|
(0, register_storage_commands_1.registerCommands)(deps);
|
|
38
40
|
}
|
|
@@ -46,16 +48,8 @@ const main = async () => {
|
|
|
46
48
|
const cliDetails = (0, version_info_1.getCLIDetails)();
|
|
47
49
|
const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
|
|
48
50
|
registerEvents(deps);
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
deps.controllers.prerequisitesController.check()
|
|
52
|
-
]);
|
|
53
|
-
if (featureFlags.muaoEnabled) {
|
|
54
|
-
(0, register_contributors_commands_1.registerCommands)(deps);
|
|
55
|
-
}
|
|
56
|
-
if (featureFlags.concurrentDevEnabled) {
|
|
57
|
-
(0, register_environments_commands_1.registerCommands)(deps);
|
|
58
|
-
}
|
|
51
|
+
registerCommands(deps);
|
|
52
|
+
await deps.controllers.prerequisitesController.check();
|
|
59
53
|
await deps.cmd.parse(process.argv);
|
|
60
54
|
};
|
|
61
55
|
exports.main = main;
|