npm package diff

Package: @forge/cli

Versions: 12.0.0-next.9 - 12.0.0-next.15

File: package/out/command-line/dependency-injection.js

Index: package/out/command-line/dependency-injection.js
===================================================================
--- package/out/command-line/dependency-injection.js
+++ package/out/command-line/dependency-injection.js
@@ -5,9 +5,8 @@
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const bundler_1 = require("@forge/bundler");
 const cli_shared_1 = require("@forge/cli-shared");
 const tunnel_1 = require("@forge/tunnel");
-const runtime_1 = require("@forge/runtime");
 const tunnel_2 = require("@forge/tunnel");
 const analytics_client_1 = require("../analytics-client/analytics-client");
 const deploy_1 = require("../deploy");
 const delete_environment_variable_1 = require("../environment-variables/delete-environment-variable");
@@ -82,9 +81,9 @@
     let cmd;
     const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
     const cachedConf = cli_shared_1.CachedConf.getCache(cli_shared_1.CONFIG_PROJECT_NAME);
     const cachedConfigService = new cached_config_service_1.CachedConfigService(cachedConf);
-    const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), ui, cachedConfigService);
+    const analyticsClientReporter = new analytics_client_1.AnalyticsClientReporter(new local_file_storage_1.LocalFileStorage(), cachedConfigService);
     const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
     const createGraphQLClient = (auth) => {
         const minimalGraphQLRunner = new cli_shared_1.MinimalGraphQLRunner(auth, graphqlGateway, cliDetails);
         const graphQLRunner = new cli_shared_1.DebuggingGraphqlRunner(minimalGraphQLRunner, graphqlGateway, ui);
@@ -159,11 +158,11 @@
     const triggerDeployClient = new deploy_1.TriggerDeployGraphQLClient(graphQLClient);
     const archiveUploader = new deploy_1.AppArchiveUploader(assertiveAppConfigReader, uploaderArtifactClient, fileUploader, ui, new resources_uploader_service_1.ResourcesUploaderService(fileReader));
     const deployer = new deploy_1.ArtifactDeployer(assertiveAppConfigReader, triggerDeployClient, deployMonitorClient, cli_shared_1.pause, ui);
     const nodeBundle = (0, bundler_1.getNodeBundler)(ui, (0, bundler_1.getWrapperProvider)({ fileSystemReader: fileReader, statsigService }), configFile);
-    const nodeRuntimeBundler = new runtime_bundler_1.NodeRuntimeBundler(archiverFactory, ui, nodeBundle, fileReader, configFile);
+    const runtimeBundler = new runtime_bundler_1.RuntimeBundler(archiverFactory, ui, nodeBundle, fileReader, configFile);
     const nativeUiBundler = new bundler_1.NativeUIBundler(ui);
-    const nodeAppPackager = new deploy_1.AppPackager(nodeRuntimeBundler, nativeUiBundler, ui);
+    const appPackager = new deploy_1.AppPackager(runtimeBundler, nativeUiBundler, ui);
     const getWebTriggerURLCommand = new get_webtrigger_url_1.GetWebTriggerURLCommand(assertiveAppConfigReader, installationsClient, appEnvironmentClient, webTriggerGraphqlClient);
     const autocompleteController = new autocomplete_controller_1.AutocompleteController(ui);
     const installationsService = new installation_service_1.InstallationService(assertiveAppConfigReader, installationsClient, installationsClient, installationsClient, installationsClient);
     const installView = new install_view_1.InstallView(ui);
@@ -178,24 +177,23 @@
     const bridgeScriptService = new cli_shared_1.BridgeScriptService();
     const iframeResizerScriptService = new cli_shared_1.IframeResizerScriptService();
     const resourcePackagingService = new resource_packaging_service_1.ResourcePackagingService(archiverFactory, fileReader, process.cwd(), bridgeScriptService, iframeResizerScriptService);
     const i18nResourceBundlingService = new cli_shared_1.I18nResourceBundlingService();
-    const nodePackageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(nodeAppPackager, archiveUploader, deployer, resourcePackagingService, i18nResourceBundlingService);
+    const packageUploadDeployCommand = new deploy_1.PackageUploadDeployCommand(appPackager, archiveUploader, deployer, resourcePackagingService, i18nResourceBundlingService);
     const roaService = new roa_service_1.RoaService(assertiveAppConfigReader, new graphql_client_8.RoaEligibilityClient(graphQLClient));
-    const buildController = new build_controller_1.BuildController(new build_view_1.BuildView(ui), lintService, configFile, nodePackageUploadDeployCommand, new build_service_1.BuildService(assertiveAppConfigReader, new graphql_client_10.BuildGraphqlClient(graphQLClient)));
-    const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, roaService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, nodePackageUploadDeployCommand, createEnvironmentCommand);
+    const buildController = new build_controller_1.BuildController(new build_view_1.BuildView(ui), lintService, configFile, packageUploadDeployCommand, new build_service_1.BuildService(assertiveAppConfigReader, new graphql_client_10.BuildGraphqlClient(graphQLClient)));
+    const deployController = new deploy_controller_1.DeployController(assertiveAppConfigReader, configFile, lintService, installationsService, roaService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, packageUploadDeployCommand, createEnvironmentCommand);
     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, runtime_1.notImplementedInspector);
-    const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService, i18nResourceBundlingService), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
+    const localInvocationService = new tunnel_1.LocalInvocationService(ui);
+    const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService, i18nResourceBundlingService), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, ui, configFile);
     const tunnelInteractor = new tunnel_1.TunnelInteractor(ui, statsigService);
     const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
     const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails);
     const nodeTunnelService = new tunnel_service_1.InProcessTunnelService(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, tunnelAnalyticsService);
     const tunnelView = new tunnel_view_1.TunnelView(ui);
     const dockerService = new docker_service_1.DockerService();
-    const dockerTunnelService = new tunnel_service_1.DockerTunnelService(configFilePortFindingService, cachedConfigService, dockerService, tunnelAnalyticsService);
-    const tunnelController = new tunnel_controller_1.TunnelController(tunnelAnalyticsService, nodeTunnelService, dockerTunnelService, tunnelView, configFile, credentialStore);
+    const tunnelController = new tunnel_controller_1.TunnelController(nodeTunnelService, tunnelView, configFile, credentialStore);
     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, listEnvironmentCommand, getAppOwnerQuery);
     cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, supportedProductsService);
@@ -216,9 +214,9 @@
             registerAppCommand,
             installAppSiteCommand,
             uninstallAppCommand,
             getAppOwnerQuery,
-            nodePackageUploadDeployCommand,
+            packageUploadDeployCommand,
             setEnvironmentVariableCommand,
             deleteEnvironmentVariableCommand,
             listEnvironmentVariablesCommand,
             configureProviderCommand,