@forge/cli 6.16.2 → 6.17.0

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 (9) hide show
  1. package/CHANGELOG.md +478 -0
  2. package/npm-shrinkwrap.json +482 -8152
  3. package/out/command-line/dependency-injection.d.ts.map +1 -1
  4. package/out/command-line/dependency-injection.js +5 -3
  5. package/out/command-line/register-authentication-command.js +2 -2
  6. package/out/command-line/version-info.js +1 -1
  7. package/out/migration-keys/graphql-client.d.ts.map +1 -1
  8. package/out/migration-keys/graphql-client.js +2 -3
  9. package/package.json +21 -21
package/out/command-line/dependency-injection.d.ts.map CHANGED
@@ -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,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"}
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgWvE,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"}
package/out/command-line/dependency-injection.js CHANGED
@@ -152,8 +152,10 @@ const getDependencies = async (cliDetails) => {
152
152
  const triggerDeployClient = new deploy_1.TriggerDeployGraphQLClient(graphQLClient);
153
153
  const archiveUploader = new deploy_1.AppArchiveUploader(assertiveAppConfigReader, uploaderArtifactClient, fileUploader, ui, new resources_uploader_service_1.ResourcesUploaderService(fileReader));
154
154
  const deployer = new deploy_1.ArtifactDeployer(assertiveAppConfigReader, triggerDeployClient, deployMonitorClient, cli_shared_1.pause, ui);
155
- const sandboxRuntimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, bundler_1.sandboxBundle);
156
- const nodeRuntimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, bundler_1.nodeBundle);
155
+ const sandboxBundle = (0, bundler_1.getSandboxBundler)();
156
+ const nodeBundle = (0, bundler_1.getNodeBundler)(await (0, bundler_1.getWrapperProvider)({ fileSystemReader: fileReader }));
157
+ const sandboxRuntimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, sandboxBundle);
158
+ const nodeRuntimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, nodeBundle);
157
159
  const nativeUiBundler = new nativeui_bundler_1.NativeUIBundler(ui, bundler_1.nativeUiBundle);
158
160
  const sandboxAppPackager = new deploy_1.AppPackager(sandboxRuntimeBundler, nativeUiBundler, ui);
159
161
  const nodeAppPackager = new deploy_1.AppPackager(nodeRuntimeBundler, nativeUiBundler, ui);
@@ -176,7 +178,7 @@ const getDependencies = async (cliDetails) => {
176
178
  const createSandbox = async (cfg) => new node_runtime_1.NodeSandbox(cfg);
177
179
  const functionHost = new tunnel_1.LocalFunctionHost(configFile, ui, null, createSandbox);
178
180
  const localInvocationService = new tunnel_1.LocalInvocationService(configFile, ui, runtime_1.notImplementedInspector);
179
- const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile), new tunnel_1.NgrokCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
181
+ const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader), new tunnel_1.NgrokCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
180
182
  const tunnelInteractor = new tunnel_1.TunnelInteractor(ui);
181
183
  const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
182
184
  const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails);
package/out/command-line/register-authentication-command.js CHANGED
@@ -43,8 +43,8 @@ async function loginCommandHandler(ui, instructionsUrl, loginCommand, { email, t
43
43
  }
44
44
  }
45
45
  exports.loginCommandHandler = loginCommandHandler;
