shopify-cli 2.4.0 → 2.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,6 +252,16 @@ files:
 - lib/project_types/node/commands/tunnel.rb
 - lib/project_types/node/forms/create.rb
 - lib/project_types/node/messages/messages.rb
+- lib/project_types/php/cli.rb
+- lib/project_types/php/commands/connect.rb
+- lib/project_types/php/commands/create.rb
+- lib/project_types/php/commands/deploy.rb
+- lib/project_types/php/commands/deploy/heroku.rb
+- lib/project_types/php/commands/open.rb
+- lib/project_types/php/commands/serve.rb
+- lib/project_types/php/commands/tunnel.rb
+- lib/project_types/php/forms/create.rb
+- lib/project_types/php/messages/messages.rb
 - lib/project_types/rails/cli.rb
 - lib/project_types/rails/commands/connect.rb
 - lib/project_types/rails/commands/create.rb
@@ -288,7 +298,8 @@ files:
 - lib/project_types/script/layers/domain/push_package.rb
 - lib/project_types/script/layers/domain/script_json.rb
 - lib/project_types/script/layers/domain/script_project.rb
-- lib/project_types/script/layers/infrastructure/api_clients.rb
+- lib/project_types/script/layers/infrastructure/api_clients/partners_proxy_api_client.rb
+- lib/project_types/script/layers/infrastructure/api_clients/script_service_api_client.rb
 - lib/project_types/script/layers/infrastructure/command_runner.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
@@ -302,6 +313,7 @@ files:
 - lib/project_types/script/layers/infrastructure/script_project_repository.rb
 - lib/project_types/script/layers/infrastructure/script_service.rb
 - lib/project_types/script/layers/infrastructure/script_uploader.rb
+- lib/project_types/script/layers/infrastructure/service_locator.rb
 - lib/project_types/script/messages/messages.rb
 - lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.rb
@@ -322,95 +334,96 @@ files:
 - lib/project_types/theme/messages/messages.rb
 - lib/project_types/theme/ui/sync_progress_bar.rb
 - lib/rubygems_plugin.rb
