shopify-cli 2.11.1 → 2.13.0

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

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 require "shopify_cli/theme/dev_server"
+require "project_types/theme/commands/common/root_helper"
 
 module Theme
   class Command
     class Serve < ShopifyCLI::Command::SubCommand
+      include Common::RootHelper
+
       recommend_default_ruby_range
 
       DEFAULT_HTTP_HOST = "127.0.0.1"
@@ -15,10 +18,11 @@ module Theme
         parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
       end
 
-      def call(*)
+      def call(_args, name)
+        root = root_value(options, name)
         flags = options.flags.dup
         host = flags[:host] || DEFAULT_HTTP_HOST
-        ShopifyCLI::Theme::DevServer.start(@ctx, ".", host: host, **flags) do |syncer|
+        ShopifyCLI::Theme::DevServer.start(@ctx, root, host: host, **flags) do |syncer|
           UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
         end
       rescue ShopifyCLI::Theme::DevServer::AddressBindingError

data/lib/project_types/theme/conversions/base_glob.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Theme
+  module Conversions
+    class BaseGlob
+      class << self
+        def register(parser)
+          parser.accept(self) { |_val| convert(parser) }
+        end
+
+        def convert(parser)
+          argv = parser.default_argv
+          option_index = argv.index { |v| options.include?(v) }
+
+          return [] if option_index.nil?
+
+          start_index = option_index + 1
+          option_by_key = options_map(parser)
+          values = []
+
+          argv[start_index..-1].each do |value|
+            return values unless option_by_key[value].nil?
+            values << value
+          end
+
+          values
+        end
+
+        def options
+          raise "`#{self.class.name}#options` must be defined"
+        end
+
+        private
+
+        def options_map(parser)
+          map = {}
+          parser.top.list.each do |option|
+            map[option.short.first] = option
+            map[option.long.first] = option
+          end
+          map
+        end
+
+        def parameter?(value)
+          value.start_with?("-")
+        end
+      end
+    end
+  end
+end

data/lib/project_types/theme/conversions/ignore_glob.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "base_glob"
+
+module Theme
+  module Conversions
+    class IgnoreGlob < BaseGlob
+      class << self
+        def options
+          %w(-x --ignore)
+        end
+      end
+    end
+  end
+end

data/lib/project_types/theme/conversions/include_glob.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "base_glob"
+
+module Theme
+  module Conversions
+    class IncludeGlob < BaseGlob
+      class << self
+        def options
+          %w(-o --only)
+        end
+      end
+    end
+  end
+end

data/lib/project_types/theme/forms/select.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "project_types/theme/presenters/themes_presenter"
+
 module Theme
   module Forms
     class Select < ShopifyCLI::Form
@@ -6,53 +10,21 @@ module Theme
 
       def ask
         self.theme = CLI::UI::Prompt.ask(title, allow_empty: false) do |handler|
-          themes.each do |theme|
+          theme_presenters.each do |presenter|
+            theme = presenter.theme
+
             next if exclude_roles&.include?(theme.role)
             next if !include_foreign_developments && theme.foreign_development?
-            handler.option("#{theme.name} #{theme_tags(theme)}") { theme }
+
+            handler.option(presenter.to_s(:short)) { theme }
           end
         end
       end
 
       private
 
-      def themes
-        @themes ||= ShopifyCLI::Theme::Theme.all(@ctx, root: root)
-          .sort_by { |theme| theme_sort_order(theme) }
-      end
-
-      def theme_sort_order(theme)
-        case theme.role
-        when "live"
-          0
-        when "unpublished"
-          1
-        when "development"
-          2
-        else
-          3
-        end
-      end
-
-      def theme_tags(theme)
-        color = case theme.role
-        when "live"
-          "green"
-        when "unpublished"
-          "yellow"
-        when "development"
-          "blue"
-        else
-          "italic"
-        end
-
-        tags = ["{{#{color}:[#{theme.role}]}}"]
-
-        if theme.current_development?
-          tags << "{{cyan:[yours]}}}}"
-        end
-
-        tags.join(" ")
+      def theme_presenters
+        Theme::Presenters::ThemesPresenter.new(ctx, root).all
       end
     end
   end

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

@@ -65,8 +65,8 @@ module Theme
                 {{command:-j, --json}}             Output JSON instead of a UI.
                 {{command:-a, --allow-live}}       Allow push to a live theme.
                 {{command:-p, --publish}}          Publish as the live theme after uploading.
-                {{command:-o, --only}}             Upload only the specified files.
-                {{command:-x, --ignore}}           Skip uploading the specified files.
+                {{command:-o, --only}}             Upload only the specified files (Multiple flags allowed).
+                {{command:-x, --ignore}}           Skip uploading the specified files (Multiple flags allowed).
 
               Run without options to select theme from a list.
           HELP
@@ -87,7 +87,7 @@ module Theme
               {{info:View your theme:}}
               {{underline:%s}}
 
