shopify-cli 2.6.3 → 2.7.0

data/lib/project_types/script/layers/application/create_script.rb

@@ -7,7 +7,7 @@ module Script
     module Application
       class CreateScript
         class << self
-          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:, no_config_ui:)
+          def call(ctx:, language:, sparse_checkout_branch:, script_name:, extension_point_type:)
             raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, script_name if ctx.dir_exist?(script_name)
 
             in_new_directory_context(ctx, script_name) do
@@ -36,7 +36,7 @@ module Script
               )
 
               install_dependencies(ctx, language, script_name, project_creator)
-              script_project_repo.update_or_create_script_json(title: script_name, configuration_ui: !no_config_ui)
+              script_project_repo.update_or_create_script_json(title: script_name)
               project
             end
           end

data/lib/project_types/script/layers/application/push_script.rb

@@ -11,14 +11,27 @@ module Script
             task_runner = Infrastructure::Languages::TaskRunner
               .for(ctx, script_project.language, script_project.script_name)
 
+            extension_point = ExtensionPoints.get(type: script_project.extension_point_type)
+            library_name = extension_point.libraries.for(script_project.language)&.package
+            raise Infrastructure::Errors::LanguageLibraryForAPINotFoundError.new(
+              language: script_project.language,
+              api: script_project.extension_point_type
+            ) unless library_name
+
+            library = {
+              language: script_project.language,
+              version: task_runner.library_version(library_name),
+            }
+
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project)
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library)
 
             UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
               package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                 script_project: script_project,
                 compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
+                library: library,
               )
               script_service = Infrastructure::ServiceLocator.script_service(
                 ctx: p_ctx,
@@ -32,6 +45,7 @@ module Script
                 metadata: package.metadata,
                 script_json: package.script_json,
                 module_upload_url: module_upload_url,
+                library: package.library,
               )
               script_project_repo.update_env(uuid: uuid)
               spinner.update_title(p_ctx.message("script.application.pushed"))

data/lib/project_types/script/layers/domain/push_package.rb

@@ -10,7 +10,8 @@ module Script
           :script_json,
           :script_content,
           :compiled_type,
-          :metadata
+          :metadata,
+          :library
 
         def initialize(
           id:,
@@ -19,7 +20,8 @@ module Script
           script_content:,
           compiled_type: nil,
           metadata:,
-          script_json:
+          script_json:,
+          library:
         )
           @id = id
           @uuid = uuid
@@ -28,6 +30,7 @@ module Script
           @compiled_type = compiled_type
           @metadata = metadata
           @script_json = script_json
+          @library = library
         end
       end
     end

data/lib/project_types/script/layers/domain/script_json.rb

@@ -15,7 +15,7 @@ module Script
           @version = @content["version"].to_s
           @title = @content["title"]
           @description = @content["description"]
-          @configuration_ui = @content["configurationUi"]
+          @configuration_ui = @content.fetch("configurationUi", true)
           @configuration = @content["configuration"]
         end
 

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

@@ -27,10 +27,6 @@ module Script
             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

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

@@ -4,7 +4,6 @@ module Script
   module Layers
     module Infrastructure
       module Errors
-        class AppNotInstalledError < ScriptProjectError; end
         class BuildError < ScriptProjectError; end
         class ScriptJsonSyntaxError < ScriptProjectError; end
 
@@ -40,6 +39,23 @@ module Script
           end
         end
 
+        class APILibraryNotFoundError < ScriptProjectError
+          attr_reader :library_name
+          def initialize(library_name)
+            super()
+            @library_name = library_name
+          end
+        end
+
+        class LanguageLibraryForAPINotFoundError < ScriptProjectError
+          attr_reader :language, :api
+          def initialize(language:, api:)
+            super()
+            @language = language
+            @api = api
+          end
+        end
+
         class DependencyInstallError < ScriptProjectError; end
         class DeprecatedEPError < ScriptProjectError; end
         class EmptyResponseError < ScriptProjectError; end