46
- function registerLoginCommand({ cmd, ui, graphqlGateway, commands: { loginCommand } }) {
47
- const instructionsUrl = (0, cli_shared_1.getInstructionsUrl)(graphqlGateway);
46
+ function registerLoginCommand({ cmd, ui, commands: { loginCommand } }) {
47
+ const instructionsUrl = (0, cli_shared_1.getInstructionsUrl)();
48
48
  cmd
49
49
  .command('login')
50
50
  .description(cli_shared_2.Text.login.cmd)
package/out/command-line/version-info.js CHANGED
@@ -21,7 +21,7 @@ const getCLIDetails = () => {
21
21
  }
22
22
  };
23
23
  exports.getCLIDetails = getCLIDetails;
24
- const supportedNodeMajorVersions = [16, 18];
24
+ const supportedNodeMajorVersions = [18, 20];
25
25
  exports.semverSupportedNodeVersion = supportedNodeMajorVersions.map((v) => `${v}.x`).join(' || ');
26
26
  exports.humanReadableSupportedNodeVersion = supportedNodeMajorVersions
27
27
  .map((v) => `${v}.x`)
package/out/migration-keys/graphql-client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/migration-keys/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+C,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CA+CjH"}
1
+ {"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/migration-keys/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+D,MAAM,mBAAmB,CAAC;AAC/G,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,CAAC;CAiDjH"}
package/out/migration-keys/graphql-client.js CHANGED
@@ -8,6 +8,7 @@ class GraphqlClient {
8
8
  }
9
9
  async getLatestMigrationKeys(appId, environmentKey) {
10
10
  var _a, _b;
11
+ const marketplaceQuery = (0, cli_shared_1.getEnvironment)() == 'fex' ? '' : 'marketplaceApp { appKey }';
11
12
  const query = `
12
13
  query forge_cli_getMigrationKeys($id: ID!, $key: String!) {
13
14
  app(id: $id) {
@@ -25,9 +26,7 @@ class GraphqlClient {
25
26
  }
26
27
  }
27
28
  }
28
- marketplaceApp {
29
- appKey
30
- }
29
+ ${marketplaceQuery}
31
30
  }
32
31
  }
33
32
  `;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "6.16.2",
3
+ "version": "6.17.0",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "UNLICENSED",
@@ -18,18 +18,18 @@
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": "4.11.1",
22
- "@forge/cli-shared": "3.17.2",
23
- "@forge/egress": "1.2.3",
24
- "@forge/lint": "3.6.5",
25
- "@forge/manifest": "4.19.1",
26
- "@forge/node-runtime": "0.1.1",
27
- "@forge/runtime": "5.0.0",
28
- "@forge/tunnel": "3.6.6",
21
+ "@forge/bundler": "4.12.0",
22
+ "@forge/cli-shared": "3.18.0",
23
+ "@forge/egress": "1.2.4",
24
+ "@forge/lint": "3.6.6",
25
+ "@forge/manifest": "4.20.0",
26
+ "@forge/node-runtime": "0.1.2",
27
+ "@forge/runtime": "5.0.1",
28
+ "@forge/tunnel": "3.7.0",
29
29
  "@forge/util": "1.3.1",
30
- "@sentry/node": "^7.64.0",
31
- "ajv": "^6.12.6",
32
- "archiver": "^5.3.2",
30
+ "@sentry/node": "^7.66.0",
31
+ "ajv": "^8.12.0",
32
+ "archiver": "^6.0.1",
33
33
  "case": "^1.6.3",
34
34
  "chalk": "^2.4.2",
35
35
  "cheerio": "^0.22.0",
@@ -46,7 +46,7 @@
46
46
  "latest-version": "^6.0.0",
47
47
  "lodash": "^4.17.21",
48
48
  "mkdirp": "^1.0.4",
49
- "node-fetch": "2.6.13",
49
+ "node-fetch": "2.7.0",
50
50
  "node-machine-id": "^1.1.12",
51
51
  "omelette": "^0.4.17",
52
52
  "ora": "^4.1.1",
@@ -59,24 +59,24 @@
59
59
  },
60
60
  "devDependencies": {
61
61
  "@types/archiver": "^5.3.2",
62
- "@types/cheerio": "^0.22.31",
63
- "@types/command-exists": "^1.2.0",
64
- "@types/cross-spawn": "^6.0.2",
62
+ "@types/cheerio": "^0.22.32",
63
+ "@types/command-exists": "^1.2.1",
64
+ "@types/cross-spawn": "^6.0.3",
65
65
  "@types/didyoumean": "^1.2.0",
66
66
  "@types/fs-extra": "^8.1.2",
67
67
  "@types/hidefile": "^3.0.0",
68
68
  "@types/inquirer": "^8.2.6",
69
- "@types/jest": "^29.5.3",
69
+ "@types/jest": "^29.5.4",
70
70
  "@types/js-yaml": "^3.12.7",
71
71
  "@types/minimatch": "^3.0.5",
72
72
  "@types/mkdirp": "^1.0.2",
73
- "@types/node": "14.18.54",
73
+ "@types/node": "14.18.58",
74
74
  "@types/node-fetch": "^2.6.4",
75
75
  "@types/omelette": "^0.4.2",
76
- "@types/semver": "^7.5.0",
76
+ "@types/semver": "^7.5.1",
77
77
  "@types/tmp": "^0.2.3",
78
- "@types/uuid": "^3.4.10",
79
- "jest": "^29.6.3",
78
+ "@types/uuid": "^3.4.11",
79
+ "jest": "^29.6.4",
80
80
  "jest-fixtures": "^0.6.0",
81
81
  "jest-matcher-specific-error": "^1.0.0",
82
82
  "jest-when": "^3.6.0",