@forge/cli 12.7.0-next.5 → 12.7.1-next.10

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 (48) hide show
  1. package/CHANGELOG.md +233 -0
  2. package/npm-shrinkwrap.json +55 -64
  3. package/out/command-line/dependency-injection.d.ts.map +1 -1
  4. package/out/command-line/dependency-injection.js +1 -1
  5. package/out/command-line/dependency-injection.js.map +1 -1
  6. package/out/command-line/index.d.ts.map +1 -1
  7. package/out/command-line/index.js +3 -1
  8. package/out/command-line/index.js.map +1 -1
  9. package/out/command-line/register-app-commands.js +1 -1
  10. package/out/command-line/register-app-commands.js.map +1 -1
  11. package/out/command-line/register-containers-commands.d.ts.map +1 -1
  12. package/out/command-line/register-containers-commands.js +10 -69
  13. package/out/command-line/register-containers-commands.js.map +1 -1
  14. package/out/command-line/register-installation-commands.d.ts.map +1 -1
  15. package/out/command-line/register-installation-commands.js +2 -1
  16. package/out/command-line/register-installation-commands.js.map +1 -1
  17. package/out/command-line/register-repositories-commands.d.ts +3 -0
  18. package/out/command-line/register-repositories-commands.d.ts.map +1 -0
  19. package/out/command-line/register-repositories-commands.js +75 -0
  20. package/out/command-line/register-repositories-commands.js.map +1 -0
  21. package/out/command-line/register-tunnel-commands.d.ts +1 -1
  22. package/out/command-line/register-tunnel-commands.d.ts.map +1 -1
  23. package/out/command-line/register-tunnel-commands.js +10 -4
  24. package/out/command-line/register-tunnel-commands.js.map +1 -1
  25. package/out/command-line/uninstall-command-helpers.d.ts +1 -0
  26. package/out/command-line/uninstall-command-helpers.d.ts.map +1 -1
  27. package/out/command-line/uninstall-command-helpers.js +16 -1
  28. package/out/command-line/uninstall-command-helpers.js.map +1 -1
  29. package/out/custom-scopes/types.d.ts +2 -0
  30. package/out/custom-scopes/types.d.ts.map +1 -0
  31. package/out/custom-scopes/types.js +3 -0
  32. package/out/custom-scopes/types.js.map +1 -0
  33. package/out/custom-scopes/validate/index.d.ts +8 -0
  34. package/out/custom-scopes/validate/index.d.ts.map +1 -0
  35. package/out/custom-scopes/validate/index.js +24 -0
  36. package/out/custom-scopes/validate/index.js.map +1 -0
  37. package/out/custom-scopes/validate/schema.json +48 -0
  38. package/out/deploy/deployer/deployer.d.ts +3 -0
  39. package/out/deploy/deployer/deployer.d.ts.map +1 -1
  40. package/out/deploy/deployer/deployer.js +11 -2
  41. package/out/deploy/deployer/deployer.js.map +1 -1
  42. package/out/service/installation-service.d.ts.map +1 -1
  43. package/out/service/installation-service.js +5 -2
  44. package/out/service/installation-service.js.map +1 -1
  45. package/out/service/tunnel-service.d.ts.map +1 -1
  46. package/out/service/tunnel-service.js +3 -1
  47. package/out/service/tunnel-service.js.map +1 -1
  48. package/package.json +16 -12
package/out/deploy/deployer/deployer.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ArtifactDeployer = exports.ExistingInstallationsError = exports.ManifestValidationFailedError = exports.HostedResourceDeploymentFailedError = exports.AppDeploymentFailedError = void 0;
3
+ exports.ArtifactDeployer = exports.CustomScopesUnavailableError = exports.ExistingInstallationsError = exports.ManifestValidationFailedError = exports.HostedResourceDeploymentFailedError = exports.AppDeploymentFailedError = void 0;
4
4
  const cli_shared_1 = require("@forge/cli-shared");
5
5
  const DEPLOYMENT_EVENT_POLL_INTERVAL = 500;