-              {{info:Customize this theme in the Online Store Editor:}}
+              {{info:Customize this theme in the Theme Editor:}}
               {{underline:%s}}
           DONE
           name: "Theme name",
@@ -96,7 +96,7 @@ module Theme
           help: <<~HELP,
             Uploads the current theme as a development theme to the connected store, then prints theme editor and preview URLs to your terminal. While running, changes will push to the store in real time.
 
-            Usage: {{command:%s theme serve}}
+            Usage: {{command:%s theme serve [ ROOT ]}}
 
             Options:
               {{command:--port=PORT}}        Local port to serve theme preview from.
@@ -130,7 +130,7 @@ module Theme
           SERVING
           customize_or_preview: <<~CUSTOMIZE_OR_PREVIEW,
 
-            Customize this theme in the Online Store Editor:
+            Customize this theme in the Theme Editor:
             {{green:%s}}
 
             Share this theme preview:
@@ -202,8 +202,8 @@ module Theme
               {{command:-l, --live}}             Pull theme files from your remote live theme.
               {{command:-d, --development}}      Pull theme files from your remote development theme.
               {{command:-n, --nodelete}}         Runs the pull command without deleting local files.
-              {{command:-o, --only}}             Download only the specified files.
-              {{command:-x, --ignore}}           Skip downloading the specified files.
+              {{command:-o, --only}}             Download only the specified files (Multiple flags allowed).
+              {{command:-x, --ignore}}           Skip downloading the specified files (Multiple flags allowed).
 
             Run without options to select theme from a list.
           HELP
@@ -215,6 +215,35 @@ module Theme
           WARN
           theme_not_found: "Theme \"%s\" doesn't exist",
         },
+        open: {
+          select: "Select a theme to open",
+          theme_not_found: "Theme \"%s\" doesn't exist",
+          details: <<~DETAILS,
+            {{*}} {{bold:%s}}
+
+            Customize your theme in the Theme Editor:
+            {{green:%s}}
+
+          DETAILS
+          help: <<~HELP,
+            {{command:%s theme open}}: Opens the preview of your remote theme.
+
+            Usage: {{command:%s theme open}}
+
+            Options:
+              {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of your theme.
+              {{command:-l, --live}}             Open your live theme.
+              {{command:-d, --development}}      Open your development theme.
+          HELP
+        },
+        list: {
+          title: "{{*}} List of {{bold:%s}} themes:",
+          help: <<~HELP,
+            {{command:%s theme list}}: Lists your remote themes.
+
+            Usage: {{command:%s theme list}}
+          HELP
+        },
       },
     }.freeze
   end

data/lib/project_types/theme/presenters/theme_presenter.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Theme
+  module Presenters
+    class ThemePresenter
+      extend Forwardable
+
+      COLOR_BY_ROLE = {
+        "live" => "green",
+        "unpublished" => "yellow",
+        "development" => "blue",
+      }
+
+      attr_reader :theme
+
+      def_delegators :theme, :id, :name, :role
+
+      def initialize(theme)
+        @theme = theme
+      end
+
+      def to_s(mode = :long)
+        case mode
+        when :short
+          "{{bold:#{name} #{theme_tags}}}"
+        when :long
+          "{{green:##{id}}} {{bold:#{name} #{theme_tags}}}"
+        else
+          inspect
+        end
+      end
+
+      private
+
+      def theme_tags
+        tags = ["{{#{tag_color}:[#{role}]}}"]
+        tags << "{{cyan:[yours]}}}}" if theme.current_development?
+        tags.join(" ")
+      end
+
+      def tag_color
+        COLOR_BY_ROLE[role] || "italic"
+      end
+    end
+  end
+end

data/lib/project_types/theme/presenters/themes_presenter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "theme_presenter"
+
+module Theme
+  module Presenters
+    class ThemesPresenter
+      ORDER_BY_ROLE = %w(live unpublished development)
+
+      def initialize(ctx, root)
+        @ctx = ctx
+        @root = root
+      end
+
+      def all
+        all_themes
+          .sort_by { |theme| order_by_role(theme) }
+          .map { |theme| ThemePresenter.new(theme) }
+      end
+
+      private
+
+      def order_by_role(theme)
+        ORDER_BY_ROLE.index(theme.role) || ORDER_BY_ROLE.size
+      end
+
+      def all_themes
+        ShopifyCLI::Theme::Theme.all(@ctx, root: @root)
+      end
+    end
+  end
+end

data/lib/shopify_cli/api.rb

@@ -85,7 +85,7 @@ module ShopifyCLI
         end
       rescue Errno::ETIMEDOUT, Timeout::Error
         ctx.debug("timeout in #{method} #{uri} with X-Request-Id: #{headers["X-Request-Id"]}")
