shopify-cli 2.6.5 → 2.7.2

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
 
@@ -57,8 +56,15 @@ module Script
           end
         end
 
+        class DeprecatedEPError < ScriptProjectError
+          attr_reader(:extension_point)
+          def initialize(extension_point)
+            super()
+            @extension_point = extension_point
+          end
+        end
+
         class DependencyInstallError < ScriptProjectError; end
-        class DeprecatedEPError < ScriptProjectError; end
         class EmptyResponseError < ScriptProjectError; end
         class InvalidResponseError < ScriptProjectError; end
         class ForbiddenError < ScriptProjectError; end
@@ -101,10 +107,8 @@ module Script
         end
 
         class ScriptProjectAlreadyExistsError < ScriptProjectError; end
-        class ShopAuthenticationError < ScriptProjectError; end
         class TaskRunnerNotFoundError < ScriptProjectError; end
         class BuildScriptNotFoundError < ScriptProjectError; end
-        class InvalidBuildScriptError < ScriptProjectError; end
 
         class WebAssemblyBinaryNotFoundError < ScriptProjectError
           def initialize

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

@@ -48,7 +48,7 @@ module Script
           end
 
           def library_version(library_name)
-            output = JSON.parse(CommandRunner.new(ctx: ctx).call("npm list --json"))
+            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)
@@ -98,10 +98,6 @@ module Script
 
             raise Errors::BuildScriptNotFoundError,
               "Build script not found" if build_script.nil?
-
-            unless build_script.start_with?("shopify-scripts")
-              raise Errors::InvalidBuildScriptError, "Invalid build script"
-            end
           end
 
           def bytecode

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

@@ -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?
@@ -75,10 +100,6 @@ module Script
 
             raise Errors::BuildScriptNotFoundError,
               "Build script not found" if build_script.nil?
-
-            unless build_script.start_with?("javy")
-              raise Errors::InvalidBuildScriptError, "Invalid build script"
-            end
           end
 
           def bytecode

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

@@ -46,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,11 +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 " \
                                   "is needed to compile your script to WebAssembly.",
           # rubocop:disable Layout/LineLength
@@ -162,8 +146,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: {
@@ -191,6 +174,19 @@ module Script
           script_pushed: "{{v}} Script pushed to app (API key: %{api_key}).",
         },
 
+        javy: {
+          help: <<~HELP,
+            Compile the JavaScript code into WebAssembly.
+              Usage: {{command:%s script javy}}
+              Options:
+                {{command:--in}} The name of the JavaScript file that will be compiled.
+                {{command:--out}} The name of the file that the WebAssembly should be written to.
+          HELP
+          errors: {
+            invalid_arguments: "Javy was run with invalid arguments. Run {{command: %s script javy --help}} for more information.",
+          },
+        },
+
         project_deps: {
           none_required: "{{v}} None required",
           checking_with_npm: "Checking dependencies with npm",

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"),
@@ -91,7 +74,7 @@ module Script
           }
         when Layers::Infrastructure::Errors::DeprecatedEPError
           {
-            cause_of_error: ShopifyCLI::Context.message("script.error.deprecated_ep", e.ep),
+            cause_of_error: ShopifyCLI::Context.message("script.error.deprecated_ep", e.extension_point),
             help_suggestion: ShopifyCLI::Context.message("script.error.deprecated_ep_cause"),
           }
         when Layers::Domain::Errors::InvalidExtensionPointError
@@ -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,21 +196,11 @@ 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"),
             help_suggestion: ShopifyCLI::Context.message("script.error.build_script_suggestion"),
           }
-        when Layers::Infrastructure::Errors::InvalidBuildScriptError
-          {
-            cause_of_error: ShopifyCLI::Context.message("script.error.invalid_build_script"),
-            help_suggestion: ShopifyCLI::Context.message("script.error.build_script_suggestion"),
-          }
         when Layers::Infrastructure::Errors::WebAssemblyBinaryNotFoundError
           {
             cause_of_error: ShopifyCLI::Context.message("script.error.web_assembly_binary_not_found"),

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,10 +5,11 @@ 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 }
+        parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-x", "--ignore=PATTERN") do |pattern|
           flags[:ignores] ||= []
           flags[:ignores] << pattern
@@ -21,6 +22,8 @@ module Theme
 
         theme = if (theme_id = options.flags[:theme_id])
           ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        elsif options.flags[:live]