6
6
  class AppDeploymentFailedError extends cli_shared_1.BaseError {
@@ -42,6 +42,12 @@ class ExistingInstallationsError extends cli_shared_1.BaseError {
42
42
  }
43
43
  }
44
44
  exports.ExistingInstallationsError = ExistingInstallationsError;
45
+ class CustomScopesUnavailableError extends cli_shared_1.UserError {
46
+ constructor(requestId, message) {
47
+ super(`${message} (requestId: ${requestId})`, requestId);
48
+ }
49
+ }
50
+ exports.CustomScopesUnavailableError = CustomScopesUnavailableError;
45
51
  function isTransitionEvent(event) {
46
52
  return event.__typename === 'AppDeploymentTransitionEvent';
47
53
  }
@@ -157,7 +163,7 @@ class ArtifactDeployer {
157
163
  throw new ExistingInstallationsError(true, requestId, cli_shared_1.Text.deploy.crossContext.enableError);
158
164
  }
159
165
  }
160
- break;
166
+ throw new AppDeploymentFailedError(true, requestId, cli_shared_1.Text.config.manifest.error(causeMessage));
161
167
  }
162
168
  case 'HOSTED_RESOURCE_TOO_MANY_FILES':
163
169
  case 'HOSTED_RESOURCE_ZIP_TOO_BIG':
@@ -183,6 +189,9 @@ class ArtifactDeployer {
183
189
  }
184
190
  throw new ManifestValidationFailedError(requestId, cli_shared_1.Text.config.manifest.error(message));
185
191
  }
192
+ case 'CUSTOM_SCOPES_NOT_AVAILABLE': {
193
+ throw new CustomScopesUnavailableError(requestId, cli_shared_1.Text.customScopes.deploy.errors.notAvailable);
194
+ }
186
195
  }
187
196
  }
188
197
  throw new AppDeploymentFailedError(false, requestId, cli_shared_1.Text.deploy.taskDeploy.serverStepFailed);
package/out/deploy/deployer/deployer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deployer.js","sourceRoot":"","sources":["../../../src/deploy/deployer/deployer.ts"],"names":[],"mappings":"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"}
package/out/service/installation-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"installation-service.d.ts","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
package/out/service/installation-service.js CHANGED
@@ -42,8 +42,11 @@ class InstallationService {
42
42
  return this.comparePossibleInstallations(filterSite.host, installationSite);
43
43
  }
