shopify-cli 2.11.2 → 2.14.0

data/lib/shopify_cli/core/entry_point.rb

@@ -5,7 +5,7 @@ module ShopifyCLI
     module EntryPoint
       class << self
         def call(args, ctx = Context.new)
-          if ctx.development?
+          if ctx.development? && !ctx.testing?
             ctx.warn(
               ctx.message("core.warning.development_version", File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME))
             )

data/lib/shopify_cli/core/monorail.rb

@@ -17,11 +17,7 @@ module ShopifyCLI
 
         def log(name, args, &block) # rubocop:disable Lint/UnusedMethodArgument
           command, command_name = Commands::Registry.lookup_command(name)
-          final_command = [command_name]
-          if command
-            subcommand, subcommand_name = command.subcommand_registry.lookup_command(args.first)
-            final_command << subcommand_name if subcommand
-          end
+          full_command = self.full_command(command, args, resolved_command: [command_name])
 
           start_time = now_in_milliseconds
           err = nil
@@ -35,9 +31,21 @@ module ShopifyCLI
             # If there's an error, we don't prompt from here and we let the exception
             # reporter do that.
             if report?(prompt: err.nil?)
-              send_event(start_time, final_command, args - final_command, err&.message)
+              send_event(start_time, full_command, args - full_command, err&.message)
+            end
+          end
+        end
+
+        def full_command(command, args, resolved_command:)
+          resolved_command = resolved_command.dup
+          if command
+            subcommand, subcommand_name = command.subcommand_registry.lookup_command(args.first)
+            resolved_command << subcommand_name if subcommand
+            if subcommand&.subcommand_registry
+              resolved_command = full_command(subcommand, args.drop(1), resolved_command: resolved_command)
             end
           end
+          resolved_command
         end
 
         private

data/lib/shopify_cli/environment.rb

@@ -25,6 +25,12 @@ module ShopifyCLI
       ::Semantic::Version.new(out.chomp)
     end
 
+    def self.npm_version(context: Context.new)
+      out, err, stat = context.capture3("npm", "--version")
+      raise ShopifyCLI::Abort, err unless stat.success?
+      ::Semantic::Version.new(out.chomp)
+    end
+
     def self.interactive=(interactive)
       @interactive = interactive
     end

data/lib/shopify_cli/exception_reporter.rb

@@ -46,6 +46,8 @@ module ShopifyCLI
       Bugsnag.notify(error) do |event|
         event.add_metadata(:device, metadata)
       end
+    rescue
+      nil
     end
 
     def self.report?(context:)

data/lib/shopify_cli/git.rb

@@ -4,7 +4,15 @@ module ShopifyCLI
   # git.
   class Git
     class << self
-      # Check if Git is available in the environment
+      # Check if Git exists in the environment
+      def exists?(ctx)
+        _output, status = ctx.capture2e("git", "version")
+        status.success?
+      rescue Errno::ENOENT # git is not installed
+        false
+      end
+
+      # Check if the current working directory is a Git repository
       def available?(ctx)
         _output, status = ctx.capture2e("git", "status")
         status.success?

data/lib/shopify_cli/messages/messages.rb

@@ -277,6 +277,24 @@ module ShopifyCLI
               HELP
           },
         },
