@forge/cli 0.0.0-experimental-4515339 → 0.0.0-experimental-f85f9b1

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.
Files changed (47) hide show
  1. package/CHANGELOG.md +435 -6
  2. package/npm-shrinkwrap.json +2101 -2478
  3. package/out/autocomplete/autocomplete-config.json +7 -30
  4. package/out/command-line/command.d.ts +63 -44
  5. package/out/command-line/command.d.ts.map +1 -1
  6. package/out/command-line/command.js +140 -161
  7. package/out/command-line/controller/feedback-controller.d.ts +3 -3
  8. package/out/command-line/controller/feedback-controller.d.ts.map +1 -1
  9. package/out/command-line/controller/feedback-controller.js +3 -4
  10. package/out/command-line/controller/install-controller.d.ts +3 -2
  11. package/out/command-line/controller/install-controller.d.ts.map +1 -1
  12. package/out/command-line/controller/install-controller.js +9 -2
  13. package/out/command-line/dependency-injection.d.ts +1 -1
  14. package/out/command-line/dependency-injection.d.ts.map +1 -1
  15. package/out/command-line/dependency-injection.js +4 -4
  16. package/out/command-line/index.d.ts +1 -2
  17. package/out/command-line/index.d.ts.map +1 -1
  18. package/out/command-line/index.js +4 -24
  19. package/out/command-line/register-app-commands.d.ts +2 -2
  20. package/out/command-line/register-app-commands.d.ts.map +1 -1
  21. package/out/command-line/register-app-commands.js +3 -1
  22. package/out/command-line/register-authentication-command.d.ts +2 -2
  23. package/out/command-line/register-authentication-command.d.ts.map +1 -1
  24. package/out/command-line/register-authentication-command.js +2 -1
  25. package/out/command-line/register-contributors-commands.d.ts.map +1 -1
  26. package/out/command-line/register-contributors-commands.js +4 -1
  27. package/out/command-line/register-installation-commands.d.ts +9 -0
  28. package/out/command-line/register-installation-commands.d.ts.map +1 -1
  29. package/out/command-line/register-installation-commands.js +19 -6
  30. package/out/command-line/register-lint-command.d.ts +0 -1
  31. package/out/command-line/register-lint-command.d.ts.map +1 -1
  32. package/out/command-line/register-lint-command.js +1 -1
  33. package/out/command-line/register-log-commands.d.ts +1 -1
  34. package/out/command-line/register-log-commands.d.ts.map +1 -1
  35. package/out/command-line/register-log-commands.js +4 -6
  36. package/out/command-line/register-providers-commands.d.ts.map +1 -1
  37. package/out/command-line/register-providers-commands.js +2 -1
  38. package/out/command-line/sentry.d.ts +1 -1
  39. package/out/command-line/sentry.d.ts.map +1 -1
  40. package/out/command-line/view/install-view.d.ts +4 -3
  41. package/out/command-line/view/install-view.d.ts.map +1 -1
  42. package/out/command-line/view/install-view.js +10 -4
  43. package/out/service/cached-config-service.d.ts.map +1 -1
  44. package/out/service/cached-config-service.js +3 -0
  45. package/out/service/tunnel-service.d.ts.map +1 -1
  46. package/out/service/tunnel-service.js +2 -0
  47. package/package.json +20 -18
@@ -4,7 +4,6 @@ exports.main = exports.registerCommands = void 0;
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
5
  const dependency_injection_1 = require("./dependency-injection");
6
6
  const version_info_1 = require("./version-info");
7
- const command_1 = require("./command");
8
7
  const register_app_commands_1 = require("./register-app-commands");
9
8
  const register_authentication_command_1 = require("./register-authentication-command");
10
9
  const register_autocomplete_commands_1 = require("./register-autocomplete-commands");
@@ -19,18 +18,7 @@ const register_feedback_commands_1 = require("./register-feedback-commands");
19
18
  const register_settings_commands_1 = require("./register-settings-commands");
20
19
  const register_providers_commands_1 = require("./register-providers-commands");
21
20
  const register_contributors_commands_1 = require("./register-contributors-commands");