@@ -84,7 +100,6 @@ module Script
         end
 
         class ScriptProjectAlreadyExistsError < ScriptProjectError; end
-        class ShopAuthenticationError < ScriptProjectError; end
         class TaskRunnerNotFoundError < ScriptProjectError; end
         class BuildScriptNotFoundError < ScriptProjectError; end
         class InvalidBuildScriptError < ScriptProjectError; end

data/lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb

@@ -5,7 +5,7 @@ module Script
     module Infrastructure
       module Languages
         class AssemblyScriptTaskRunner
-          BYTECODE_FILE = "build/%{name}.wasm"
+          BYTECODE_FILE = "build/script.wasm"
           METADATA_FILE = "build/metadata.json"
           SCRIPT_SDK_BUILD = "npm run build"
 
@@ -47,8 +47,33 @@ module Script
             Domain::Metadata.create_from_json(@ctx, raw_contents)
           end
 
+          def library_version(library_name)
+            output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm -s list --json"))
+            library_version_from_npm_list(output, library_name)
+          rescue Errors::SystemCallFailureError => error
+            library_version_from_npm_list_error_output(error, library_name)
+          end
+
           private
 
+          def library_version_from_npm_list_error_output(error, library_name)
+            # npm list can return a failure status code, even when returning the correct data.
+            # This causes the CommandRunner to throw a SystemCallFailure error that contains the data.
+            # In here, we check that the output contains `npm list`'s structure and extract the version.
+            output = JSON.parse(error.out)
+            raise error unless output.key?("dependencies")
+
+            library_version_from_npm_list(output, library_name)
+          rescue JSON::ParserError
+            raise error
+          end
+
+          def library_version_from_npm_list(output, library_name)
+            output.dig("dependencies", library_name, "version").tap do |version|
+              raise Errors::APILibraryNotFoundError, library_name unless version
+            end
+          end
+
           def check_node_version!
             output, status = @ctx.capture2e("node", "--version")
             raise Errors::DependencyInstallError, output unless status.success?
@@ -80,19 +105,10 @@ module Script
           end
 
           def bytecode
-            legacy_filename = format(BYTECODE_FILE, name: script_name)
-            filename = format(BYTECODE_FILE, name: "script")
-
-            bytecode_file = if ctx.file_exist?(filename)
-              filename
-            elsif ctx.file_exist?(legacy_filename)
-              legacy_filename
-            else
-              raise Errors::WebAssemblyBinaryNotFoundError
-            end
+            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(BYTECODE_FILE)
 
-            contents = ctx.binread(bytecode_file)
-            ctx.rm(bytecode_file)
+            contents = ctx.binread(BYTECODE_FILE)
+            ctx.rm(BYTECODE_FILE)
 
             contents
           end

data/lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb

@@ -5,7 +5,7 @@ module Script
     module Infrastructure
       module Languages
         class TypeScriptTaskRunner
-          BYTECODE_FILE = "build/%{name}.wasm"
+          BYTECODE_FILE = "build/index.wasm"
           METADATA_FILE = "build/metadata.json"
           SCRIPT_SDK_BUILD = "npm run build"
           GEN_METADATA = "npm run gen-metadata"
@@ -48,8 +48,33 @@ module Script
             Domain::Metadata.create_from_json(@ctx, raw_contents)
           end
 
+          def library_version(library_name)
+            output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm -s list --json"))
+            library_version_from_npm_list(output, library_name)
+          rescue Errors::SystemCallFailureError => error
+            library_version_from_npm_list_error_output(error, library_name)
+          end
+
           private
 