+        extension: {
+          push: {
+            checkout_ui_extension: {
+              localization: {
+                error: {
+                  bundle_too_large: "Total size of all locale files must be less than %s.",
+                  file_empty: "Locale file `%s` is empty.",
+                  file_too_large: "Locale file `%s` too large; size must be less than %s.",
+                  invalid_file_extension: "Invalid locale filename: `%s`; only .json files are allowed.",
+                  invalid_locale_code: "Invalid locale filename: `%s`; locale code should be 2 or 3 letters,"\
+                    " optionally followed by a two-letter region code, e.g. `fr-CA`.",
+                  single_default_locale: "There must be one and only one locale identified as the default locale,"\
+                    " e.g. `en.default.json`",
+                },
+              },
+            },
+          },
+        },
         error_reporting: {
           unhandled_error: {
             message: "{{x}} {{red:An unexpected error occured.}}",
@@ -355,6 +373,7 @@ module ShopifyCLI
           error: {
             directory_exists: "Project directory already exists. Please create a project with a new name.",
             no_branches_found: "Could not find any git branches",
+            nonexistent: "Git needs to be installed: https://git-scm.com/download",
             repo_not_initiated:
               "Git repo is not initiated. Please run {{command:git init}} and make at least one commit.",
             no_commits_made: "No git commits have been made. Please make at least one commit.",
@@ -672,7 +691,8 @@ module ShopifyCLI
             },
           },
           ensure_dev_store: {
-            could_not_verify_store: "Couldn't verify your store %s",
+            could_not_verify_store: "Couldn't verify your store. If you don't have a development store set up, "\
+              "please create one in your Partners dashboard and run `shopify app connect`.",
             convert_to_dev_store: <<~MESSAGE,
               Do you want to convert %s to a development store?
               Doing this will allow you to install your app, but the store will become {{bold:transfer-disabled}}.

data/lib/shopify_cli/packager.rb

@@ -81,7 +81,7 @@ module ShopifyCLI
       puts "Grabbing sha256 checksum from Rubygems.org"
       require "digest/sha2"
       require "open-uri"
-      gem_checksum = open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCLI::VERSION}.gem") do |io|
+      gem_checksum = URI.open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCLI::VERSION}.gem") do |io|
         Digest::SHA256.new.hexdigest(io.read)
       end
 

data/lib/shopify_cli/result.rb

@@ -181,6 +181,13 @@ module ShopifyCLI
         self
       end
 
+      ##
+      # returns the value this success represents
+      #
+      def unwrap!
+        value
+      end
+
       ##
       # returns the success value and ignores the fallback value that was either
       # provided as a method argument or by passing a block. However, the caller
@@ -339,6 +346,13 @@ module ShopifyCLI
         raise ArgumentError, "expected either a fallback value or a block" unless (args.length == 1) ^ block
         block ? block.call(@error) : args.pop
       end
+
+      ##
+      # raises the error this failure represents
+      #
+      def unwrap!
+        raise error
+      end
     end
 
     ##

data/lib/shopify_cli/services/app/create/rails_service.rb

@@ -109,7 +109,7 @@ module ShopifyCLI
 
           def check_ruby
             ruby_version = Rails::Ruby.version(context)
-            return if ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.0.0")
+            return if ruby_version.satisfies?("~>2.5") || ruby_version.satisfies?("~>3.1.0")
             context.abort(context.message("core.app.create.rails.error.invalid_ruby_version"))
           end
 

data/lib/shopify_cli/tasks/ensure_git_dependency.rb

@@ -0,0 +1,14 @@
+require "shopify_cli"
+
+module ShopifyCLI
+  module Tasks
+    class EnsureGitDependency < ShopifyCLI::Task
+      def call(ctx)
+        return if ShopifyCLI::Environment.acceptance_test?
+        unless ShopifyCLI::Git.exists?(ctx)
+          raise ShopifyCLI::Abort, ctx.message("core.git.error.nonexistent")
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/tasks.rb

@@ -34,6 +34,7 @@ module ShopifyCLI
     register :CreateApiClient, :create_api_client, "shopify_cli/tasks/create_api_client"
     register :EnsureAuthenticated, :ensure_authenticated, "shopify_cli/tasks/ensure_authenticated"
     register :EnsureEnv, :ensure_env, "shopify_cli/tasks/ensure_env"
+    register :EnsureGitDependency, :ensure_git_dependency, "shopify_cli/tasks/ensure_git_dependency"
     register :EnsureLoopbackURL, :ensure_loopback_url, "shopify_cli/tasks/ensure_loopback_url"
     register :EnsureProjectType, :ensure_project_type, "shopify_cli/tasks/ensure_project_type"
     register :EnsureDevStore, :ensure_dev_store, "shopify_cli/tasks/ensure_dev_store"

data/lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb

@@ -28,6 +28,10 @@ module ShopifyCLI
 
           private
 