-- lib/shopify-cli/admin_api.rb
-- lib/shopify-cli/admin_api/populate_resource_command.rb
-- lib/shopify-cli/admin_api/schema.rb
-- lib/shopify-cli/api.rb
-- lib/shopify-cli/command.rb
-- lib/shopify-cli/commands.rb
-- lib/shopify-cli/commands/config.rb
-- lib/shopify-cli/commands/help.rb
-- lib/shopify-cli/commands/login.rb
-- lib/shopify-cli/commands/logout.rb
-- lib/shopify-cli/commands/populate.rb
-- lib/shopify-cli/commands/populate/customer.rb
-- lib/shopify-cli/commands/populate/draft_order.rb
-- lib/shopify-cli/commands/populate/product.rb
-- lib/shopify-cli/commands/store.rb
-- lib/shopify-cli/commands/switch.rb
-- lib/shopify-cli/commands/system.rb
-- lib/shopify-cli/commands/version.rb
-- lib/shopify-cli/commands/whoami.rb
-- lib/shopify-cli/connect.rb
-- lib/shopify-cli/constants.rb
-- lib/shopify-cli/context.rb
-- lib/shopify-cli/core.rb
-- lib/shopify-cli/core/entry_point.rb
-- lib/shopify-cli/core/executor.rb
-- lib/shopify-cli/core/finalize.rb
-- lib/shopify-cli/core/help_resolver.rb
-- lib/shopify-cli/core/monorail.rb
-- lib/shopify-cli/db.rb
-- lib/shopify-cli/environment.rb
-- lib/shopify-cli/feature.rb
-- lib/shopify-cli/form.rb
-- lib/shopify-cli/git.rb
-- lib/shopify-cli/helpers.rb
-- lib/shopify-cli/helpers/haikunator.rb
-- lib/shopify-cli/heroku.rb
-- lib/shopify-cli/http_request.rb
-- lib/shopify-cli/identity_auth.rb
-- lib/shopify-cli/identity_auth/servlet.rb
-- lib/shopify-cli/js_deps.rb
-- lib/shopify-cli/js_system.rb
-- lib/shopify-cli/lazy_delegator.rb
-- lib/shopify-cli/messages/messages.rb
-- lib/shopify-cli/method_object.rb
-- lib/shopify-cli/options.rb
-- lib/shopify-cli/packager.rb
-- lib/shopify-cli/partners_api.rb
-- lib/shopify-cli/partners_api/organizations.rb
-- lib/shopify-cli/process_supervision.rb
-- lib/shopify-cli/project.rb
-- lib/shopify-cli/project_commands.rb
-- lib/shopify-cli/project_type.rb
-- lib/shopify-cli/resolve_constant.rb
-- lib/shopify-cli/resources.rb
-- lib/shopify-cli/resources/env_file.rb
-- lib/shopify-cli/result.rb
-- lib/shopify-cli/shopifolk.rb
-- lib/shopify-cli/sub_command.rb
-- lib/shopify-cli/task.rb
-- lib/shopify-cli/tasks.rb
-- lib/shopify-cli/tasks/confirm_store.rb
-- lib/shopify-cli/tasks/create_api_client.rb
-- lib/shopify-cli/tasks/ensure_authenticated.rb
-- lib/shopify-cli/tasks/ensure_dev_store.rb
-- lib/shopify-cli/tasks/ensure_env.rb
-- lib/shopify-cli/tasks/ensure_loopback_url.rb
-- lib/shopify-cli/tasks/ensure_project_type.rb
-- lib/shopify-cli/tasks/select_org_and_shop.rb
-- lib/shopify-cli/tasks/update_dashboard_urls.rb
-- lib/shopify-cli/theme/dev_server.rb
-- lib/shopify-cli/theme/dev_server/certificate_manager.rb
-- lib/shopify-cli/theme/dev_server/header_hash.rb
-- lib/shopify-cli/theme/dev_server/hot-reload.js
-- lib/shopify-cli/theme/dev_server/hot_reload.rb
-- lib/shopify-cli/theme/dev_server/local_assets.rb
-- lib/shopify-cli/theme/dev_server/proxy.rb
-- lib/shopify-cli/theme/dev_server/sse.rb
-- lib/shopify-cli/theme/dev_server/watcher.rb
-- lib/shopify-cli/theme/dev_server/web_server.rb
-- lib/shopify-cli/theme/development_theme.rb
-- lib/shopify-cli/theme/file.rb
-- lib/shopify-cli/theme/ignore_filter.rb
-- lib/shopify-cli/theme/mime_type.rb
-- lib/shopify-cli/theme/syncer.rb
-- lib/shopify-cli/theme/theme.rb
-- lib/shopify-cli/transform_data_structure.rb
-- lib/shopify-cli/tunnel.rb
-- lib/shopify-cli/version.rb
 - lib/shopify_cli.rb