+          ShopifyCLI::Theme::Theme.live(@ctx, root: root)
         else
           form = Forms::Select.ask(
             @ctx,

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

@@ -6,10 +6,11 @@ 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 }
+        parser.on("-l", "--live") { flags[:live] = true }
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-u", "--unpublished") { flags[:unpublished] = true }
         parser.on("-j", "--json") { flags[:json] = true }
@@ -27,6 +28,8 @@ module Theme
 
         theme = if (theme_id = options.flags[:theme_id])
           ShopifyCLI::Theme::Theme.new(@ctx, root: root, id: theme_id)
+        elsif options.flags[:live]
+          ShopifyCLI::Theme::Theme.live(@ctx, root: root)
         elsif options.flags[:development]
           theme = ShopifyCLI::Theme::DevelopmentTheme.new(@ctx, root: root)
           theme.ensure_exists!
@@ -47,7 +50,8 @@ module Theme
           form.theme
         end
 
-        if theme.live? && !options.flags[:allow_live]
+        is_confirm_required = !options.flags[:allow_live] && !options.flags[:live]
+        if theme.live? && is_confirm_required
           return unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.live"))
         end
 
@@ -72,6 +76,7 @@ module Theme
               @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
             end
           end
+          raise ShopifyCLI::AbortSilent if syncer.has_any_error?
         rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.push.theme_not_found", theme.id))
         ensure

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

@@ -3,17 +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, ".", host: 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

data/lib/project_types/theme/messages/messages.rb

@@ -58,6 +58,7 @@ module Theme
 
               Options:
                 {{command:-i, --themeid=THEMEID}} Theme ID. Must be an existing theme on your store.
+                {{command:-l, --live}}            Push to your remote live theme, and update your live store.
                 {{command:-d, --development}}     Push to your remote development theme, and create it if needed.
                 {{command:-u, --unpublished}}     Create a new unpublished theme and push to it.
                 {{command:-n, --nodelete}}        Runs the push command without deleting remote files from Shopify.
@@ -94,9 +95,45 @@ module Theme
             Options:
               {{command:--port=PORT}} Local port to serve theme preview from
               {{command:--poll}}      Force polling to detect file changes
+              {{command:--host=HOST}} Set which network interface the web server listens on. The default value is 127.0.0.1.
           HELP
-          serve: "Viewing theme…",
+          viewing_theme: "Viewing theme…",
+          syncing_theme: "Syncing theme #%s on %s",
           open_fail: "Couldn't open the theme",