44
44
  filterInstallations(installations, { site: filterSite, product: filterProduct, environment: filterEnvironment }) {
45
- return installations.filter(({ product, site, environmentKey }) => {
46
- const matchProduct = !filterProduct || filterProduct === (0, cli_shared_1.productDisplayName)(product);
45
+ return installations.filter(({ product, secondaryProducts, site, environmentKey }) => {
46
+ const matchRequired = filterProduct === (0, cli_shared_1.productDisplayName)(product);
47
+ const matchOptional = secondaryProducts &&
48
+ secondaryProducts.some((secondaryProduct) => filterProduct === (0, cli_shared_1.productDisplayName)(secondaryProduct));
49
+ const matchProduct = !filterProduct || matchRequired || matchOptional;
47
50
  const matchSite = !filterSite || this.matchSiteForProduct(filterSite, site, product);
48
51
  const matchEnvironment = !filterEnvironment || filterEnvironment === (0, cli_shared_1.optionToEnvironment)(environmentKey);
49
52
  return matchProduct && matchSite && matchEnvironment;
package/out/service/installation-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"installation-service.js","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"installation-service.js","sourceRoot":"","sources":["../../src/service/installation-service.ts"],"names":[],"mappings":"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"}
package/out/service/tunnel-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAgB9D"}
1
+ {"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB9D"}
package/out/service/tunnel-service.js CHANGED
@@ -65,7 +65,9 @@ class InProcessTunnelService {
65
65
  const tunnel = await this.startTunnelCommand.execute({
66
66
  environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
67
67
  resourcePortMap,
68
- host: 'localhost'
68
+ host: 'localhost',
69
+ url: tunnelOptions.url,
70
+ port: tunnelOptions.localPort
69
71
  }, tunnelOptions.containersDockerComposeFiles);
70
72
  const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
71
73
  const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
package/out/service/tunnel-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,OAAe;QACzB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,mCAAoC,SAAQ,sBAAS;IAChE,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAC9F,CAAC;CACF;AAJD,kFAIC;AAED,MAAa,wBAAyB,SAAQ,sBAAS;IACrD,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,+BAA+B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAChG,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,2BAA4B,SAAQ,sBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,kEAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAClD;YACE,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;SAClB,EACD,aAAa,CAAC,4BAA4B,CAC3C,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACF;AAvBD,wDAuBC"}
1
+ {"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,OAAe;QACzB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,mCAAoC,SAAQ,sBAAS;IAChE,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAC9F,CAAC;CACF;AAJD,kFAIC;AAED,MAAa,wBAAyB,SAAQ,sBAAS;IACrD,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,+BAA+B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAChG,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,2BAA4B,SAAQ,sBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,kEAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAClD;YACE,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,EACD,aAAa,CAAC,4BAA4B,CAC3C,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACF;AAzBD,wDAyBC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/cli",
3
- "version": "12.7.0-next.5",
3
+ "version": "12.7.1-next.10",
4
4
  "description": "A command line interface for managing Atlassian-hosted apps",
5
5
  "author": "Atlassian",
6
6
  "license": "SEE LICENSE IN LICENSE.txt",
@@ -9,24 +9,27 @@
9
9
  },
10
10
  "homepage": "https://developer.atlassian.com/platform/forge",
11
11
  "scripts": {
12
- "build": "yarn run clean && yarn run compile",
12
+ "prebuild": "yarn run clean && yarn run generate:custom-scopes-schema && yarn run generate:custom-scopes-types",
13
+ "build": "yarn run compile",
13
14
  "clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo",
14
15
  "compile": "tsc -b -v",
15
16
  "dev": "NODE_ENV=development ts-node src/bin/cli.ts",
16
17
  "inspect": "node -r ts-node/register --inspect-brk src/bin/cli.ts",
17
18
  "postbuild": "chmod +x out/bin/*.js && ts-node scripts/configureAutocomplete.ts",
18
- "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
19
+ "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\"",
20
+ "generate:custom-scopes-schema": "yaml -1js --indent 2 < src/custom-scopes/validate/schema.yaml > src/custom-scopes/validate/schema.json",
21
+ "generate:custom-scopes-types": "json2ts --input src/custom-scopes/validate/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
19
22
  },
20
23
  "dependencies": {
21
- "@forge/bundler": "6.1.9-next.5",
22
- "@forge/cli-shared": "8.8.0-next.3",
23
- "@forge/egress": "2.1.0-next.0",
24
- "@forge/lint": "5.11.5-next.5",
25
- "@forge/manifest": "10.7.0-next.1",
24
+ "@forge/bundler": "6.1.10-next.9",
25
+ "@forge/cli-shared": "8.8.1-next.5",
26
+ "@forge/egress": "2.1.1-next.0",
27
+ "@forge/lint": "5.11.6-next.9",
28
+ "@forge/manifest": "10.8.0-next.5",
26
29
  "@forge/i18n": "0.0.7",
27
- "@forge/runtime": "6.1.0-next.0",
28
- "@forge/tunnel": "6.3.0-next.5",
29
- "@forge/util": "2.0.0",
30
+ "@forge/runtime": "6.1.1-next.0",
31
+ "@forge/tunnel": "6.3.1-next.9",
32
+ "@forge/util": "2.0.1-next.0",
30
33
  "@sentry/node": "7.106.0",
31
34
  "ajv": "^8.12.0",
32
35
  "archiver": "^7.0.1",
@@ -86,7 +89,8 @@
86
89
  "memfs": "^4.6.0",
87
90
  "sentry-testkit": "^5.0.10",
88
91
  "type-fest": "4.10.2",
89
- "yaml": "^2.3.4"
92
+ "yaml": "^2.3.4",
93
+ "json-schema-to-typescript": "^10.1.5"
90
94
  },
91
95
  "engines": {
92
96
  "node": ">=20.0.0"