+- lib/shopify_cli/admin_api.rb
+- lib/shopify_cli/admin_api/populate_resource_command.rb
+- lib/shopify_cli/admin_api/schema.rb
+- lib/shopify_cli/api.rb
+- lib/shopify_cli/command.rb
+- lib/shopify_cli/commands.rb
+- lib/shopify_cli/commands/config.rb
+- lib/shopify_cli/commands/help.rb
+- lib/shopify_cli/commands/login.rb
+- lib/shopify_cli/commands/logout.rb
+- lib/shopify_cli/commands/populate.rb
+- lib/shopify_cli/commands/populate/customer.rb
+- lib/shopify_cli/commands/populate/draft_order.rb
+- lib/shopify_cli/commands/populate/product.rb
+- lib/shopify_cli/commands/store.rb
+- lib/shopify_cli/commands/switch.rb
+- lib/shopify_cli/commands/system.rb
+- lib/shopify_cli/commands/version.rb
+- lib/shopify_cli/commands/whoami.rb
+- lib/shopify_cli/connect.rb
+- lib/shopify_cli/constants.rb
+- lib/shopify_cli/context.rb
+- lib/shopify_cli/core.rb
+- lib/shopify_cli/core/entry_point.rb
+- lib/shopify_cli/core/executor.rb
+- lib/shopify_cli/core/finalize.rb
+- lib/shopify_cli/core/help_resolver.rb
+- lib/shopify_cli/core/monorail.rb
+- lib/shopify_cli/db.rb
+- lib/shopify_cli/environment.rb
+- lib/shopify_cli/feature.rb
+- lib/shopify_cli/form.rb
+- lib/shopify_cli/git.rb
+- lib/shopify_cli/helpers.rb
+- lib/shopify_cli/helpers/haikunator.rb
+- lib/shopify_cli/heroku.rb
+- lib/shopify_cli/http_request.rb
+- lib/shopify_cli/identity_auth.rb
+- lib/shopify_cli/identity_auth/servlet.rb
+- lib/shopify_cli/js_deps.rb
+- lib/shopify_cli/js_system.rb
+- lib/shopify_cli/lazy_delegator.rb
+- lib/shopify_cli/messages/messages.rb
+- lib/shopify_cli/method_object.rb
+- lib/shopify_cli/options.rb
+- lib/shopify_cli/packager.rb
+- lib/shopify_cli/partners_api.rb
+- lib/shopify_cli/partners_api/organizations.rb
+- lib/shopify_cli/php_deps.rb
+- lib/shopify_cli/process_supervision.rb
+- lib/shopify_cli/project.rb
+- lib/shopify_cli/project_commands.rb
+- lib/shopify_cli/project_type.rb
+- lib/shopify_cli/resolve_constant.rb
+- lib/shopify_cli/resources.rb
+- lib/shopify_cli/resources/env_file.rb
+- lib/shopify_cli/result.rb
+- lib/shopify_cli/shopifolk.rb
+- lib/shopify_cli/sub_command.rb
+- lib/shopify_cli/task.rb
+- lib/shopify_cli/tasks.rb
+- lib/shopify_cli/tasks/confirm_store.rb
+- lib/shopify_cli/tasks/create_api_client.rb
+- lib/shopify_cli/tasks/ensure_authenticated.rb
+- lib/shopify_cli/tasks/ensure_dev_store.rb
+- lib/shopify_cli/tasks/ensure_env.rb
+- lib/shopify_cli/tasks/ensure_loopback_url.rb
+- lib/shopify_cli/tasks/ensure_project_type.rb
+- lib/shopify_cli/tasks/select_org_and_shop.rb
+- lib/shopify_cli/tasks/update_dashboard_urls.rb
+- lib/shopify_cli/theme/dev_server.rb
+- lib/shopify_cli/theme/dev_server/certificate_manager.rb
+- lib/shopify_cli/theme/dev_server/header_hash.rb
+- lib/shopify_cli/theme/dev_server/hot-reload.js
+- lib/shopify_cli/theme/dev_server/hot_reload.rb
+- lib/shopify_cli/theme/dev_server/local_assets.rb
+- lib/shopify_cli/theme/dev_server/proxy.rb
+- lib/shopify_cli/theme/dev_server/sse.rb
+- lib/shopify_cli/theme/dev_server/watcher.rb
+- lib/shopify_cli/theme/dev_server/web_server.rb
+- lib/shopify_cli/theme/development_theme.rb
+- lib/shopify_cli/theme/file.rb
+- lib/shopify_cli/theme/ignore_filter.rb
+- lib/shopify_cli/theme/mime_type.rb
+- lib/shopify_cli/theme/syncer.rb
+- lib/shopify_cli/theme/theme.rb
+- lib/shopify_cli/transform_data_structure.rb
+- lib/shopify_cli/tunnel.rb
+- lib/shopify_cli/version.rb
 - shopify-cli.gemspec
 - shopify.fish
 - shopify.sh

data/lib/project_types/script/layers/infrastructure/api_clients.rb