+          operation: {
+            status: {
+              error: "ERROR",
+              synced: "Synced",
+              fixed: "Fixed",
+            },
+          },
+          error: {
+            address_binding_error: "Couldn't bind to localhost."\
+              " To serve your theme, set a different address with {{command:%s theme serve --host=<address>}}",
+          },
+          serving: <<~SERVING,
+
+            Serving %s
+
+          SERVING
+          customize_or_preview: <<~CUSTOMIZE_OR_PREVIEW,
+
+            Customize this theme in the Online Store Editor:
+            {{green:%s}}
+
+            Share this theme preview:
+            {{green:%s}}
+
+            (Use Ctrl-C to stop)
+          CUSTOMIZE_OR_PREVIEW
+          ensure_user: <<~ENSURE_USER,
+            You are not authorized to edit themes on %s.
+            Make sure you are a user of that store, and allowed to edit themes.
+          ENSURE_USER
+          already_in_use_error: "Error",
+          address_already_in_use: "The address \"%s\" is already in use.",
+          try_this: "Try this",
+          try_port_option: "Use the --port=PORT option to serve the theme in a different port.",
         },
         check: {
           help: <<~HELP,
@@ -152,6 +189,7 @@ module Theme
 
             Options:
               {{command:-i, --themeid=THEMEID}} The Theme ID. Must be an existing theme on your store.
+              {{command:-l, --live}}            Pull theme files from your remote live theme.
               {{command:-n, --nodelete}}        Runs the pull command without deleting local files.
 
             Run without options to select theme from a list.

data/lib/project_types/theme/ui/sync_progress_bar.rb

@@ -6,14 +6,14 @@ module Theme
       end
 
       def progress(method, **args)
-        @syncer.delay_errors!
+        @syncer.lock_io!
         CLI::UI::Progress.progress do |bar|
           @syncer.public_send(method, **args) do |left, total|
             bar.tick(set_percent: 1 - left.to_f / total)
           end
           bar.tick(set_percent: 1)
         end
-        @syncer.report_errors!
+        @syncer.unlock_io!
       end
     end
   end

data/lib/shopify_cli/admin_api/populate_resource_command.rb

@@ -3,7 +3,7 @@ require "optparse"
 
 module ShopifyCLI
   class AdminAPI
-    class PopulateResourceCommand < ShopifyCLI::SubCommand
+    class PopulateResourceCommand < ShopifyCLI::Command::SubCommand
       DEFAULT_COUNT = 5
 
       attr_reader :input

data/lib/shopify_cli/api.rb

@@ -108,9 +108,14 @@ module ShopifyCLI
     private
 
     def default_headers
+      sha = ShopifyCLI.sha
+      user_agent = "Shopify CLI; v=#{ShopifyCLI::VERSION}"
+      sec_ch_ua = user_agent
+      sec_ch_ua += " sha=#{sha}" unless sha.nil?
+
       {
-        "User-Agent" => "Shopify CLI; v=#{ShopifyCLI::VERSION}",
-        "Sec-CH-UA" => "Shopify CLI; v=#{ShopifyCLI::VERSION} sha=#{ShopifyCLI.sha}",
+        "User-Agent" => user_agent,
+        "Sec-CH-UA" => sec_ch_ua,
         "Sec-CH-UA-PLATFORM" => ctx.os.to_s,
         "X-Request-Id" => SecureRandom.uuid,
       }.tap do |headers|

data/lib/shopify_cli/app_type_detector.rb

@@ -3,30 +3,34 @@ require "json"
 module ShopifyCLI
   class AppTypeDetector
     Error = Class.new(StandardError)
+    MissingShopifyCLIYamlError = Class.new(Error)
     TypeNotFoundError = Class.new(Error)
-
-    def self.detect(project_directory:)
-      return :node if node?(project_directory: project_directory)
-      return :rails if rails?(project_directory: project_directory)
-      return :php if php?(project_directory: project_directory)
-      raise TypeNotFoundError, "Couldn't detect the project type in directory: #{project_directory}"
-    end
-
-    def self.node?(project_directory:)
-      package_json_path = File.join(project_directory, "package.json")
-      return false unless File.exist?(package_json_path)
-      package_json = JSON.parse(File.read(package_json_path))
-      !package_json.dig("scripts", "dev").nil?
+    class InvalidTypeError < Error
+      attr_reader :project_type
+      def initialize(message, project_type:)
+        @project_type = project_type
+        super(message)
+      end
     end
 
-    def self.rails?(project_directory:)
-      rails_binstub_path = File.join(project_directory, "bin/rails")
-      File.exist?(rails_binstub_path)
-    end
+    def self.detect(project_directory:)
+      require "yaml" # takes 20ms, so deferred as late as possible.
 
-    def self.php?(project_directory:)
-      bootstrap_app_path = File.join(project_directory, "bootstrap/app.php")
-      File.exist?(bootstrap_app_path)
+      shopify_cli_yml_path = File.join(project_directory, Constants::Files::SHOPIFY_CLI_YML)
+      unless File.exist?(shopify_cli_yml_path)
+        raise MissingShopifyCLIYamlError,
+          "#{Constants::Files::SHOPIFY_CLI_YML} was not found in directory #{project_directory}"
+      end
+      shopify_cli = YAML.load_file(shopify_cli_yml_path)
+      case shopify_cli["project_type"]&.to_sym
+      when :node, :rails, :php
+        shopify_cli["project_type"].to_sym
+      when nil
+        raise TypeNotFoundError, "Couldn't detect the project type in directory: #{project_directory}"
+      else
+        raise InvalidTypeError.new("The project found '' is not supported",
+          project_type: shopify_cli["project_type"])
+      end
     end
   end
 end

data/lib/shopify_cli/command/app_sub_command.rb

@@ -1,6 +1,16 @@
 module ShopifyCLI
   class Command
     class AppSubCommand < SubCommand
+      def detect_app(directory: Dir.pwd)
+        AppTypeDetector.detect(project_directory: directory)
+      rescue ShopifyCLI::AppTypeDetector::TypeNotFoundError
+        raise ShopifyCLI::Abort, @ctx.message("core.app.error.type_not_found", directory)
+      rescue ShopifyCLI::AppTypeDetector::MissingShopifyCLIYamlError
+        raise ShopifyCLI::Abort, @ctx.message("core.app.error.missing_shopify_cli_yml", directory)
+      rescue ShopifyCLI::AppTypeDetector::InvalidTypeError => error
+        raise ShopifyCLI::Abort, @ctx.message("core.app.error.invalid_project_type", error.project_type)
+      end
+
       class << self
         def call_help(*)
           output = help