shopify-cli 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f839cd234fbc37b84d85cc7ba1efddedf6b1571adba40562b3f4296286ca0130
-  data.tar.gz: fb66a6a0728d317bddc220e1af1c4fa0049bd42e34cbef6f4310daa19cfe9e86
+  metadata.gz: '068a38773a84e132b2b1dd435d4e369a2100d2fca4cccb539699e6033f816fb7'
+  data.tar.gz: d4f356f9f4bf9f0e43733da4f223f7e02917d8c29e4193c90eb276ac80a73c5b
 SHA512:
-  metadata.gz: 11c1e49165ad7140139fe89b56e55287e6a3facca584c18234a4dbb302428d01a62cf2f4c5c27edf1943c9ec7f6610c8733fc1689b3cb78f9425b01c2f4f3836
-  data.tar.gz: 8fc34d5588a785bbd8fa7f47b0dc8f9682dc955a8c23aa733dd33e39e37ebc9fbe898c542314ea16604a7f08a384d54ec693c8eb129af7bde0a156567c345058
+  metadata.gz: a163a0878650fbf8c846fa9d510240c3b4f938a621e14558a63788ce56e63a8fe39e6254ef4cc83107cd6b241d2d66e2fe935cd207d47a88c20182ceb7d59d5c
+  data.tar.gz: db35b09603e3ccb0c7a526da096a76663b4ab5f952cb37e1bde4b71fba3509d87c3e8626929e8d20e316a4c04097d3430da98e252b9634d5a0e53586b06ec2a9

data/.gitignore

@@ -23,3 +23,4 @@ packaging/rpm/shopify-cli.spec
 ext/shopify-extensions/shopify-extensions
 ext/javy/bin
 .console_history
+TODO.md

data/CHANGELOG.md