+          def library_version_from_npm_list_error_output(error, library_name)
+            # npm list can return a failure status code, even when returning the correct data.
+            # This causes the CommandRunner to throw a SystemCallFailure error that contains the data.
+            # In here, we check that the output contains `npm list`'s structure and extract the version.
+            output = JSON.parse(error.out)
+            raise error unless output.key?("dependencies")
+
+            library_version_from_npm_list(output, library_name)
+          rescue JSON::ParserError
+            raise error
+          end
+
+          def library_version_from_npm_list(output, library_name)
+            output.dig("dependencies", library_name, "version").tap do |version|
+              raise Errors::APILibraryNotFoundError, library_name unless version
+            end
+          end
+
           def check_node_version!
             output, status = @ctx.capture2e("node", "--version")
             raise Errors::DependencyInstallError, output unless status.success?
@@ -82,19 +107,10 @@ module Script
           end
 
           def bytecode
-            legacy_filename = format(BYTECODE_FILE, name: script_name)
-            filename = format(BYTECODE_FILE, name: "index")
-
-            bytecode_file = if ctx.file_exist?(filename)
-              filename
-            elsif ctx.file_exist?(legacy_filename)
-              legacy_filename
-            else
-              raise Errors::WebAssemblyBinaryNotFoundError
-            end
+            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(BYTECODE_FILE)
 
-            contents = ctx.binread(bytecode_file)
-            ctx.rm(bytecode_file)
+            contents = ctx.binread(BYTECODE_FILE)
+            ctx.rm(BYTECODE_FILE)
 
             contents
           end

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

@@ -7,7 +7,7 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
 
-        def create_push_package(script_project:, script_content:, compiled_type:, metadata:)
+        def create_push_package(script_project:, script_content:, compiled_type:, metadata:, library:)
           build_file_path = file_path(script_project.id, compiled_type)
           write_to_path(build_file_path, script_content)
 
@@ -19,10 +19,11 @@ module Script
             compiled_type: compiled_type,
             metadata: metadata,
             script_json: script_project.script_json,
+            library: library
           )
         end
 
-        def get_push_package(script_project:, compiled_type:, metadata:)
+        def get_push_package(script_project:, compiled_type:, metadata:, library:)
           build_file_path = file_path(script_project.id, compiled_type)
           raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
@@ -34,6 +35,7 @@ module Script
             script_content: script_content,
             metadata: metadata,
             script_json: script_project.script_json,
+            library: library
           )
         end
 

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

@@ -81,10 +81,10 @@ module Script
           )
         end
 
-        def update_or_create_script_json(title:, configuration_ui: false)
+        def update_or_create_script_json(title:)
           script_json = ScriptJsonRepository
             .new(ctx: ctx)
-            .update_or_create(title: title, configuration_ui: configuration_ui)
+            .update_or_create(title: title)
 
           Domain::ScriptProject.new(
             id: ctx.root,
@@ -148,11 +148,10 @@ module Script
             current_script_json || raise(Domain::Errors::NoScriptJsonFile)
           end
 
-          def update_or_create(title:, configuration_ui:)
+          def update_or_create(title:)
             json = current_script_json&.content || {}
             json["version"] ||= "1"
             json["title"] = title
-            json["configurationUi"] = !!configuration_ui
 
             ctx.write(SCRIPT_JSON_FILENAME, JSON.pretty_generate(json))
 

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

@@ -18,7 +18,8 @@ module Script
           force: false,
           metadata:,
           script_json:,
-          module_upload_url:
+          module_upload_url:,
+          library:
         )
           query_name = "app_script_set"
           variables = {
@@ -33,6 +34,10 @@ module Script
             configurationUi: script_json.configuration_ui,
             configurationDefinition: script_json.configuration&.to_json,
             moduleUploadUrl: module_upload_url,
+            library: {
+              language: library[:language],
+              version: library[:version],
+            },
           }
           resp_hash = make_request(query_name: query_name, variables: variables)
           user_errors = resp_hash["data"]["appScriptSet"]["userErrors"]
@@ -41,7 +46,7 @@ module Script
 
           if user_errors.any? { |e| e["tag"] == "already_exists_error" }
             raise Errors::ScriptRepushError, uuid