@@ -1,89 +0,0 @@
-module Script
-  module Layers
-    module Infrastructure
-      class ApiClients
-        def self.default_client(ctx, api_key)
-          if ENV["BYPASS_PARTNERS_PROXY"]
-            ScriptServiceApiClient.new(ctx, api_key)
-          else
-            PartnersProxyApiClient.new(ctx, api_key)
-          end
-        end
-
-        class ScriptServiceApiClient
-          LOCAL_INSTANCE_URL = "https://script-service.myshopify.io"
-
-          def initialize(ctx, api_key)
-            instance_url = script_service_url
-            @api = ShopifyCli::API.new(
-              ctx: ctx,
-              url: "#{instance_url}/graphql",
-              token: { "APP_KEY" => api_key }.compact.to_json,
-              auth_header: "X-Shopify-Authenticated-Tokens"
-            )
-          end
-
-          def query(query_name, variables: {})
-            @api.query(query_name, variables: variables)
-          end
-
-          private
-
-          def script_service_url
-            if ::ShopifyCli::Environment.use_spin_partners_instance?
-              "https://script-service.#{::ShopifyCli::Environment.spin_url}"
-            else
-              LOCAL_INSTANCE_URL
-            end
-          end
-        end
-        private_constant(:ScriptServiceApiClient)
-
-        class PartnersProxyApiClient
-          def initialize(ctx, api_key)
-            @ctx = ctx
-            @api_key = api_key
-          end
-
-          def query(query_name, variables: {})
-            response = ShimAPI.query(@ctx, query_name, api_key: @api_key, variables: variables.to_json)
-            raise_if_graphql_failed(response)
-            JSON.parse(response["data"]["scriptServiceProxy"])
-          end
-
-          def raise_if_graphql_failed(response)
-            raise Errors::EmptyResponseError if response.nil?
-
-            return unless response.key?("errors")
-            case error_code(response["errors"])
-            when "forbidden"
-              raise Errors::ForbiddenError
-            when "forbidden_on_shop"
-              raise Errors::ShopAuthenticationError
-            when "app_not_installed_on_shop"
-              raise Errors::AppNotInstalledError
-            else
-              raise Errors::GraphqlError, response["errors"]
-            end
-          end
-
-          def error_code(errors)
-            errors.map do |e|
-              code = e.dig("extensions", "code")
-              return code if code
-            end
-          end
-
-          class ShimAPI < ShopifyCli::PartnersAPI
-            def query(query_name, variables: {})
-              variables[:query] = load_query(query_name)
-              super("script_service_proxy", variables: variables)
-            end
-          end
-          private_constant(:ShimAPI)
-        end
-        private_constant(:PartnersProxyApiClient)
-      end
-    end
-  end
-end

data/lib/shopify-cli/commands/logout.rb

@@ -1,39 +0,0 @@
-require "shopify_cli"
-require "shopify-cli/theme/development_theme"
-
-module ShopifyCli
-  module Commands
-    class Logout < ShopifyCli::Command
-      def call(*)
-        try_delete_development_theme
-        ShopifyCli::IdentityAuth.delete_tokens_and_keys
-        ShopifyCli::DB.del(:shop) if has_shop?
-        ShopifyCli::DB.del(:organization_id) if has_organization_id?
-        ShopifyCli::Shopifolk.reset
-        @ctx.puts(@ctx.message("core.logout.success"))
-      end
-
-      def self.help
-        ShopifyCli::Context.message("core.logout.help", ShopifyCli::TOOL_NAME)
-      end
-
-      private
-
-      def has_shop?
-        ShopifyCli::DB.exists?(:shop)
-      end
-
-      def has_organization_id?
-        ShopifyCli::DB.exists?(:organization_id)
-      end
-
-      def try_delete_development_theme
-        return unless has_shop?
-
-        ShopifyCli::Theme::DevelopmentTheme.delete(@ctx)
-      rescue ShopifyCli::API::APIRequestError
-        # Ignore since we can't delete it
-      end
-    end
-  end
-end

data/lib/shopify-cli/commands/populate.rb

@@ -1,23 +0,0 @@
-require "shopify_cli"
-
-module ShopifyCli
-  module Commands
-    class Populate < ShopifyCli::Command
-      subcommand :Customer, "customers", "shopify-cli/commands/populate/customer"
-      subcommand :DraftOrder, "draftorders", "shopify-cli/commands/populate/draft_order"
-      subcommand :Product, "products", "shopify-cli/commands/populate/product"
-
-      def call(_args, _name)
-        @ctx.puts(self.class.help)
-      end
-
-      def self.help
-        ShopifyCli::Context.message("core.populate.help", ShopifyCli::TOOL_NAME)
-      end
-
-      def self.extended_help
-        ShopifyCli::Context.message("core.populate.extended_help", ShopifyCli::TOOL_NAME)
-      end
-    end
-  end
-end