+          def api_client
+            @api_client ||= ThemeAdminAPI.new(@ctx, @theme.shop)
+          end
+
           def updated_file?(body, file)
             remote_checksum = body.dig("asset", "checksum")
             local_checksum = file.checksum
@@ -45,12 +49,8 @@ module ShopifyCLI
           end
 
           def fetch_asset(file)
-            ShopifyCLI::AdminAPI.rest_request(
-              @ctx,
-              shop: @theme.shop,
+            api_client.get(
               path: "themes/#{@theme.id}/assets.json",
-              method: "GET",
-              api_version: "unstable",
               query: URI.encode_www_form("asset[key]" => file.relative_path.to_s),
             )
           rescue ShopifyCLI::API::APIRequestNotFoundError

data/lib/shopify_cli/theme/dev_server/proxy.rb

@@ -3,7 +3,6 @@ require "net/http"
 require "stringio"
 require "time"
 require "cgi"
-
 require_relative "proxy/template_param_builder"
 
 module ShopifyCLI
@@ -70,13 +69,26 @@ module ShopifyCLI
             @core_endpoints << env["PATH_INFO"]
           end
 
-          body = response.body || [""]
+          body = patch_body(env, response.body)
           body = [body] unless body.respond_to?(:each)
           [response.code, headers, body]
         end
 
         private
 
+        def patch_body(env, body)
+          return [""] unless body
+
+          body.gsub(%r{(data-.+=(["']))(http:|https:)?//#{@theme.shop}(.*)(\2)}) do |_|
+            match = Regexp.last_match
+            "#{match[1]}http://#{host(env)}#{match[4]}#{match[5]}"
+          end
+        end
+
+        def host(env)
+          env["HTTP_HOST"]
+        end
+
         def has_body?(headers)
           headers["Content-Length"] || headers["Transfer-Encoding"]
         end

data/lib/shopify_cli/theme/dev_server/watcher.rb

@@ -45,13 +45,21 @@ module ShopifyCLI
         def filter_theme_files(files)
           files
             .select { |file| @theme.theme_file?(file) }
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .map { |file| @theme[file] }
+            .reject { |file| ignore_file?(file) }
         end
 
         def filter_remote_files(files)
           files
             .select { |file| @syncer.remote_file?(file) }
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .map { |file| @theme[file] }
+            .reject { |file| ignore_file?(file) }
+        end
+
+        private
+
+        def ignore_file?(file)
+          @ignore_filter&.ignore?(file.relative_path.to_s)
         end
       end
     end

data/lib/shopify_cli/theme/development_theme.rb

@@ -45,11 +45,8 @@ module ShopifyCLI
       def exists?
         return false unless id
 
-        ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          path: "themes/#{id}.json",
-          api_version: "unstable",
+        api_client.get(
+          path: "themes/#{id}.json"
         )
       rescue ShopifyCLI::API::APIRequestNotFoundError
         false

data/lib/shopify_cli/theme/include_filter.rb

@@ -9,7 +9,8 @@ module ShopifyCLI
 
       attr_reader :globs, :regexes
 
-      def initialize(patterns = [])
+      def initialize(root, patterns = [])
+        @root = Pathname.new(root)
         @patterns = patterns.nil? ? [] : patterns.compact.reject(&:empty?)
 
         regexes, globs = patterns_to_regexes_and_globs(@patterns)
@@ -22,9 +23,10 @@ module ShopifyCLI
         return true unless present?(@patterns)
 
         path = path.to_s
-
         return true if path.empty?
 
+        path = @root.join(path).to_s
+
         regexes.each do |regex|
           return true if regex_match?(regex, path)
         end

data/lib/shopify_cli/theme/syncer.rb

@@ -7,15 +7,15 @@ require "forwardable"
 require_relative "syncer/error_reporter"
 require_relative "syncer/standard_reporter"
 require_relative "syncer/operation"
+require_relative "theme_admin_api"
 
 module ShopifyCLI
   module Theme
     class Syncer
       extend Forwardable
 
-      API_VERSION = "unstable"
-
       attr_reader :checksums
+      attr_reader :checksums_mutex
       attr_accessor :include_filter
       attr_accessor :ignore_filter
 
@@ -39,19 +39,26 @@ module ShopifyCLI
         # Mutex used to pause all threads when backing-off when hitting API rate limits
         @backoff_mutex = Mutex.new
 
+        # Mutex used to coordinate changes in the checksums (shared accross all threads)
+        @checksums_mutex = Mutex.new
+
         # Latest theme assets checksums. Updated on each upload.
         @checksums = {}
 
-        # Checksums of assets with errors. 
+        # Checksums of assets with errors.
         @error_checksums = []
       end
 
+      def api_client
+        @api_client ||= ThemeAdminAPI.new(@ctx, @theme.shop)
+      end
+
       def lock_io!
-        @reporters.each { |reporter| reporter.disable! }
+        @reporters.each(&:disable!)
       end
 
       def unlock_io!
-        @reporters.each { |reporter| reporter.enable! }
+        @reporters.each(&:enable!)
       end
 
       def enqueue_updates(files)
@@ -96,11 +103,8 @@ module ShopifyCLI
       end
 
       def fetch_checksums!
-        _status, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
-          path: "themes/#{@theme.id}/assets.json",
-          api_version: API_VERSION,
+        _status, response = api_client.get(
+          path: "themes/#{@theme.id}/assets.json"
         )
         update_checksums(response)
       end
@@ -118,7 +122,7 @@ module ShopifyCLI
               operation = @queue.pop
               break if operation.nil? # shutdown was called
               perform(operation)
-            rescue Exception => e
+            rescue Exception => e # rubocop:disable Lint/RescueException
               error_suffix = ": #{e}"
               error_suffix += + "\n\t#{e.backtrace.join("\n\t")}" if @ctx.debug?
               report_error(operation, error_suffix)
@@ -168,7 +172,7 @@ module ShopifyCLI
           # Delete local files not present remotely
           missing_files = @theme.theme_files
             .reject { |file| checksums.key?(file.relative_path.to_s) }.uniq
-            .reject { |file| @ignore_filter&.ignore?(file) }
+            .reject { |file| ignore_file?(file) }
           missing_files.each do |file|
             @ctx.debug("rm #{file.relative_path}")
             file.delete
@@ -195,7 +199,7 @@ module ShopifyCLI
         # Already enqueued
         return if @pending.include?(operation)
 
-        if ignore?(operation)
+        if ignore_operation?(operation)
           @ctx.debug("ignore #{operation.file_path}")
           return
         end
@@ -239,12 +243,8 @@ module ShopifyCLI
           asset[:attachment] = Base64.encode64(file.read)
         end
 
-        _status, body, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
+        _status, body, response = api_client.put(
           path: "themes/#{@theme.id}/assets.json",
-          method: "PUT",
-          api_version: API_VERSION,
           body: JSON.generate(asset: asset)
         )
 
@@ -253,8 +253,17 @@ module ShopifyCLI
         response
       end
 
-      def ignore?(operation)
+      def ignore_operation?(operation)
         path = operation.file_path
+        ignore_path?(path)
+      end
+
+      def ignore_file?(file)
+        path = file.path
+        ignore_path?(path)
+      end
+
+      def ignore_path?(path)
         ignored_by_ignore_filter?(path) || ignored_by_include_filter?(path)
       end
 
@@ -263,23 +272,19 @@ module ShopifyCLI
       end
 
       def ignored_by_include_filter?(path)
-        include_filter && !include_filter.match?(path)
+        !!include_filter && !include_filter.match?(path)
       end
 
       def get(file)
-        _status, body, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
+        _status, body, response = api_client.get(
           path: "themes/#{@theme.id}/assets.json",
-          method: "GET",
-          api_version: API_VERSION,
           query: URI.encode_www_form("asset[key]" => file.relative_path.to_s),
         )
 
         update_checksums(body)
 
         attachment = body.dig("asset", "attachment")
-        value = if attachment
+        if attachment
           file.write(Base64.decode64(attachment))
         else
           file.write(body.dig("asset", "value"))
@@ -289,14 +294,10 @@ module ShopifyCLI
       end
 
       def delete(file)
-        _status, _body, response = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: @theme.shop,
+        _status, _body, response = api_client.delete(
           path: "themes/#{@theme.id}/assets.json",
-          method: "DELETE",
-          api_version: API_VERSION,
           body: JSON.generate(asset: {
-            key: file.relative_path.to_s
+            key: file.relative_path.to_s,
           })
         )
 
@@ -305,14 +306,17 @@ module ShopifyCLI
 
       def update_checksums(api_response)
         api_response.values.flatten.each do |asset|
-          if asset["key"]
+          next unless asset["key"]
+          checksums_mutex.synchronize do
             @checksums[asset["key"]] = asset["checksum"]
           end
         end
         # Generate .liquid asset files are reported twice in checksum:
         # once of generated, once for .liquid. We only keep the .liquid, that's the one we have
         # on disk.
-        @checksums.reject! { |key, _| @checksums.key?("#{key}.liquid") }
+        checksums_mutex.synchronize do
+          @checksums.reject! { |key, _| @checksums.key?("#{key}.liquid") }
+        end
       end
 
       def file_has_changed?(file)
@@ -323,7 +327,7 @@ module ShopifyCLI
         parsed_body = JSON.parse(exception&.response&.body)
         message = parsed_body.dig("errors", "asset") || parsed_body["message"] || exception.message
         # Truncate to first lines
-        [message].flatten.map { |message| message.split("\n", 2).first }
+        [message].flatten.map { |mess| mess.split("\n", 2).first }
       rescue JSON::ParserError
         [exception.message]
       end
@@ -331,7 +335,7 @@ module ShopifyCLI
       def backoff_if_near_limit!(used, limit)
         if used > limit - @threads.size
           @ctx.debug("Near API call limit, waiting 2 sec…")
-          @backoff_mutex.synchronize { sleep 2 }
+          @backoff_mutex.synchronize { sleep(2) }
         end
       end
 

data/lib/shopify_cli/theme/theme.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "file"
+require_relative "theme_admin_api"
 
 require "pathname"
 require "time"
@@ -59,7 +60,7 @@ module ShopifyCLI
       end
 
       def shop
-        AdminAPI.get_shop_or_abort(@ctx)
+        api_client.get_shop_or_abort
       end
 
       def editor_url
@@ -101,9 +102,7 @@ module ShopifyCLI
       def create
         raise InvalidThemeRole, "Can't create live theme. Use publish." if live?
 
-        _status, body = ShopifyCLI::AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
+        _status, body = api_client.post(
           path: "themes.json",
           body: JSON.generate({
             theme: {
@@ -111,31 +110,21 @@ module ShopifyCLI
               role: role,
             },
           }),
-          method: "POST",
-          api_version: "unstable",
         )
 
         @id = body["theme"]["id"]
       end
 
       def delete
-        AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          method: "DELETE",
-          path: "themes/#{id}.json",
-          api_version: "unstable",
+        api_client.delete(
+          path: "themes/#{id}.json"
         )
       end
 
       def publish
         return if live?
-        AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          method: "PUT",
+        api_client.put(
           path: "themes/#{id}.json",
-          api_version: "unstable",
           body: JSON.generate(theme: {
             role: "main",
           })
@@ -205,23 +194,23 @@ module ShopifyCLI
         end
 
         def fetch_themes(ctx)
-          AdminAPI.rest_request(
-            ctx,
-            shop: AdminAPI.get_shop_or_abort(ctx),
-            path: "themes.json",
-            api_version: "unstable",
+          api_client = ThemeAdminAPI.new(ctx)
+
+          api_client.get(
+            path: "themes.json"
           )
         end
       end
 
       private
 
+      def api_client
+        @api_client ||= ThemeAdminAPI.new(@ctx)
+      end
+
       def load_info_from_api
-        _status, body = AdminAPI.rest_request(
-          @ctx,
-          shop: shop,
-          path: "themes/#{id}.json",
-          api_version: "unstable",
+        _status, body = api_client.get(
+          path: "themes/#{id}.json"
         )
 
         @name = body.dig("theme", "name")