-          elsif (e = user_errors.any? { |err| err["tag"] == "configuration_syntax_error" })
+          elsif (e = user_errors.any? { |err| err["tag"] == "configuration_definition_syntax_error" })
             raise Errors::ScriptJsonSyntaxError
           elsif (e = user_errors.find { |err| err["tag"] == "configuration_definition_missing_keys_error" })
             raise Errors::ScriptJsonMissingKeysError, e["message"]

data/lib/project_types/script/messages/messages.rb

@@ -27,10 +27,6 @@ module Script
                                  "extension_point_type or script_name.",
           invalid_context_help: "Add these values and try again.",
 
-          invalid_config_props_cause: "{{command:--config-props}} is formatted incorrectly.",
-          invalid_config_props_help: "Try again using this format: "\
-                                     "{{cyan:--config-props='name1:value1, name2:value2'}}",
-
           invalid_script_name_cause: "Invalid script name.",
           invalid_script_name_help: "Replace or remove unsupported characters. Valid characters "\
                                     "are numbers, letters, hyphens, or underscores.",
@@ -42,9 +38,6 @@ module Script
           no_existing_orgs_cause: "You don't have any partner organizations.",
           no_existing_orgs_help: "Visit https://partners.shopify.com/ to create a partners account.",
 
-          no_existing_stores_cause: "You don't have any stores in your Partner Dashboard.",
-          no_existing_stores_help: "Visit https://partners.shopify.com/%{organization_id}/stores/ to create one.",
-
           project_exists_cause: "A directory with this same name already exists.",
           project_exists_help: "Try again and enter a different name for the script.",
 
@@ -54,9 +47,6 @@ module Script
           invalid_language_cause: "Invalid language %s.",
           invalid_language_help: "Allowed values: %s.",
 
-          invalid_config: "Can't change the configuration values because %1$s is missing or "\
-                          "it isn't formatted properly.",
-
           missing_script_json_field_cause: "The script.json file is missing the required %s field.",
           missing_script_json_field_help: "Add the field and try again.",
 
@@ -91,8 +81,8 @@ module Script
           system_call_failure_cause: "An error was returned while running {{command:%{cmd}}}.",
           system_call_failure_help: "Review the following error and try again.\n{{red:%{out}}}",
 
-          metadata_validation_cause: "Invalid Script API metadata.",
-          metadata_validation_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date.",
+          metadata_validation_cause: "The Script API metadata is incorrect.",
+          metadata_validation_help: "The 'schemaVersions.major' field contains an unsupported version.",
 
           metadata_schema_versions_missing: "Invalid Script metadata:" \
                                             " 'schemaVersions' field is missing",
@@ -107,7 +97,6 @@ module Script
           metadata_not_found_help: "Ensure the 'shopify/scripts-toolchain-as' package is up to date and " \
                                      "'package.json' contains a 'scripts/build' entry with a " \
                                      "'--metadata build/metadata.json' argument",
-          app_not_installed_cause: "App not installed on store.",
 
           build_error_cause: "Something went wrong while building the script.",
           build_error_help: "Correct the errors and try again.",
@@ -126,9 +115,6 @@ module Script
           script_repush_cause: "A version of this script already exists on the app.",
           script_repush_help: "Use {{cyan:--force}} to replace the existing script.",
 
-          shop_auth_cause: "Unable to authenticate with the store.",
-          shop_auth_help: "Try again.",
-
           invalid_build_script: "The root package.json contains an invalid build command that " \
                                 "is needed to compile your script to WebAssembly.",
           build_script_not_found: "The root package.json is missing the build command that " \
@@ -148,6 +134,12 @@ module Script
 
           script_upload_cause: "Fail to upload script.",
           script_upload_help: "Try again.",