data/lib/shopify-cli/commands/store.rb

@@ -1,15 +0,0 @@
-require "shopify_cli"
-
-module ShopifyCli
-  module Commands
-    class Store < ShopifyCli::Command
-      def call(_args, _name)
-        @ctx.puts(@ctx.message("core.store.shop", ShopifyCli::AdminAPI.get_shop_or_abort(@ctx)))
-      end
-
-      def self.help
-        ShopifyCli::Context.message("core.store.help", ShopifyCli::TOOL_NAME)
-      end
-    end
-  end
-end

data/lib/shopify-cli/commands/version.rb

@@ -1,15 +0,0 @@
-require "shopify_cli"
-
-module ShopifyCli
-  module Commands
-    class Version < ShopifyCli::Command
-      def self.help
-        ShopifyCli::Context.message("core.version.help", ShopifyCli::TOOL_NAME)
-      end
-
-      def call(_args, _name)
-        @ctx.puts(ShopifyCli::VERSION.to_s)
-      end
-    end
-  end
-end

data/lib/shopify-cli/commands.rb

@@ -1,34 +0,0 @@
-require "shopify_cli"
-
-module ShopifyCli
-  module Commands
-    Registry = CLI::Kit::CommandRegistry.new(
-      default: "help",
-      contextual_resolver: nil,
-    )
-    @core_commands = []
-
-    def self.register(const, cmd, path = nil, is_core = false)
-      autoload(const, path) if path
-      Registry.add(->() { const_get(const) }, cmd)
-      @core_commands.push(cmd) if is_core
-    end
-
-    def self.core_command?(cmd)
-      @core_commands.include?(cmd)
-    end
-
-    register :Config, "config", "shopify-cli/commands/config", true
-    register :Help, "help", "shopify-cli/commands/help", true
-    register :Login, "login", "shopify-cli/commands/login", true
-    register :Logout, "logout", "shopify-cli/commands/logout", true
-    register :Populate, "populate", "shopify-cli/commands/populate", true
-    register :Store, "store", "shopify-cli/commands/store", true
-    register :Switch, "switch", "shopify-cli/commands/switch", true
-    register :System, "system", "shopify-cli/commands/system", true
-    register :Version, "version", "shopify-cli/commands/version", true
-    register :Whoami, "whoami", "shopify-cli/commands/whoami", true
-
-    autoload :Connect, "shopify-cli/commands/connect"
-  end
-end

data/lib/shopify-cli/core.rb

@@ -1,8 +0,0 @@
-module ShopifyCli
-  module Core
-    autoload :EntryPoint, "shopify-cli/core/entry_point"
-    autoload :Executor, "shopify-cli/core/executor"
-    autoload :HelpResolver, "shopify-cli/core/help_resolver"
-    autoload :Monorail, "shopify-cli/core/monorail"
-  end
-end

data/lib/shopify-cli/helpers.rb

@@ -1,5 +0,0 @@
-module ShopifyCli
-  module Helpers
-    autoload :Haikunator, "shopify-cli/helpers/haikunator"
-  end
-end

data/lib/shopify-cli/resources.rb

@@ -1,5 +0,0 @@
-module ShopifyCli
-  module Resources
-    autoload :EnvFile, "shopify-cli/resources/env_file"
-  end
-end

data/lib/shopify-cli/tasks/ensure_authenticated.rb

@@ -1,13 +0,0 @@
-require "shopify_cli"
-
-module ShopifyCli
-  module Tasks
-    class EnsureAuthenticated < ShopifyCli::Task
-      def call(ctx)
-        ctx.abort(
-          ctx.message("core.identity_auth.login_prompt", ShopifyCli::TOOL_NAME)
-        ) unless ShopifyCli::IdentityAuth::IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCli::DB.exists?(key) }
-      end
-    end
-  end
-end

data/lib/shopify-cli/version.rb

@@ -1,3 +0,0 @@
-module ShopifyCli
-  VERSION = "2.4.0"
-end