npm package diff
Package: @forge/cli
Versions: 12.2.0 - 12.2.0-experimental-959d7b9
File: package/out/command-line/controller/install-controller.js
Index: package/out/command-line/controller/install-controller.js
===================================================================
--- package/out/command-line/controller/install-controller.js
+++ package/out/command-line/controller/install-controller.js
@@ -191,9 +191,9 @@
site = site ? site : await this.promptForSite(products);
this.ui.info(this.supportedProductsService.isWorkspaceProduct(products[0]) ? text.bannerWorkspace : text.bannerSite);
}
else {
- const result = await this.getXPAProductsAndSite(requiredProducts.map(cli_shared_1.productDisplayName), products, site);
+ const result = await this.getXPAProductsAndSite(requiredProducts.map(cli_shared_1.productDisplayName), products, site, environment);
site = result.site;
products = result.products;
this.ui.info(cli_shared_1.Text.install.installConfirmation(products.join(', '), site.host));
}
@@ -291,14 +291,15 @@
const manifestEgressAddresses = (0, cli_shared_1.flatMap)(manifestEgressEntries, ({ domains }) => domains ?? []);
const manifestScopes = new Set(this.getAllScopeKeys(permissions?.scopes ?? []));
return { manifestEgressAddresses, manifestScopes };
};
- getXPAProductsAndSite = async (requiredProducts, products, site) => {
+ getXPAProductsAndSite = async (requiredProducts, products, site, environmentKey) => {
site = site ? site : await this.promptForSite([]);
- const { installations } = (await this.installationService.listAppInstallations({
+ const { installations = [] } = await this.installationService.listAppInstallations({
site,
+ ...(environmentKey && { environment: environmentKey }),
...(requiredProducts.length > 0 && { product: requiredProducts[0] })
- })) ?? [];
+ });
if (!products?.length) {
const hasRequiredInstallations = this.checkRequiredInstallationExists(installations, site.host, requiredProducts);
if (hasRequiredInstallations) {
this.ui.info(cli_shared_1.Text.install.alreadyInstalledInRequiredProduct(requiredProducts[0]));