+
+          api_library_not_found_cause: "Script can't be created because API library %{library_name} is missing from the dependencies",
+          api_library_not_found_help: "This error can occur because the API library was removed from your system or there is a problem with dependencies in the repository.",
+
+          language_library_for_api_not_found_cause: "Script can’t be pushed because the %{language} library for API %{api} is missing.",
+          language_library_for_api_not_found_help: "Make sure extension_point.yml contains the correct API library.",
         },
 
         create: {
@@ -156,8 +148,7 @@ module Script
               Usage: {{command:%1$s script create}}
               Options:
                 {{command:--name=NAME}} Script project name. Use any string.
-                {{command:--extension-point=TYPE}} Script API name. Allowed values: %2$s.
-                {{command:--no-config-ui}} Specify this option when you don’t want your script to render an interface in Shopify admin.
+                {{command:--api=TYPE}} Script API name. Allowed values: %2$s.
           HELP
 
           error: {
@@ -206,10 +197,6 @@ module Script
           built: "Built",
           pushing: "Pushing",
           pushed: "Pushed",
-          disabling: "Disabling",
-          disabled: "Disabled",
-          enabling: "Enabling",
-          enabled: "Enabled",
           ensure_env: {
             organization: "Partner organization {{green:%s (%s)}}.",
             organization_select: "Which partner organization do you want to use?",

data/lib/project_types/script/ui/error_handler.rb

@@ -44,15 +44,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.invalid_context_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.invalid_context_help"),
           }
-        when Errors::InvalidConfigProps
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_config_props_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.invalid_config_props_help"),
-          }
-        when Errors::InvalidConfigYAMLError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_config", e.config_file),
-          }
         when Layers::Infrastructure::Errors::InvalidLanguageError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.invalid_language_cause", e.language),
@@ -76,14 +67,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_orgs_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.no_existing_orgs_help"),
           }
-        when Errors::NoExistingStoresError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.no_existing_stores_cause"),
-            help_suggestion: ShopifyCLI::Context.message(
-              "script.error.no_existing_stores_help",
-              organization_id: e.organization_id
-            ),
-          }
         when Layers::Infrastructure::Errors::ScriptProjectAlreadyExistsError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.project_exists_cause"),
@@ -135,10 +118,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.no_script_json_file_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.no_script_json_file_help"),
           }
-        when Layers::Infrastructure::Errors::AppNotInstalledError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.app_not_installed_cause"),
-          }
         when Layers::Infrastructure::Errors::BuildError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.build_error_cause"),
@@ -217,11 +196,6 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.script_repush_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.script_repush_help"),
           }
-        when Layers::Infrastructure::Errors::ShopAuthenticationError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.shop_auth_cause"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.shop_auth_help"),
-          }
         when Layers::Infrastructure::Errors::BuildScriptNotFoundError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.build_script_not_found"),
@@ -250,6 +224,22 @@ module Script
             cause_of_error: ShopifyCLI::Context.message("script.error.script_upload_cause"),
             help_suggestion: ShopifyCLI::Context.message("script.error.script_upload_help"),
           }
+        when Layers::Infrastructure::Errors::APILibraryNotFoundError
+          {
+            cause_of_error: ShopifyCLI::Context
+              .message("script.error.api_library_not_found_cause", library_name: e.library_name),
+            help_suggestion: ShopifyCLI::Context.message("script.error.api_library_not_found_help"),
+          }
+        when Layers::Infrastructure::Errors::LanguageLibraryForAPINotFoundError
+          {
+            cause_of_error: ShopifyCLI::Context
+              .message(
+                "script.error.language_library_for_api_not_found_cause",
+                language: e.language,
+                api: e.api
+              ),
+            help_suggestion: ShopifyCLI::Context.message("script.error.language_library_for_api_not_found_help"),
+          }
         end
       end
     end

data/lib/project_types/theme/cli.rb

@@ -5,7 +5,7 @@ module Theme
     register_messages(Theme::Messages::MESSAGES)
   end
 
-  class Command < ShopifyCLI::ProjectCommands
+  class Command < ShopifyCLI::Command::ProjectCommand
     subcommand :Init, "init", Project.project_filepath("commands/init")
     subcommand :Serve, "serve", Project.project_filepath("commands/serve")
     subcommand :Pull, "pull", Project.project_filepath("commands/pull")