@@ -1,8 +1,23 @@
 From version 2.6.0, the sections in this file adhere to the [keep a changelog](https://keepachangelog.com/en/1.0.0/) specification.
+
+## [Unreleased]
+
+## Version 2.7.4
+### Added
+* [#1825](https://github.com/Shopify/shopify-cli/pull/1825): Support passing the connection information through arguments
+
+### Fixed
+* [#1852](https://github.com/Shopify/shopify-cli/pull/1852): Fix `shopify --help` to include `extension` commands
+* [#1853](https://github.com/Shopify/shopify-cli/pull/1853): Fix javy installation failures from MacOS universal ruby installations
+* [#1851](https://github.com/Shopify/shopify-cli/pull/1851): Improve `shopify theme push --live` confirmation message to show current live theme
+* [#1850](https://github.com/Shopify/shopify-cli/pull/1850): Fix `shopify extension` commands timeout when organization has too many apps
+* [#1860](https://github.com/Shopify/shopify-cli/pull/1860): Fix `theme serve` hot reload when there are many tabs active
+
 ## Version 2.7.3
 ### Added
 * [#1826](https://github.com/Shopify/shopify-cli/pull/1826): Support using `script.config.yml` file for script configuration
 * [#1843](https://github.com/Shopify/shopify-cli/pull/1826): Support using javy on Apple ARM processors
+* [#1847](https://github.com/Shopify/shopify-cli/pull/1847): `shopify script connect` command.
 
 ### Fixed
 * [#1811](https://github.com/Shopify/shopify-cli/pull/1811): Update theme-check to 1.9.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.7.3)
+    shopify-cli (2.7.4)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)

data/dev.yml

@@ -9,9 +9,9 @@ up:
   - ruby: 2.7.5
   - homebrew:
       - dpkg:
-          version: 1.20.9
+          version: 1.21.1
       - rpm:
-          version: 4.16.1.3
+          version: 4.17.0
   - bundler
   - docker
 

data/ext/javy/javy.rb

@@ -1,4 +1,3 @@
-require "rbconfig"
 require "open-uri"
 require "zlib"
 require "open3"
@@ -162,9 +161,9 @@ module Javy
     end
   end
 
-  Platform = Struct.new(:ruby_config) do
-    def initialize(ruby_config = RbConfig::CONFIG)
-      super(ruby_config)
+  Platform = Struct.new(:ruby_platform) do
+    def initialize(ruby_platform = RUBY_PLATFORM)
+      super(ruby_platform)
     end
 
     def to_s
@@ -172,7 +171,7 @@ module Javy
     end
 
     def os
-      case ruby_config.fetch("host_os")
+      case ruby_platform
       when /linux/
         "linux"
       when /darwin/
@@ -183,10 +182,10 @@ module Javy
     end
 
     def cpu
-      case ruby_config.fetch("host_cpu")
-      when "x64", "x86_64"
+      case ruby_platform
+      when /x64/, /x86_64/
         "x86_64"
-      when "arm"
+      when /arm/
         "arm"
       else
         raise InstallationError.cpu_unsupported

data/lib/graphql/get_extension_registrations.graphql

@@ -0,0 +1,27 @@
+query GetExtensionRegistrations($api_key: String!, $type: String) {
+  app(apiKey: $api_key) {
+    id
+    title
+    apiKey
+    apiSecretKeys{
+      secret
+    }
+    appType
+    extensionRegistrations(specificationIdentifier: $type) {
+      id
+      type
+      uuid
+      title
+      draftVersion {
+        registrationId
+        context
+        lastUserInteractionAt
+        location
+        validationErrors { field message }
+        id
+        uuid
+        versionTag
+      }
+    }
+  }
+}

data/lib/project_types/extension/cli.rb

@@ -13,7 +13,6 @@ module Extension
   end
 
   class Command < ShopifyCLI::Command::ProjectCommand
-    hidden_feature
     autoload :ExtensionCommand, Project.project_filepath("commands/extension_command")
 
     subcommand :Create, "create", Project.project_filepath("commands/create")
@@ -41,7 +40,6 @@ module Extension
     autoload :FindNpmPackages, Project.project_filepath("tasks/find_npm_packages")
     autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
     autoload :GetProduct, Project.project_filepath("tasks/get_product")
-    autoload :RunExtensionCommand, Project.project_filepath("tasks/run_extension_command")
     autoload :MergeServerConfig, Project.project_filepath("tasks/merge_server_config")
     autoload :FindPackageFromJson, Project.project_filepath("tasks/find_package_from_json.rb")
     autoload :EnsureResourceUrl, Project.project_filepath("tasks/ensure_resource_url.rb")
@@ -53,6 +51,28 @@ module Extension
       autoload :ValidationErrorConverter, Project.project_filepath("tasks/converters/validation_error_converter")
       autoload :AppConverter, Project.project_filepath("tasks/converters/app_converter")
       autoload :ProductConverter, Project.project_filepath("tasks/converters/product_converter")
+      autoload :ExecuteCommands, Project.project_filepath("cli/execute_commands")
+    end
+
+    module ExecuteCommands
+      autoload :Base, Project.project_filepath("tasks/execute_commands/base")
+      autoload :Build, Project.project_filepath("tasks/execute_commands/build")
+      autoload :Create, Project.project_filepath("tasks/execute_commands/create")
+      autoload :Serve, Project.project_filepath("tasks/execute_commands/serve")
+
+      class << self
+        def build(*args)
+          Build.new(*args).call
+        end
+
+        def create(*args)
+          Create.new(*args).call
+        end
+
+        def serve(*args)
+          Serve.new(*args).call
+        end
+      end
     end
   end
 
@@ -121,4 +141,9 @@ module Extension
   autoload :ExtensionProjectKeys, Project.project_filepath("extension_project_keys")
   autoload :ExtensionProject, Project.project_filepath("extension_project")
   autoload :Errors, Project.project_filepath("errors")
+
+  module Loaders
+    autoload :Project, Extension::Project.project_filepath("loaders/project")
+    autoload :SpecificationHandler, Extension::Project.project_filepath("loaders/specification_handler")
+  end
 end

data/lib/project_types/extension/commands/build.rb

@@ -24,16 +24,16 @@ module Extension
       private
 
       def run_new_flow(project)
-        output = Tasks::RunExtensionCommand.new(
-          type: project.specification_identifier.downcase,
-          command: "build",
-          config_file_name: specification_handler.server_config_file,
-          context: @ctx,
-        ).call
-
-        @ctx.puts(output)
-      rescue => error
-        raise ShopifyCLI::Abort, error.message
+        Tasks::ExecuteCommands
+          .build(
+            context: @ctx,
+            config_file_path: specification_handler.server_config_path,
+            type: project.specification_identifier.downcase
+          )
+          .then { |output| @ctx.puts(output) }
+          .unwrap do |error|
+            raise ShopifyCLI::Abort, error.message unless error.nil?
+          end
       end
 
       def run_legacy_flow

data/lib/project_types/extension/commands/create.rb

@@ -53,12 +53,11 @@ module Extension
       end
 
       def use_new_create_flow(form)
-        Tasks::RunExtensionCommand.new(
+        Tasks::ExecuteCommands.create(
           root_dir: form.directory_name,
           template: form.template,
           type: form.type.identifier.downcase,
-          command: "create"
-        ).call
+        )
         @ctx.chdir(form.directory_name)
         write_env_file(form)
       rescue => error

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

@@ -3,17 +3,40 @@ require "shopify_cli"
 
 module Extension
   class Command
-    class Push < ExtensionCommand
+    class Push < ShopifyCLI::Command::SubCommand
       prerequisite_task ensure_project_type: :extension
 
+      options do |parser, flags|
+        parser.on("--api-key=API_KEY") { |api_key| flags[:api_key] = api_key.gsub('"', "") }
+        parser.on("--api-secret=API_SECRET") { |api_secret| flags[:api_secret] = api_secret.gsub('"', "") }
+        parser.on("--registration-id=REGISTRATION_ID") do |registration_id|
+          flags[:registration_id] = registration_id.gsub('"', "")
+        end
+      end
+
       TIME_DISPLAY_FORMAT = "%B %d, %Y %H:%M:%S %Z"
 
       def call(args, name)
-        Command::Register.new(@ctx).call(args, name) unless project.registered?
+        project = Extension::Loaders::Project.load(
+          context: @ctx,
+          directory: Dir.pwd,
+          api_key: options.flags[:api_key],
+          api_secret: options.flags[:api_secret],
+          registration_id: options.flags[:registration_id]
+        )
+        specification_handler = Extension::Loaders::SpecificationHandler.load(project: project, context: @ctx)
+        register_if_necessary(project: project, args: args, name: name)
+
         Command::Build.new(@ctx).call(args, name) unless specification_handler.specification.options[:skip_build]
         CLI::UI::Frame.open(@ctx.message("push.frame_title")) do
-          updated_draft_version = update_draft
-          show_message(updated_draft_version)
+          updated_draft_version = update_draft(project: project, specification_handler: specification_handler)
+          show_message(updated_draft_version, project: project)
+        end
+      end
+
+      def register_if_necessary(project:, args:, name:)
+        if @ctx.tty? && !project.registered?
+          Command::Register.new(@ctx).call(args, name)
         end
       end
 
@@ -23,11 +46,16 @@ module Extension
 
       private
 
-      def show_message(draft)
-        draft.validation_errors.empty? ? output_success_messages(draft) : output_validation_errors(draft)
+      def show_message(draft, project:)
+        if draft.validation_errors.empty?
+          output_success_messages(draft,
+            project: project)
+        else
+          output_validation_errors(draft)
+        end
       end
 
-      def output_success_messages(draft)
+      def output_success_messages(draft, project:)
         @ctx.puts(@ctx.message("push.success_confirmation", project.title, format_time(draft.last_user_interaction_at)))
         @ctx.puts(@ctx.message("push.success_info", draft.location))
       end
@@ -51,7 +79,7 @@ module Extension
         yield
       end
 
-      def update_draft
+      def update_draft(project:, specification_handler:)
         with_waiting_text do
           Tasks::UpdateDraft.call(
             context: @ctx,

data/lib/project_types/extension/extension_project.rb

@@ -74,7 +74,7 @@ module Extension
     end
 
     def registered?
-      property_present?("api_key") && property_present?("secret") && registration_id?
+      registration_id?
     end
 
     def title

data/lib/project_types/extension/features/argo_serve.rb

@@ -9,7 +9,7 @@ module Extension
       property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
       property :argo_runtime, accepts: -> (runtime) { runtime.class < Features::Runtimes::Base }
       property! :context, accepts: ShopifyCLI::Context
-      property! :port, accepts: Integer, default: 39351
+      property! :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       property  :tunnel_url, accepts: String, default: nil
       property! :js_system, accepts: ->(jss) { jss.respond_to?(:call) }, default: ShopifyCLI::JsSystem
       property :resource_url, accepts: String, default: nil
@@ -95,15 +95,16 @@ module Extension
       end
 
       def new_serve_flow
-        Tasks::RunExtensionCommand.new(
+        Tasks::ExecuteCommands.serve(
           type: specification_handler.specification.identifier,
-          command: "serve",
           context: context,
+          config_file_path: specification_handler.server_config_path,
           port: port,
-          config_file_name: specification_handler.server_config_file,
           resource_url: resource_url,
           tunnel_url: tunnel_url
-        ).call
+        ).unwrap do |error|
+          raise error unless error.nil?
+        end
       end
 
       def supports_development_server?

data/lib/project_types/extension/forms/questions/ask_registration.rb

@@ -34,8 +34,12 @@ module Extension
         end
 
         def load_registrations(type)
-          ctx.puts(@ctx.message("connect.loading_extensions"))
-          registrations = Tasks::GetExtensions.call(context: ctx, type: type)
+          registrations = []
+          loading_extensions = @ctx.message("connect.loading_extensions")
+
+          CLI::UI::Spinner.spin(loading_extensions) do |_spinner|
+            registrations += Tasks::GetExtensions.call(context: ctx, type: type)
+          end
 
           registrations.empty? ? abort_no_registrations : registrations
         end

data/lib/project_types/extension/loaders/project.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Extension
+  module Loaders
+    module Project
+      def self.load(context:, directory:, api_key:, registration_id:, api_secret:)
+        env_overrides = {
+          "SHOPIFY_API_KEY" => api_key,
+          "SHOPIFY_API_SECRET" => api_secret,
+          "EXTENSION_ID" => registration_id,
+        }.compact
+        env =
+          begin
+            ShopifyCLI::Resources::EnvFile.read(directory, overrides: env_overrides)
+          rescue Errno::ENOENT
+            ShopifyCLI::Resources::EnvFile.from_hash(env_overrides)
+          end
+        # This is a somewhat uncomfortable hack we use because `Project::at` is
+        # a global cache and we can't rely on this class loading the project
+        # first. Long-term we should move away from that global cache.
+        project = ExtensionProject.at(directory)
+        project.env = env
+        project
+      rescue SmartProperties::InitializationError, SmartProperties::MissingValueError
+        context.abort(context.message("errors.missing_api_key"))
+      end
+    end
+  end
+end

data/lib/project_types/extension/loaders/specification_handler.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Extension
+  module Loaders
+    module SpecificationHandler
+      def self.load(project:, context:)
+        identifier = project.specification_identifier
+        Models::LazySpecificationHandler.new(identifier) do
+          specifications = Models::Specifications.new(
+            fetch_specifications: Tasks::FetchSpecifications.new(api_key: project.app.api_key, context: context)
+          )
+
+          unless specifications.valid?(identifier)
+            raise ShopifyCLI::Abort, context.message("errors.unknown_type", project.specification_identifier)
+          end
+
+          specifications[identifier]
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/messages/messages.rb

@@ -89,6 +89,9 @@ module Extension
         help: <<~HELP,
           Push the current extension to Shopify.
             Usage: {{command:%s extension push}}
+            Options:
+              {{command:--api-key=API_KEY}} Connect your extension and app by inserting your app's API key (which you can get from your app setup page on shopify.dev).
+              {{command:--registration-id=REGISTRATION_ID}} The id of the extension's registration.
         HELP
         frame_title: "Pushing your extension to Shopify",
         waiting_text: "Pushing code to Shopify…",
@@ -173,6 +176,7 @@ module Extension
       errors: {
         unknown_type: "Unknown extension type %s",
         package_not_found: "`%s` package not found.",
+        missing_api_key: "Missing api_key.",
         module_not_found: "Unable to find module %s. Ensure your dependencies are up-to-date and try again.",
       },
       warnings: {

data/lib/project_types/extension/models/app.rb

@@ -6,7 +6,7 @@ module Extension
       include SmartProperties
 
       property! :api_key, accepts: String
-      property! :secret, accepts: String
+      property :secret, accepts: String
       property :title, accepts: String
       property :business_name, accepts: String
     end

data/lib/project_types/extension/models/specification_handlers/default.rb

@@ -103,6 +103,10 @@ module Extension
           raise NotImplementedError
         end
 
+        def server_config_path(base_dir = Dir.pwd)
+          File.join(base_dir, server_config_file)
+        end
+
         def server_config_file
           "shopifile.yml"
         end

data/lib/project_types/extension/tasks/convert_server_config.rb

@@ -9,11 +9,12 @@ module Extension
       property! :api_key, accepts: String
       property! :context, accepts: ShopifyCLI::Context
       property! :hash, accepts: Hash
+      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       property! :registration_uuid, accepts: String
       property  :resource_url, accepts: String
       property! :store, accepts: String
       property! :title, accepts: String
-      property :tunnel_url, accepts: String
+      property  :tunnel_url, accepts: String
       property! :type, accepts: String
 
       def self.call(*args)
@@ -46,6 +47,7 @@ module Extension
         end
         server_config = Models::ServerConfig::Root.new(
           extensions: [extension],
+          port: port,
           public_url: tunnel_url,
           store: store
         )

data/lib/project_types/extension/tasks/execute_commands/base.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Base
+        include SmartProperties
+        property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/build.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Build < Base
+        property! :context, accepts: ShopifyCLI::Context
+        property! :config_file_path, accepts: String
+
+        def call
+          ShopifyCLI::Result
+            .call(&method(:merge_server_config))
+            .then { |server_config| Models::DevelopmentServer.new.build(server_config) }
+        end
+
+        private
+
+        def merge_server_config
+          Tasks::MergeServerConfig.call(
+            context: context,
+            file_path: config_file_path,
+            type: type
+          )
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/create.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Create < Base
+        property!  :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
+        property!  :root_dir, accepts: String
+
+        def call
+          ShopifyCLI::Result.success(generate_config)
+            .then { |server_config| Models::DevelopmentServer.new.create(server_config) }
+            .unwrap do |error|
+              raise error unless error.nil?
+            end
+        end
+
+        private
+
+        def generate_config
+          extension = Models::ServerConfig::Extension.build(
+            template: template,
+            type: type,
+            root_dir: root_dir,
+          )
+
+          Models::ServerConfig::Root.new(extensions: [extension])
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/execute_commands/serve.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module ExecuteCommands
+      class Serve < Base
+        property! :context, accepts: ShopifyCLI::Context
+        property! :config_file_path, accepts: String
+        property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+        property  :resource_url, accepts: String
+        property! :tunnel_url, accepts: String
+
+        def call
+          ShopifyCLI::Result
+            .call(&method(:merge_server_config))
+            .then { |server_config| Models::DevelopmentServer.new.serve(context, server_config) }
+        end
+
+        private
+
+        def merge_server_config
+          Tasks::MergeServerConfig.call(
+            context: context,
+            file_path: config_file_path,
+            port: port,
+            resource_url: resource_url,
+            tunnel_url: tunnel_url,
+            type: type
+          )
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/merge_server_config.rb

@@ -4,28 +4,39 @@ require "yaml"
 
 module Extension
   module Tasks
-    class MergeServerConfig < ShopifyCLI::Task
-      class << self
-        def call(context:, file_name:, resource_url:, tunnel_url:, type:)
-          config = YAML.load_file(file_name)
-          project = ExtensionProject.current
-          Tasks::ConvertServerConfig.call(
-            api_key: project.env.api_key,
-            context: context,
-            hash: config,
-            registration_uuid: project.registration_uuid,
-            resource_url: resource_url || project.resource_url,
-            store: project.env.shop || "",
-            title: project.title,
-            tunnel_url: tunnel_url,
-            type: type
-          )
-        rescue Psych::SyntaxError => e
-          raise(
-            ShopifyCLI::Abort,
-            ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
-          )
-        end
+    class MergeServerConfig
+      include SmartProperties
+
+      property! :context, accepts: ShopifyCLI::Context
+      property! :file_path, accepts: ->(path) { Pathname(path).yield_self { |pn| pn.absolute? && pn.file? } }
+      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property  :resource_url, accepts: String
+      property  :tunnel_url, accepts: String
+      property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
+
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def call
+        config = YAML.load_file(file_path)
+        project = ExtensionProject.current
+        Tasks::ConvertServerConfig.call(
+          api_key: project.env.api_key,
+          context: context,
+          hash: config,
+          registration_uuid: project.registration_uuid,
+          resource_url: resource_url || project.resource_url,
+          store: project.env.shop || "",
+          title: project.title,
+          tunnel_url: tunnel_url,
+          type: type
+        )
+      rescue Psych::SyntaxError => e
+        raise(
+          ShopifyCLI::Abort,
+          ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
+        )
       end
     end
   end