@forge/cli
14.1.0-next.1-experimental-13c2f8d14.1.0-next.21-experimental-554d417
out/command-line/dependency-injection.js~
out/command-line/dependency-injection.jsModified+11−16
Index: package/out/command-line/dependency-injection.js
===================================================================
--- package/out/command-line/dependency-injection.js
+++ package/out/command-line/dependency-injection.js
@@ -2,10 +2,8 @@
Object.defineProperty(exports, "__esModule", { value: true });
exports.getDependencies = void 0;
const tslib_1 = require("tslib");
const bundler_1 = require("@forge/bundler");
-const path_1 = tslib_1.__importDefault(require("path"));
-const env_paths_1 = tslib_1.__importDefault(require("env-paths"));
const cli_shared_1 = require("@forge/cli-shared");
const tunnel_1 = require("@forge/tunnel");
const tunnel_2 = require("@forge/tunnel");
const analytics_client_1 = require("../analytics-client/analytics-client");
@@ -40,10 +38,8 @@
const tunnel_service_1 = require("../service/tunnel-service");
const migration_keys_service_1 = require("../service/migration-keys-service");
const custom_entities_service_1 = require("../service/custom-entities-service");
const extensions_service_1 = require("../service/extensions-service");
-const local_storage_lifecycle_1 = require("../service/local-storage-lifecycle");
-const local_storage_service_1 = require("../service/local-storage-service");
const local_file_storage_1 = require("../storage/local-file-storage");
const get_webtrigger_url_1 = require("../webtrigger/get-webtrigger-url");
const list_webtrigger_urls_1 = require("../webtrigger/list-webtrigger-urls");
const delete_webtrigger_url_1 = require("../webtrigger/delete-webtrigger-url");
@@ -53,16 +49,19 @@
const autocomplete_controller_1 = require("./controller/autocomplete-controller");
const deploy_controller_1 = require("./controller/deploy-controller");
const feedback_controller_1 = require("./controller/feedback-controller");
const install_controller_1 = require("./controller/install-controller");
+const global_install_controller_1 = require("./controller/global-install-controller");
const lint_controller_1 = require("./controller/lint-controller");
const pre_command_controller_1 = require("./controller/pre-command-controller");
const settings_controller_1 = require("./controller/settings-controller");
const tunnel_controller_1 = require("./controller/tunnel-controller");
const assistant_controller_1 = require("./controller/assistant-controller");
const analytics_settings_view_1 = require("./view/analytics-settings-view");
const deploy_view_1 = require("./view/deploy-view");
const install_view_1 = require("./view/install-view");
+const global_install_view_1 = require("./view/global-install-view");
+const identity_client_1 = require("../service/identity/identity-client");
const lint_view_1 = require("./view/lint-view");
const lite_lint_view_1 = require("./view/lite-lint-view");
const settings_view_1 = require("./view/settings-view");
const tunnel_view_1 = require("./view/tunnel-view");
@@ -92,9 +91,8 @@
const devspace_1 = require("../devspace");
const site_1 = require("../site");
const site_controller_1 = require("./controller/site-controller");
const site_view_1 = require("./view/site-view");
-const local_storage_view_1 = require("./view/local-storage-view");
const custom_scopes_controller_1 = require("./controller/custom-scopes-controller");
const custom_scopes_view_1 = require("./view/custom-scopes-view");
const customscopes = tslib_1.__importStar(require("../custom-scopes"));
const custom_scopes_service_1 = require("../service/custom-scopes-service");
@@ -104,9 +102,8 @@
const module_view_1 = require("./view/module-view");
const module_service_1 = require("../service/module-service");
const module_file_service_1 = require("../service/module-file-service");
const manifest_1 = require("../manifest");
-const local_storage_controller_1 = require("./controller/local-storage-controller");
const getDependencies = async (cliDetails) => {
let cmd;
const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
@@ -207,9 +204,12 @@
const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient, installationsClient, installationsClient, installationsClient);
const deploymentsClient = new deployments_graphql_client_1.DeploymentsGraphqlClient(graphQLClient);
const deploymentsService = new deployment_service_1.DeploymentService(assertiveAppConfigReader, deploymentsClient);
const installView = new install_view_1.InstallView(ui);
- const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView, supportedProductsService, statsigService, devSpaceService, siteService);
+ const identityClient = new identity_client_1.IdentityClient(authenticator, async () => (await credentialStore.getCredentials()).accountId, (0, identity_client_1.getIdentityBaseUrl)(), ui);
+ const globalInstallView = new global_install_view_1.GlobalInstallView(ui);
+ const globalInstallController = new global_install_controller_1.GlobalInstallController(globalInstallView, identityClient, installationsClient, installationsService, supportedProductsService);
+ const installController = new install_controller_1.InstallController(assertiveAppConfigReader, configFile, ui, installAppSiteCommand, installationsService, installView, supportedProductsService, statsigService, devSpaceService, siteService, globalInstallController);
const feedbackController = new feedback_controller_1.FeedbackController(credentialStore, feedbackPostClient);
const eligibilityController = new eligibility_controller_1.EligibilityController(new roa_service_1.RoaService(assertiveAppConfigReader, new graphql_client_8.RoaEligibilityClient(graphQLClient)), new eligibility_view_1.EligibilityView(ui));
const versionController = new version_controller_1.VersionController(new version_service_1.VersionService(assertiveAppConfigReader, new graphql_client_9.AppVersionDetailsClient(graphQLClient)), new version_view_1.VersionView(ui));
const rolloutController = new rollout_controller_1.RolloutController(new rollout_service_1.RolloutService(appEnvironmentClient, new graphql_client_10.RollingReleaseGraphqlClient(graphQLClient)), environmentClient, new rollout_view_1.RolloutView(ui));
@@ -234,19 +234,16 @@
const createSandbox = async (cfg) => new tunnel_2.NodeSandbox(cfg);
const functionHost = new tunnel_1.LocalFunctionHost(configFile, ui, createSandbox);
const localInvocationService = new tunnel_1.LocalInvocationService(ui);
const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService, i18nResourceBundlingService, appEnvironmentClient), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, ui, configFile);
- const dockerService = new docker_service_1.DockerService();
- const localStorageComposePath = path_1.default.join((0, env_paths_1.default)('forge-cli').cache, 'local-storage-v1', 'docker-compose.yml');
- const localStorageService = new local_storage_service_1.LocalStorageService(configFile, local_storage_lifecycle_1.LocalStorageLifecycle.create(localStorageComposePath, dockerService, ui));
- const localStorageController = new local_storage_controller_1.LocalStorageController(localStorageService, new local_storage_view_1.LocalStorageView(ui));
const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
+ const dockerService = new docker_service_1.DockerService();
const containerCommand = new containers_1.ContainerCommand(graphQLClient, assertiveAppConfigReader, dockerService);
const manifestRenderCommand = new manifest_1.ManifestRenderCommand(graphQLClient, assertiveAppConfigReader, configFile);
const tunnelInteractor = new tunnel_1.TunnelInteractor(ui, statsigService, containerCommand);
const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(startTunnelCommand, tunnelInteractor, configFilePortFindingService);
const tunnelView = new tunnel_view_1.TunnelView(ui);
- const tunnelController = new tunnel_controller_1.TunnelController(nodeTunnelService, tunnelView, configFile, cachedConfigService, environmentClient, devSpaceService, localStorageController);
+ const tunnelController = new tunnel_controller_1.TunnelController(nodeTunnelService, tunnelView, configFile, cachedConfigService, environmentClient, devSpaceService);
const stubController = new stubController_1.StubController();
const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, cliDetails);
const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, environmentClient, getAppOwnerQuery);
cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, supportedProductsService, cachedConfigService);
@@ -293,10 +290,9 @@
supportedProductsService,
devSpaceService,
siteService,
statsigService,
- extensionsService,
- localStorageService
+ extensionsService
},
controllers: {
autocompleteController,
deployController,
@@ -317,10 +313,9 @@
customScopesController,
moduleAddController,
moduleListController,
moduleShowController,
- siteController,
- localStorageController
+ siteController
}
};
};
exports.getDependencies = getDependencies;