data/lib/project_types/theme/commands/check.rb

@@ -3,7 +3,7 @@ require "theme_check"
 
 module Theme
   class Command
-    class Check < ShopifyCLI::SubCommand
+    class Check < ShopifyCLI::Command::SubCommand
       class Options < ShopifyCLI::Options
         def initialize(theme_check)
           super()

data/lib/project_types/theme/commands/delete.rb

@@ -4,7 +4,7 @@ require "shopify_cli/theme/development_theme"
 
 module Theme
   class Command
-    class Delete < ShopifyCLI::SubCommand
+    class Delete < ShopifyCLI::Command::SubCommand
       options do |parser, flags|
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-a", "--show-all") { flags[:show_all] = true }

data/lib/project_types/theme/commands/init.rb

@@ -2,7 +2,7 @@
 
 module Theme
   class Command
-    class Init < ShopifyCLI::SubCommand
+    class Init < ShopifyCLI::Command::SubCommand
       options do |parser, flags|
         parser.on("-u", "--clone-url URL") { |url| flags[:clone_url] = url }
       end

data/lib/project_types/theme/commands/language_server.rb

@@ -3,7 +3,7 @@ require "theme_check"
 
 module Theme
   class Command
-    class LanguageServer < ShopifyCLI::SubCommand
+    class LanguageServer < ShopifyCLI::Command::SubCommand
       def call(*)
         ThemeCheck::LanguageServer.start
       end

data/lib/project_types/theme/commands/package.rb

@@ -4,7 +4,7 @@ require "json"
 
 module Theme
   class Command
-    class Package < ShopifyCLI::SubCommand
+    class Package < ShopifyCLI::Command::SubCommand
       THEME_DIRECTORIES = %w[
         assets
         config

data/lib/project_types/theme/commands/publish.rb

@@ -3,7 +3,7 @@ require "shopify_cli/theme/theme"
 
 module Theme
   class Command
-    class Publish < ShopifyCLI::SubCommand
+    class Publish < ShopifyCLI::Command::SubCommand
       options do |parser, flags|
         parser.on("-f", "--force") { flags[:force] = true }
       end

data/lib/project_types/theme/commands/pull.rb

@@ -5,7 +5,7 @@ require "shopify_cli/theme/syncer"
 
 module Theme
   class Command
-    class Pull < ShopifyCLI::SubCommand
+    class Pull < ShopifyCLI::Command::SubCommand
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }

data/lib/project_types/theme/commands/push.rb

@@ -6,7 +6,7 @@ require "shopify_cli/theme/syncer"
 
 module Theme
   class Command
-    class Push < ShopifyCLI::SubCommand
+    class Push < ShopifyCLI::Command::SubCommand
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }

data/lib/project_types/theme/commands/serve.rb

@@ -3,16 +3,24 @@ require "shopify_cli/theme/dev_server"
 
 module Theme
   class Command
-    class Serve < ShopifyCLI::SubCommand
+    class Serve < ShopifyCLI::Command::SubCommand
+      DEFAULT_HTTP_HOST = "127.0.0.1"
+
       options do |parser, flags|
+        parser.on("--host=HOST") { |host| flags[:host] = host.to_s }
         parser.on("--port=PORT") { |port| flags[:port] = port.to_i }
+        parser.on("--poll") { flags[:poll] = true }
       end
 
       def call(*)
         flags = options.flags.dup
-        ShopifyCLI::Theme::DevServer.start(@ctx, ".", **flags) do |syncer|
+        host = flags[:host] || DEFAULT_HTTP_HOST
+        ShopifyCLI::Theme::DevServer.start(@ctx, ".", http_bind: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
+      rescue ShopifyCLI::Theme::DevServer::AddressBindingError
+        raise ShopifyCLI::Abort,
+          ShopifyCLI::Context.message("theme.serve.error.address_binding_error", ShopifyCLI::TOOL_NAME)
       end
 
       def self.help