22
- const sortCommands = (cmd) => {
23
- cmd.getDefinedCommands().sort((a, b) => a.name().localeCompare(b.name()));
24
- cmd.getCommands().sort((a, b) => a.getCmdName().localeCompare(b.getCmdName()));
25
- };
26
- const registerCommands = (deps, cliDetails) => {
27
- if (cliDetails) {
28
- deps.cmd.version(cliDetails.version, '--version');
29
- }
30
- else {
31
- deps.cmd.version('unknown');
32
- }
33
- deps.cmd.option('--verbose', cli_shared_1.Text.optionVerbose);
21
+ function registerCommands(deps) {
34
22
  (0, register_autocomplete_commands_1.registerCommands)(deps);
35
23
  (0, register_authentication_command_1.registerCommands)(deps);
36
24
  (0, register_app_commands_1.registerCommands)(deps);
@@ -44,16 +32,9 @@ const registerCommands = (deps, cliDetails) => {
44
32
  (0, register_feedback_commands_1.registerCommands)(deps);
45
33
  (0, register_settings_commands_1.registerCommands)(deps);
46
34
  (0, register_providers_commands_1.registerCommands)(deps);
47
- sortCommands(deps.cmd);
48
- };
35
+ }
49
36
  exports.registerCommands = registerCommands;
50
- const registerEvents = ({ cmd, ui }) => {
51
- cmd.configureOutput({
52
- writeErr: () => { }
53
- });
54
- cmd.exitOverride((err) => {
55
- throw new command_1.WrapperError(err, 'cli');
56
- });
37
+ const registerEvents = ({ ui }) => {
57
38
  process.on('unhandledRejection', async (reason, promise) => {
58
39
  await (0, cli_shared_1.exitOnError)(ui, new Error(cli_shared_1.Text.error.unhandledRejection(reason, promise)));
59
40
  });
@@ -61,12 +42,11 @@ const registerEvents = ({ cmd, ui }) => {
61
42
  const main = async () => {
62
43
  const cliDetails = (0, version_info_1.getCLIDetails)();
63
44
  const deps = await (0, dependency_injection_1.getDependencies)(cliDetails);
64
- (0, exports.registerCommands)(deps, cliDetails);
45
+ registerCommands(deps);
65
46
  registerEvents(deps);
66
47
  const checkResult = await deps.controllers.prerequisitesController.check();
67
48
  if (checkResult.muaoEnabled) {
68
49
  (0, register_contributors_commands_1.registerCommands)(deps);
69
- sortCommands(deps.cmd);
70
50
  }
71
51
  await deps.cmd.parse(process.argv);
72
52
  };
@@ -2,8 +2,8 @@ import { CreateAppCommandResult, CommandLineUI, CreateAppCommand } from '@forge/
2
2
  import { Dependencies } from './dependency-injection';
3
3
  export declare function directoryNameFromAppName(appName?: string): string | undefined;
4
4
  export interface CreateCommandHandlerOptions {
5
- template: string;
6
- directory: string;
5
+ template?: string;
6
+ directory?: string;
7
7
  }
8
8
  export declare function createCommandHandler(ui: CommandLineUI, createAppCommand: CreateAppCommand, name: string, { template, directory }: CreateCommandHandlerOptions): Promise<CreateAppCommandResult>;
9
9
  export declare function registerCommands(deps: Dependencies): void;
@@ -1 +1 @@
1
- {"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,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,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;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,CAoFjC;AA0CD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
1
+ {"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAqB,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG/G,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,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"}
@@ -89,7 +89,9 @@ async function createCommandHandler(ui, createAppCommand, name, { template, dire
89
89
  }
90
90
  }
91
91
  ui.emptyLine();
92
- const result = await ui.displayProgress(() => createAppCommand.execute({ name, template, directory }), cli_shared_1.Text.create.cmd.start, cli_shared_1.Text.create.cmd.success(name));
92
+ directory = directory;
93
+ const args = { name, template, directory };
94
+ const result = await ui.displayProgress(() => createAppCommand.execute(args), cli_shared_1.Text.create.cmd.start, cli_shared_1.Text.create.cmd.success(name));
93
95
  ui.info(cli_shared_1.Text.create.cmd.successDetails(directory, cli_shared_2.VALID_ENVIRONMENT_OPTIONS));
94
96
  return result;
95
97
  }
@@ -2,8 +2,8 @@ import { PersonalApiCredentialsValidated } from '@forge/cli-shared';
2
2
  import { CommandLineUI, LoginCommand } from '@forge/cli-shared';
3
3
  import { Dependencies } from './dependency-injection';
4
4
  export interface LoginCommandOptions {
5
- email: string;
6
- token: string;
5
+ email?: string;
6
+ token?: string;
7
7
  }
8
8
  export declare function loginCommandHandler(ui: CommandLineUI, instructionsUrl: string, loginCommand: LoginCommand, { email, token }: LoginCommandOptions): Promise<{
9
9
  creds: PersonalApiCredentialsValidated;
@@ -1 +1 @@
1
- {"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,+BAA+B,EAIhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAQ,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,aAAa,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoCrH;AAiDD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}
1
+ {"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,+BAA+B,EAIhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAQ,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,aAAa,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAqCrH;AAiDD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}
@@ -29,7 +29,8 @@ async function loginCommandHandler(ui, instructionsUrl, loginCommand, { email, t
29
29
  token = await ui.promptForSecret(cli_shared_2.Text.login.promptToken);
30
30
  ui.emptyLine();
31
31
  }
32
- const { creds, analytics } = await ui.displayProgress(() => loginCommand.execute({ email, token }), cli_shared_2.Text.login.checking, (data) => cli_shared_2.Text.login.success(data.user.name));
32
+ const args = { email, token };
33
+ const { creds, analytics } = await ui.displayProgress(() => loginCommand.execute(args), cli_shared_2.Text.login.checking, (data) => cli_shared_2.Text.login.success(data.user.name));
33
34
  ui.emptyLine();
34
35
  ui.info(cli_shared_2.Text.login.nextStep);
35
36
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"register-contributors-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-contributors-commands.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA6KtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAOrD,CAAC"}
1
+ {"version":3,"file":"register-contributors-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-contributors-commands.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAgLtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAOrD,CAAC"}
@@ -29,12 +29,15 @@ const registerAddContributorCommand = (parent, { ui, commands: { addContributorC
29
29
  if (!confirmAddContributor) {
30
30
  ui.info(cli_shared_1.Text.addContributor.confirmationInfo);
31
31
  ui.emptyLine();
32
+ ui.info(cli_shared_1.Text.addContributor.learnMore);
33
+ ui.emptyLine();
32
34
  confirmAddContributor = await ui.confirm(cli_shared_1.Text.addContributor.promptConfirmation);
33
35
  if (confirmAddContributor)
34
36
  ui.emptyLine();
35
37
  }
38
+ const args = { email };
36
39
  if (confirmAddContributor) {
37
- await ui.displayProgress(() => addContributorCommand.execute({ email }), cli_shared_1.Text.addContributor.cmd.start, cli_shared_1.Text.addContributor.cmd.success);
40
+ await ui.displayProgress(() => addContributorCommand.execute(args), cli_shared_1.Text.addContributor.cmd.start, cli_shared_1.Text.addContributor.cmd.success);
38
41
  }
39
42
  });
40
43
  };
@@ -1,5 +1,14 @@
1
+ /// <reference types="node" />
2
+ import { URL } from 'url';
1
3
  import { Dependencies } from './dependency-injection';
2
4
  import { Installation } from '../service/installation-service';
5
+ export declare function validateContext({ site, product }: {
6
+ site?: string;
7
+ product?: string;
8
+ }): Promise<{
9
+ siteURL?: URL;
10
+ product?: string;
11
+ }>;
3
12
  export declare const performSingleUninstall: (installId: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
4
13
  export declare const performMultipleUninstalls: (appsToUninstall: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
5
14
  export declare const registerCommands: ({ cmd, ...deps }: Dependencies) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAqD/D,eAAO,MAAM,sBAAsB,cACtB,MAAM,6CAC0B,YAAY,kBAwBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBACnB,YAAY,EAAE,6CACY,YAAY,kBA+CxD,CAAC;AAgEF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
1
+ {"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAY1B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAK/D,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,OAAO,EACR,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,GAAG,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAW/C;AAoDD,eAAO,MAAM,sBAAsB,cACtB,MAAM,6CAC0B,YAAY,kBAwBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,oBACnB,YAAY,EAAE,6CACY,YAAY,kBA+CxD,CAAC;AAgEF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
@@ -1,22 +1,35 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.registerCommands = exports.performMultipleUninstalls = exports.performSingleUninstall = void 0;
3
+ exports.registerCommands = exports.performMultipleUninstalls = exports.performSingleUninstall = exports.validateContext = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const cli_shared_1 = require("@forge/cli-shared");
6
6
  const shared_1 = require("../installations/shared");
7
7
  const errors_1 = require("./errors");
8
8
  const COMMAND_NAME = 'install';
9
+ async function validateContext({ site, product }) {
10
+ if (product) {
11
+ product = (0, cli_shared_1.capitalizeProduct)(product);
12
+ if (!(0, cli_shared_1.isSupportedProduct)(product)) {
13
+ throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidProduct);
14
+ }
15
+ }
16
+ const siteURL = site ? (0, cli_shared_1.validateSite)(site, product) : undefined;
17
+ return { siteURL, product };
18
+ }
19
+ exports.validateContext = validateContext;
9
20
  const registerInstallAppCommand = ({ cmd, controllers: { installController } }) => {
10
21
  cmd
11
22
  .requireAppId()
12
23
  .environmentOption()
13
- .siteAndProductOption()
14
- .option('--upgrade', cli_shared_1.Text.install.optionUpgrade)
15
- .option('--confirm-scopes', cli_shared_1.Text.install.optionConfirmScopes)
24
+ .option('-s, --site [site]', cli_shared_1.Text.optionSite)
25
+ .option('-p, --product [product]', cli_shared_1.Text.optionProduct(cli_shared_1.SUPPORTED_PRODUCTS))
26
+ .precondition(validateContext)
27
+ .option('--upgrade', cli_shared_1.Text.install.optionUpgrade, false)
28
+ .option('--confirm-scopes', cli_shared_1.Text.install.optionConfirmScopes, false)
16
29
  .nonInteractiveOption('--site', '--product', '--environment')
17
30
  .description(cli_shared_1.Text.install.cmd.description)
18
- .action(async ({ environment, site, product, upgrade, confirmScopes, nonInteractive }) => {
19
- await installController.run({ environment, site, product, upgrade, confirmScopes, nonInteractive });
31
+ .action(async ({ environment, siteURL, product, upgrade, confirmScopes, nonInteractive }) => {
32
+ await installController.run({ environment, site: siteURL, product, upgrade, confirmScopes, nonInteractive });
20
33
  });
21
34
  };
22
35
  const LIST_COMMAND_NAME = 'list';
@@ -1,7 +1,6 @@
1
1
  import { Dependencies } from './dependency-injection';
2
2
  export interface LintActionParams {
3
3
  environment: string;
4
- directory: string;
5
4
  fix: boolean;
6
5
  }
7
6
  export declare const registerCommands: ({ cmd, controllers: { lintController } }: Dependencies) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"register-lint-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-lint-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,OAAO,CAAC;CACd;AAED,eAAO,MAAM,gBAAgB,6CAA8C,YAAY,KAAG,IAUzF,CAAC"}
1
+ {"version":3,"file":"register-lint-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-lint-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;CACd;AAED,eAAO,MAAM,gBAAgB,6CAA8C,YAAY,KAAG,IAUzF,CAAC"}
@@ -7,7 +7,7 @@ const registerCommands = ({ cmd, controllers: { lintController } }) => {
7
7
  .command('lint')
8
8
  .requireManifestFile()
9
9
  .description(cli_shared_1.Text.lint.cmd)
10
- .option('--fix', 'Attempt to automatically fix any issues encountered')
10
+ .option('--fix', 'Attempt to automatically fix any issues encountered', false)
11
11
  .environmentOption()
12
12
  .action(async ({ environment, fix }) => {
13
13
  await lintController.run(environment, fix);
@@ -1,4 +1,4 @@
1
1
  import { Dependencies } from './dependency-injection';
2
- export declare function parseSinceDateTime(dateTime: string | null): string | null;
2
+ export declare function parseSinceDateTime(dateTime: string | undefined): string | null;
3
3
  export declare const registerCommands: ({ cmd, ui, commands: { viewAppLogsCommand } }: Dependencies) => void;
4
4
  //# sourceMappingURL=register-log-commands.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"register-log-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAczE;AAwFD,eAAO,MAAM,gBAAgB,kDAAmD,YAAY,SAsC3F,CAAC"}
1
+ {"version":3,"file":"register-log-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-log-commands.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAc9E;AAwFD,eAAO,MAAM,gBAAgB,kDAAmD,YAAY,SAiC3F,CAAC"}
@@ -108,15 +108,14 @@ const registerCommands = ({ cmd, ui, commands: { viewAppLogsCommand } }) => {
108
108
  .description(cli_shared_3.Text.logs.cmd)
109
109
  .environmentOption()
110
110
  .option('-i, --invocation <invocation>', cli_shared_3.Text.logs.optionInvocation)
111
- .option('-n, --limit <limit>', cli_shared_3.Text.logs.optionLimit, parseLimit, DEFAULT_LIMIT)
111
+ .option('-n, --limit <limit>', cli_shared_3.Text.logs.optionLimit)
112
112
  .option('-s, --since <since>', cli_shared_3.Text.logs.optionSince)
113
- .option('-g, --grouped', cli_shared_3.Text.logs.optionGroup)
114
- .action(async ({ environment, site, product, invocation, limit, grouped, since }) => {
115
- const context = site && product ? { site, product } : undefined;
113
+ .option('-g, --grouped', cli_shared_3.Text.logs.optionGroup, false)
114
+ .action(async ({ environment, invocation, limit: limitStr, grouped, since }) => {
115
+ const limit = limitStr ? parseLimit(limitStr) : DEFAULT_LIMIT;
116
116
  if (invocation) {
117
117
  const log = await viewAppLogsCommand.getOne({
118
118
  environmentKey: environment,
119
- context,
120
119
  invocationId: invocation
121
120
  });
122
121
  logInvocation(ui, log, grouped);
@@ -128,7 +127,6 @@ const registerCommands = ({ cmd, ui, commands: { viewAppLogsCommand } }) => {
128
127
  }
129
128
  const logs = await viewAppLogsCommand.getAll({
130
129
  environmentKey: environment,
131
- context,
132
130
  limit,
133
131
  startTime
134
132
  });
@@ -1 +1 @@
1
- {"version":3,"file":"register-providers-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-providers-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA8DtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAErD,CAAC"}
1
+ {"version":3,"file":"register-providers-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-providers-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AA+DtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAErD,CAAC"}
@@ -35,7 +35,8 @@ const registerConfigureProviderCommand = ({ cmd, ui, commands: { configureProvid
35
35
  oauthClientSecret = await ui.promptForSecret(cli_shared_1.Text.configureProvider.promptClientSecret);
36
36
  ui.emptyLine();
37
37
  }
38
- await ui.displayProgress(() => configureProviderCommand.execute({ environment, providerKey, clientSecret: oauthClientSecret }), cli_shared_1.Text.configureProvider.cmd.start, cli_shared_1.Text.configureProvider.cmd.success);
38
+ const args = { environment, providerKey, clientSecret: oauthClientSecret };
39
+ await ui.displayProgress(() => configureProviderCommand.execute(args), cli_shared_1.Text.configureProvider.cmd.start, cli_shared_1.Text.configureProvider.cmd.success);
39
40
  });
40
41
  };
41
42
  const registerCommands = (deps) => {
@@ -1,4 +1,4 @@
1
1
  import { FeatureFlagService } from '@forge/cli-shared';
2
- import { CachedConfigService } from 'src/service/cached-config-service';
2
+ import { CachedConfigService } from '../service/cached-config-service';
3
3
  export declare function initialiseSentry(featureFlagSerive: FeatureFlagService, cachedConfigService: CachedConfigService): Promise<void>;
4
4
  //# sourceMappingURL=sentry.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sentry.d.ts","sourceRoot":"","sources":["../../src/command-line/sentry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAKxE,wBAAsB,gBAAgB,CACpC,iBAAiB,EAAE,kBAAkB,EACrC,mBAAmB,EAAE,mBAAmB,iBASzC"}
1
+ {"version":3,"file":"sentry.d.ts","sourceRoot":"","sources":["../../src/command-line/sentry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAKvE,wBAAsB,gBAAgB,CACpC,iBAAiB,EAAE,kBAAkB,EACrC,mBAAmB,EAAE,mBAAmB,iBASzC"}
@@ -1,4 +1,4 @@
1
- import { UI } from '@forge/cli-shared';
1
+ import { UI, FeatureFlagReader, UserError } from '@forge/cli-shared';
2
2
  import { AppEnvironmentPermissions, Installation } from '../../service/installation-service';
3
3
  interface InstallOrUpgradeCommandText {
4
4
  listScopes: (scopes: string[]) => string;
@@ -6,11 +6,12 @@ interface InstallOrUpgradeCommandText {
6
6
  permissionsMismatch: (environment: string) => string;
7
7
  promptForPermissionsConfirmation: (permissionsMismatchInDevelopment: boolean) => string;
8
8
  }
9
- export declare class NoScopesError extends Error {
9
+ export declare class NoScopesError extends UserError {
10
10
  }
11
11
  export declare class InstallView {
12
12
  private readonly ui;
13
- constructor(ui: UI);
13
+ private readonly featureFlags;
14
+ constructor(ui: UI, featureFlags: FeatureFlagReader);
14
15
  promptForPermissionsConfirmation({ scopes, egressAddresses, addedScopes }: AppEnvironmentPermissions, manifestScopes: string[], manifestEgressAddresses: string[], environment: string, confirmScopes: boolean, nonInteractive: boolean, text: InstallOrUpgradeCommandText): Promise<boolean>;
15
16
  promptForUpgrade(installations: Installation[]): Promise<Installation>;
16
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,EAAE,EAA8B,MAAM,mBAAmB,CAAC;AAIjH,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IACzC,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,aAAc,SAAQ,KAAK;CAAG;AAE3C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,yBAAyB,EACnE,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IAoCN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAqBpF"}
1
+ {"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,EAAE,EAEF,iBAAiB,EACjB,SAAS,EACV,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IACzC,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,aAAc,SAAQ,SAAS;CAAG;AAE/C,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAArC,EAAE,EAAE,EAAE,EAAmB,YAAY,EAAE,iBAAiB;IAExE,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,yBAAyB,EACnE,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,GAChC,OAAO,CAAC,OAAO,CAAC;IA2CN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;CAqBpF"}
@@ -4,22 +4,28 @@ exports.InstallView = exports.NoScopesError = void 0;
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
5
  const egress_1 = require("@forge/egress");
6
6
  const lodash_1 = require("lodash");
7
- class NoScopesError extends Error {
7
+ class NoScopesError extends cli_shared_1.UserError {
8
8
  }
9
9
  exports.NoScopesError = NoScopesError;
10
10
  class InstallView {
11
- constructor(ui) {
11
+ constructor(ui, featureFlags) {
12
12
  this.ui = ui;
13
+ this.featureFlags = featureFlags;
13
14
  }
14
15
  async promptForPermissionsConfirmation({ scopes, egressAddresses, addedScopes }, manifestScopes, manifestEgressAddresses, environment, confirmScopes, nonInteractive, text) {
15
- if (scopes.length === 0) {
16
+ const hasDefaultReadMeScope = await this.featureFlags.readMeScopeAddedByXLS();
17
+ if (hasDefaultReadMeScope && scopes.length === 0) {
16
18
  throw new NoScopesError();
17
19
  }
18
20
  if (addedScopes.length)
19
21
  this.ui.info(text.listScopes(addedScopes));
20
22
  if (egressAddresses.length)
21
23
  this.ui.info(text.listEgressAddresses(egressAddresses));
22
- const cleanedManifestScopes = [...new Set(['read:me', ...manifestScopes])];
24
+ const manifestScopesSet = new Set(manifestScopes);
25
+ if (hasDefaultReadMeScope) {
26
+ manifestScopesSet.add('read:me');
27
+ }
28
+ const cleanedManifestScopes = [...manifestScopesSet];
23
29
  const groupedManifestEgressAddresses = (0, egress_1.sortAndGroupEgressPermissionsByDomain)(manifestEgressAddresses);
24
30
  let permissionsMismatchWithManifest = false;
25
31
  if ((0, cli_shared_1.environmentToOption)(environment) === cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
@@ -1 +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;IAI9C,uBAAuB,CAAC,UAAU,EAAE,OAAO,GAAG,IAAI;CAG1D"}
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"}
@@ -7,6 +7,9 @@ class CachedConfigService {
7
7
  this.cachedConf = cachedConf;
8
8
  }
9
9
  getAnalyticsPreferences() {
10
+ if (process.env.FORGE_DISABLE_ANALYTICS) {
11
+ return false;
12
+ }
10
13
  return this.cachedConf.get(ANALYTICS_PREFERENCES_KEY);
11
14
  }
12
15
  setAnalyticsPreferences(preference) {
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"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"}
@@ -74,6 +74,8 @@ class TunnelServiceBase {
74
74
  '--rm',
75
75
  `--name`,
76
76
  exports.CONTAINER_NAME,
77
+ '--platform',
78
+ 'linux/amd64',
77
79
  `--env`,
78
80
  `APP_FOLDER=/app`,
79
81
  `--env`,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "0.0.0-experimental-4515339",
3
+ "version": "0.0.0-experimental-f85f9b1",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "UNLICENSED",
@@ -18,27 +18,29 @@
18
18
  "postinstall": "node -e \"process.exitCode = fs.existsSync('./out/bin/postinstall.js')\" || node ./out/bin/postinstall.js"
19
19
  },
20
20
  "dependencies": {
21
- "@forge/bundler": "0.0.0-experimental-4515339",
22
- "@forge/cli-shared": "3.5.1",
23
- "@forge/egress": "^0.0.0-experimental-4515339",
24
- "@forge/lint": "0.0.0-experimental-4515339",
25
- "@forge/manifest": "4.6.0",
26
- "@forge/runtime": "0.0.0-experimental-4515339",
27
- "@forge/tunnel": "0.0.0-experimental-4515339",
28
- "@forge/util": "1.2.0",
21
+ "@forge/bundler": "0.0.0-experimental-f85f9b1",
22
+ "@forge/cli-shared": "0.0.0-experimental-f85f9b1",
23
+ "@forge/egress": "1.1.2",
24
+ "@forge/lint": "0.0.0-experimental-f85f9b1",
25
+ "@forge/manifest": "0.0.0-experimental-f85f9b1",
26
+ "@forge/runtime": "4.2.0",
27
+ "@forge/tunnel": "0.0.0-experimental-f85f9b1",
28
+ "@forge/util": "1.2.1",
29
29
  "@sentry/node": "^7.29.0",
30
- "ajv": "^6.12.5",
30
+ "ajv": "^6.12.6",
31
31
  "archiver": "^5.2.0",
32
32
  "case": "^1.6.2",
33
+ "chalk": "^2.4.2",
33
34
  "cheerio": "^0.22.0",
34
35
  "cli-table3": "^0.6.1",
35
- "command-exists": "^1.2.8",
36
+ "command-exists": "^1.2.9",
36
37
  "commander": "^7.0.0",
37
38
  "cross-spawn": "^7.0.1",
38
39
  "dayjs": "^1.9.7",
39
40
  "didyoumean": "^1.2.1",
40
41
  "env-paths": "^2.2.0",
41
42
  "fs-extra": "^8.1.0",
43
+ "form-data": "^3.0.0",
42
44
  "hidefile": "^3.0.0",
43
45
  "latest-version": "^5.1.0",
44
46
  "lodash": "^4.17.20",
@@ -56,16 +58,16 @@
56
58
  },
57
59
  "devDependencies": {
58
60
  "@types/archiver": "^5.1.0",
59
- "@types/cheerio": "^0.22.21",
61
+ "@types/cheerio": "^0.22.31",
60
62
  "@types/command-exists": "^1.2.0",
61
- "@types/cross-spawn": "^6.0.1",
63
+ "@types/cross-spawn": "^6.0.2",
62
64
  "@types/didyoumean": "^1.2.0",
63
65
  "@types/fs-extra": "^8.0.1",
64
66
  "@types/hidefile": "^3.0.0",
65
- "@types/inquirer": "^8.2.5",
67
+ "@types/inquirer": "^8.2.6",
66
68
  "@types/jest": "^29.1.2",
67
69
  "@types/js-yaml": "^3.12.2",
68
- "@types/minimatch": "^3.0.3",
70
+ "@types/minimatch": "^3.0.5",
69
71
  "@types/mkdirp": "^1.0.0",
70
72
  "@types/node": "^12.12.63",
71
73
  "@types/node-fetch": "^2.5.7",
@@ -73,11 +75,11 @@
73
75
  "@types/semver": "^6.0.1",
74
76
  "@types/tmp": "^0.1.0",
75
77
  "@types/unzipper": "^0.10.1",
76
- "@types/uuid": "^3.4.7",
77
- "@types/webpack": "^5.28.0",
78
+ "@types/uuid": "^3.4.10",
78
79
  "jest": "^29.1.2",
79
80
  "jest-fixtures": "^0.6.0",
80
- "memfs": "^3.4.1"
81
+ "memfs": "^3.4.1",
82
+ "type-fest": "1.4.0"
81
83
  },
82
84
  "engines": {
83
85
  "node": ">=12.13.1"