-        raise APIRequestTimeoutError.new("Timeout")
+        raise APIRequestTimeoutError, "Timeout"
       end.retry_after(APIRequestRetriableError, retries: 3) do |e|
         sleep(1) if e.is_a?(APIRequestThrottledError)
       end

data/lib/shopify_cli/command.rb

@@ -100,8 +100,10 @@ module ShopifyCLI
       end
 
       def check_node_version
+        return unless @compatible_node_range
+
         context = Context.new
-        if @compatible_node_range && context.which("node").nil?
+        if context.which("node").nil?
           raise ShopifyCLI::Abort, context.message("core.errors.missing_node")
         end
 

data/lib/shopify_cli/commands/app/create/node.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class Node < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           recommend_default_node_range
           recommend_default_ruby_range

data/lib/shopify_cli/commands/app/create/php.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class PHP < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           options do |parser, flags|
             parser.on("--name=NAME") { |name| flags[:name] = name }

data/lib/shopify_cli/commands/app/create/rails.rb

@@ -4,6 +4,7 @@ module ShopifyCLI
       class Create
         class Rails < ShopifyCLI::Command::AppSubCommand
           prerequisite_task :ensure_authenticated
+          prerequisite_task :ensure_git_dependency
 
           recommend_default_ruby_range
           recommend_default_node_range

data/lib/shopify_cli/commands/app/deploy.rb

@@ -3,6 +3,7 @@ module ShopifyCLI
     class App
       class Deploy < ShopifyCLI::Command::AppSubCommand
         subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
+        prerequisite_task :ensure_git_dependency
 
         recommend_default_ruby_range
 

data/lib/shopify_cli/constants.rb

@@ -61,12 +61,12 @@ module ShopifyCLI
     module SupportedVersions
       module Ruby
         FROM = "2.6.6"
-        TO = "3.1.0"
+        TO = "3.2.0"
       end
 
       module Node
-        FROM = "12.0.0"
-        TO = "17.0.0"
+        FROM = "14.5.0"
+        TO = "18.0.0"
       end
     end
 

data/lib/shopify_cli/context.rb

@@ -570,21 +570,19 @@ module ShopifyCLI
       trap("INFO", "DEFAULT")
 
       fork do
-        begin
-          r, w = IO.pipe
+        r, w = IO.pipe
+        @signal = false
+        trap("SIGINFO") do
+          @signal = true
+          w.write(0)
+        end
+        while r.read(1)
+          next unless @signal
           @signal = false
-          trap("SIGINFO") do
-            @signal = true
-            w.write(0)
-          end
-          while r.read(1)
-            next unless @signal
-            @signal = false
-            yield
-          end
-        rescue Interrupt
-          exit(0)
+          yield
         end
+      rescue Interrupt
+        exit(0)
       end
     end
 

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/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

@@ -15,7 +15,7 @@ module ShopifyCLI
       },
       core: {
         errors: {
-          missing_node: "Node is necessary for this command and was not found in the environment.",
+          missing_node: "Node is required to continue. Install node here: https://nodejs.org/en/download.",
           option_parser: {
             invalid_option: "The option {{command:%s}} is not supported.",
             missing_argument: "The required argument {{command:%s}} is missing.",
@@ -42,7 +42,7 @@ module ShopifyCLI
             invalid_type: "The type %s is not supported. The only supported types are"\
               " {{command:[ rails | node | php ]}}",
             help: <<~HELP,
-            {{command:%s app create}}: Creates a ruby on rails app.
+            {{command:%s app create}}: Creates a new project in a subdirectory.
               Usage: {{command:%s app create [ rails | node | php ]}}
             HELP
             rails: {
@@ -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/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/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.rb

@@ -28,7 +28,7 @@ module ShopifyCLI
 
         def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false, mode: ReloadMode.default)
           @ctx = ctx
-          theme = DevelopmentTheme.new(ctx, root: root)
+          theme = DevelopmentTheme.find_or_create!(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
           @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter)
           watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter, poll: poll)
@@ -41,8 +41,6 @@ module ShopifyCLI
           stopped = false
           address = "http://#{host}:#{port}"
 
-          theme.ensure_exists!
-
           trap("INT") do
             stopped = true
             stop

data/lib/shopify_cli/theme/development_theme.rb

@@ -38,6 +38,8 @@ module ShopifyCLI
           @ctx.debug("Created temporary development theme: #{@id}")
           ShopifyCLI::DB.set(development_theme_id: @id)
         end
+
+        self
       end
 
       def exists?
@@ -63,6 +65,15 @@ module ShopifyCLI
         new(ctx).delete
       end
 
+      def self.find(ctx, root: nil)
+        dev_theme = new(ctx, root: root)
+        dev_theme.exists? ? dev_theme : nil
+      end
+
+      def self.find_or_create!(ctx, root: nil)
+        new(ctx, root: root).ensure_exists!
+      end
+
       private
 
       def generate_theme_name